From c375f994fe60a97ba45c750438bae0d99f187651 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 23 Aug 2026 23:33:38 -0400 Subject: [PATCH] [FIX] tpm2-tss without integration tests, p11-kit's doc sub-package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tpm2-tss had three obstacles, each hidden by the one before: a missing AX_* macro (fixed by autoconf-archive), then cmocka, now configure: error: Missing required program 'ss': ensure it is installed `ss` comes from iproute2, and adding iproute2 was the first idea -- it is in Arch's base group and belongs here eventually. Measured first: it depends on libbpf, iptables and linux-atm, none of them present, and libbpf is the dependency systemd was already spared for the same reason. Three packages to satisfy a test-suite prerequisite, or --disable-integration. The tests are not run; --nocheck covers the whole first pass. p11-kit is the thirteenth instance of this shape and the third layer of the same package: the build flag, the _pick that staged the docs, and now the sub-package function that moves what _pick staged. Five of these thirteen have been mine, so the rule is worth writing down: disabling a documentation build means following it through the entire package() chain, not just switching it off. --- FR --- tpm2-tss avait trois obstacles, chacun masqué par le précédent : une macro AX_* absente (réglée par autoconf-archive), puis cmocka, et maintenant configure: error: Missing required program 'ss': ensure it is installed `ss` vient d'iproute2, et l'ajouter fut la première idée — il est dans le groupe base d'Arch et y a sa place à terme. Mesuré d'abord : il dépend de libbpf, iptables et linux-atm, aucun présent, et libbpf est la dépendance dont systemd avait déjà été dispensé pour la même raison. Trois paquets pour satisfaire un prérequis de suite de tests, ou --disable-integration. Les tests ne tournent pas : --nocheck couvre toute la première passe. p11-kit est la treizième occurrence de cette forme et la troisième couche du même paquet : le drapeau de construction, le _pick qui préparait la documentation, et maintenant la fonction de sous-paquet qui déplace ce que _pick préparait. Cinq de ces treize sont de ma main : la règle mérite d'être écrite — désactiver une documentation, c'est la suivre dans toute la chaîne package(), pas seulement l'éteindre. Assisted-by: Claude Opus 5 --- patches/pkgbuild/p11-kit.sh | 26 ++++++++++++++++++++++++++ patches/pkgbuild/tpm2-tss.sh | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/patches/pkgbuild/p11-kit.sh b/patches/pkgbuild/p11-kit.sh index 952f74e..e4ad946 100755 --- a/patches/pkgbuild/p11-kit.sh +++ b/patches/pkgbuild/p11-kit.sh @@ -78,3 +78,29 @@ ZZPY grep -qE "_pick doc .*gtk-doc" PKGBUILD && { echo "p11-kit: the gtk-doc pick survived" >&2; exit 1; } echo "p11-kit: gtk-doc split removed (nothing builds it now)" + +# --- and the doc sub-package that now stages nothing -------------------------- +# +# mv: cannot stat 'doc/*': No such file or directory +# +# THIRTEENTH time, and the third layer of the same package. Neutralising the +# _pick above stopped anything being staged into doc/, and package_p11-kit-doc() +# still runs `mv doc/* "$pkgdir"`. _pick, mv, and now the sub-package function +# that consumes what _pick staged: three places for one decision. +# +# The lesson is stated plainly because five of these have been mine: disabling a +# documentation build means following it through the ENTIRE package() chain -- +# the build flag, the staging, and the sub-package that reads the staging area. +python3 - <<'ZZPY' +import io, re +lines = io.open("PKGBUILD", encoding="utf-8").read().split("\n") +hit = [i for i, l in enumerate(lines) if re.match(r"^[ \t]*mv doc/\* ", l)] +assert len(hit) == 1, "p11-kit: expected one `mv doc/*`, got %d" % len(hit) +i = hit[0] +ind = re.match(r"^[ \t]*", lines[i]).group(0) +lines[i] = ind + ": # nothing is staged into doc/: gtk_doc and man are both off." +io.open("PKGBUILD", "w", encoding="utf-8").write("\n".join(lines)) +ZZPY +grep -qE "^[[:space:]]*mv doc/\*" PKGBUILD && { + echo "p11-kit: the doc move survived" >&2; exit 1; } +echo "p11-kit: doc sub-package stages nothing, and no longer tries" diff --git a/patches/pkgbuild/tpm2-tss.sh b/patches/pkgbuild/tpm2-tss.sh index d7aff06..bbfa295 100755 --- a/patches/pkgbuild/tpm2-tss.sh +++ b/patches/pkgbuild/tpm2-tss.sh @@ -29,3 +29,38 @@ grep -q -- "--disable-unit" PKGBUILD || { echo "tpm2-tss: unit tests not disable grep -qE "^[[:space:]]*--enable-unit[[:space:]]*$" PKGBUILD && { echo "tpm2-tss: --enable-unit survived" >&2; exit 1; } echo "tpm2-tss: unit tests disabled (no cmocka)" + +# --- and no integration tests ------------------------------------------------- +# +# configure: error: Missing required program 'ss': ensure it is installed +# +# The THIRD obstacle in this package, each hidden by the one before it: a missing +# AX_* macro, then cmocka, now `ss`. configure.ac has +# +# [ERROR_IF_NO_PROG([ss])] +# +# inside the integration-test branch. `ss` comes from iproute2, and adding +# iproute2 was the first idea -- it is in Arch's base group and belongs in this +# distribution eventually. It was MEASURED first: iproute2 depends on libbpf, +# iptables and linux-atm, none of which are here, and libbpf is the dependency +# systemd was already spared for the same reason. +# +# Three packages to satisfy a test-suite prerequisite, or one flag. The tests are +# not run: makepkg gets --nocheck for the whole first pass. +python3 - <<'ZZPY' +import io, re +lines = io.open("PKGBUILD", encoding="utf-8").read().split("\n") +en = [i for i, l in enumerate(lines) if re.match(r"^[ \t]*--enable-integration[ \t]*$", l)] +if en: + lines[en[0]] = lines[en[0]].replace("--enable-integration", "--disable-integration") +else: + # Put it beside the unit-test switch this hook already set. + u = [i for i, l in enumerate(lines) if re.match(r"^[ \t]*--disable-unit[ \t]*$", l)] + assert len(u) == 1, "tpm2-tss: expected the --disable-unit line from the section above" + ind = re.match(r"^[ \t]*", lines[u[0]]).group(0) + lines.insert(u[0] + 1, ind + "--disable-integration") +io.open("PKGBUILD", "w", encoding="utf-8").write("\n".join(lines)) +ZZPY +grep -q -- "--disable-integration" PKGBUILD || { + echo "tpm2-tss: integration tests not disabled" >&2; exit 1; } +echo "tpm2-tss: integration tests disabled (ss would cost three packages)"