mathben/archlinux-s390x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[FIX] systemd: sixteen man page operations, across five sub-packages

Browse source 
This section was written three times, each catching more:

  1st  man3 only                    -> stopped on man8/*nss*
  2nd  mv and rm of share/man       -> stopped on `ln -s ... installkernel.8.gz`
  3rd  mv, ln and rm                -> stopped on

         install -D -m0644 -t "$pkgdir"/usr/share/man/man1 \
           build/man/init.1

       in package_systemd-sysvcompat(), whose SOURCE is under build/ and whose
       path contains no "man<digit>" component at all.

So the pattern is a man path anywhere on the line -- source or destination, build
tree or pkgdir -- and the verbs are mv, ln, rm and install. Nine neutralised,
three made tolerant, `install -d` left alone because creating an empty directory
harms nothing and other lines put real files in the same trees.

Three rounds on one package is what guessing the shape of "all of them" costs
instead of listing them. The listing is in the hook now.

--- FR ---

Cette section a été écrite trois fois, chacune en attrapant davantage :

  1re  man3 seul                    -> arrêt sur man8/*nss*
  2e   mv et rm de share/man        -> arrêt sur `ln -s ... installkernel.8.gz`
  3e   mv, ln et rm                 -> arrêt sur

         install -D -m0644 -t "$pkgdir"/usr/share/man/man1 \
           build/man/init.1

       dans package_systemd-sysvcompat(), dont la SOURCE est sous build/ et dont
       le chemin ne contient aucun composant « man<chiffre> ».

Le motif est donc un chemin de manuel n'importe où sur la ligne — source ou
destination, arbre de construction ou pkgdir — et les verbes sont mv, ln, rm et
install. Neuf neutralisés, trois rendus tolérants, `install -d` laissé tel quel :
créer un répertoire vide ne nuit pas, et d'autres lignes y installent de vrais
fichiers.

Trois tours sur un seul paquet, voilà ce que coûte le fait de deviner la forme de
« tous » au lieu de les énumérer. L'énumération est dans le hook.

Assisted-by: Claude Opus 5
This commit is contained in:
Mathieu Benoit 2026-08-24 00:33:37 -04:00
parent 0e00b161c4
commit fe9c58c1a3
1 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
patches/pkgbuild/systemd.sh
View file

@ -310,70 +310,71 @@ ZZPY
grep -q -- "-Dman=disabled" PKGBUILD || { echo "systemd: man not disabled" >&2; exit 1; } grep -q -- "-Dman=disabled" PKGBUILD || { echo "systemd: man not disabled" >&2; exit 1; }
echo "systemd: man pages disabled (DocBook stylesheets absent, not xsltproc)" echo "systemd: man pages disabled (DocBook stylesheets absent, not xsltproc)"
# --- and every man page operation in package() -------------------------------- # --- and every man page operation, in every sub-package -----------------------
# #
# mv: cannot stat '<pkgdir>/usr/share/man/man3': No such file or directory # -Dman=disabled means NO man page exists, and package() touches them SIXTEEN
# times across five sub-package functions. This section was written three times,
# each catching more:
# #
# FIFTEENTH time, and the first where the whole class was handled at once instead # 1st man3 only -> stopped on man8/*nss*
# of one path per pass. -Dman=disabled means NO man pages exist, and package() # 2nd mv and rm of share/man paths -> stopped on `ln -s ... installkernel.8.gz`
# touches them six times: # 3rd mv, ln and rm -> stopped on
# #
# mv .../man/man3 systemd-libs/man3 # install -D -m0644 -t "$pkgdir"/usr/share/man/man1 \
# mv .../man/man8/*nss* systemd-libs/man8/ # build/man/init.1
# mv .../man/man1/ukify.1 systemd-ukify/man1/
# rm .../man/man1/init.1
# rm .../man/man8/{halt,poweroff,reboot,shutdown}.8
# rm .../usr/{bin/resolvconf,share/man/man1/resolvconf.1}
# #
# Treated by KIND rather than by name: # in package_systemd-sysvcompat(), whose SOURCE is under build/ and whose
# path contains no "man<digit>" component at all.
# #
# mv -- neutralised. These move pages into split packages, and with no pages # So the pattern is a man path ANYWHERE on the line -- source or destination,
# there is nothing to move and the split simply has no man section. # build tree or pkgdir -- and the verbs are mv, ln, rm and install. Treated by
# rm -- made tolerant with -f. These delete pages Arch does not want shipped, # kind:
# and that intent still holds on a machine that HAS the DocBook stack.
# The last one also removes a binary, which must still go.
# #
# This is the procedure written in jsoncpp's hook, applied before the failures # mv, ln, install neutralised. Nothing exists to move, link or install.
# arrive rather than after: grep package() for the output paths, not the tool. # rm made tolerant with -f. Their intent -- do not ship these --
# still holds where the DocBook stack exists, and one of them
# also removes a binary that must go.
# install -d LEFT ALONE. Creating an empty directory harms nothing, and
# other lines in the same functions install real files into
# the same trees.
#
# Written out because three rounds on one package is the cost of guessing the
# shape of "all of them" instead of listing them.
set -euo pipefail set -euo pipefail
python3 - <<'ZZPY' python3 - <<'ZZPY'
import io, re import io, re
lines = io.open("PKGBUILD", encoding="utf-8").read().split("\n") lines = io.open("PKGBUILD", encoding="utf-8").read().split("\n")
mv_n = rm_n = 0 MAN = re.compile(r"(share/man|build/man|\bman[1-8]\b|\bman[1-8]/)")
neutral = tolerant = 0
for i in range(len(lines) - 1, -1, -1): for i in range(len(lines) - 1, -1, -1):
l = lines[i] l = lines[i]
if "share/man" not in l and not re.search(r"\bman[0-9]\b", l): if not MAN.search(l):
continue continue
# `ln` as well as `mv`. The first version listed mv and rm and missed it, so # install -d only makes a directory; leave it.
# package_systemd() got one step further and stopped on if re.match(r"^[ \t]*install +-d", l):
# continue
# ln: failed to create symbolic link '.../man/man8/...' if re.match(r"^[ \t]*(mv|ln|install) ", l):
#
# a symlink between two man pages where neither exists. Sixteenth instance of
# this shape, and the lesson is narrower than the last: the procedure said
# grep for the output PATHS, and the paths were found -- what was missed was
# a VERB.
if re.match(r"^[ \t]*(mv|ln) ", l):
j = i j = i
while lines[j].rstrip().endswith("\\"): while lines[j].rstrip().endswith("\\"):
j += 1 j += 1
ind = re.match(r"^[ \t]*", l).group(0) ind = re.match(r"^[ \t]*", l).group(0)
lines[i:j + 1] = [ind + ": # no man pages are built: -Dman=disabled above."] lines[i:j + 1] = [ind + ": # no man pages are built: -Dman=disabled above."]
mv_n += 1 neutral += 1
elif re.match(r"^[ \t]*rm ", l) and not re.match(r"^[ \t]*rm -[a-z]*f", l): elif re.match(r"^[ \t]*rm ", l) and not re.match(r"^[ \t]*rm -[a-z]*f", l):
lines[i] = re.sub(r"^([ \t]*)rm ", r"\1rm -f ", l) lines[i] = re.sub(r"^([ \t]*)rm ", r"\1rm -f ", l)
rm_n += 1 tolerant += 1
assert mv_n >= 1, "systemd: no man page moves found" assert neutral >= 5, "systemd: expected at least five man operations, got %d" % neutral
assert rm_n >= 1, "systemd: no man page removals found" assert tolerant >= 1, "systemd: no man page removals found"
io.open("PKGBUILD", "w", encoding="utf-8").write("\n".join(lines)) io.open("PKGBUILD", "w", encoding="utf-8").write("\n".join(lines))
print(" %d move(s) neutralised, %d removal(s) made tolerant" % (mv_n, rm_n)) print(" %d neutralised, %d made tolerant" % (neutral, tolerant))
ZZPY ZZPY
grep -qE "^[[:space:]]*(mv|ln) .*(share/man|\bman[0-9]\b)" PKGBUILD && { # Nothing may still act on a man path except `install -d` and a tolerant rm.
echo "systemd: a man page move or link survived" >&2; exit 1; } if grep -nE "^[[:space:]]*(mv|ln|install) .*(share/man|build/man|man[1-8])" PKGBUILD |
# Scoped to man paths. The first version of this guard matched any `rm` without grep -v "install +-d" | grep -qE "install -d" ; then :; fi
# a dash and condemned correct code -- systemd's package() removes plenty of grep -nE "^[[:space:]]*(mv|ln) .*(share/man|build/man|man[1-8])" PKGBUILD && {
# things that have nothing to do with documentation. Same mistake as the blanket echo "systemd: a man move or link survived" >&2; exit 1; }
# `grep tcl8.6` in sqlite's hook: a check must ask about what it changed. grep -nE "^[[:space:]]*install +-[^d].*(share/man|build/man)" PKGBUILD && {
grep -qE "^[[:space:]]*rm [^-].*(share/man|\bman[0-9]\b)" PKGBUILD && { echo "systemd: a man install survived" >&2; exit 1; }
grep -nE "^[[:space:]]*rm [^-].*(share/man|man[1-8])" PKGBUILD && {
echo "systemd: an intolerant rm of a man path survived" >&2; exit 1; } echo "systemd: an intolerant rm of a man path survived" >&2; exit 1; }
echo "systemd: all man page operations handled" echo "systemd: all man page operations handled, in every sub-package"