From 2bf2f3329e53c077142d20a5731086466f31ebfd Mon Sep 17 00:00:00 2001 From: Aelin Date: Wed, 22 Jul 2026 15:03:10 +0200 Subject: [PATCH] treewide: remove pmb:strict from options pmbootstrap 3.11 is strict-by-default and previous versions had a broken implementation which broke upon a full bootstrap of e.g. the systemd repo. I think it's therefore safe to remove this already, even without bumping pmbootstrap_min_version. [ci:skip-vercheck]: doesn't affect any artifacts Part-of: --- .ci/lib/apkbuild_linting.py | 1 - device/archived/device-dongshanpi-nezhastu/APKBUILD | 3 +-- device/archived/device-lenovo-yoga-c630/APKBUILD | 3 +-- device/archived/device-mangopi-mq-pro/APKBUILD | 3 +-- extra-repos/systemd/dbus/APKBUILD | 4 +--- extra-repos/systemd/polkit/APKBUILD | 4 +--- extra-repos/systemd/systemd-stage0/APKBUILD | 2 +- extra-repos/systemd/systemd/APKBUILD | 2 +- 8 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.ci/lib/apkbuild_linting.py b/.ci/lib/apkbuild_linting.py index e7635b63c..2b6305685 100755 --- a/.ci/lib/apkbuild_linting.py +++ b/.ci/lib/apkbuild_linting.py @@ -15,7 +15,6 @@ custom_valid_options = [ "pmb:cross-native2", "pmb:drm", "pmb:generic-kernel", - "pmb:strict", "pmb:systemd", "pmb:systemd-never", ] diff --git a/device/archived/device-dongshanpi-nezhastu/APKBUILD b/device/archived/device-dongshanpi-nezhastu/APKBUILD index f344db349..8e07a70c3 100644 --- a/device/archived/device-dongshanpi-nezhastu/APKBUILD +++ b/device/archived/device-dongshanpi-nezhastu/APKBUILD @@ -8,8 +8,7 @@ pkgrel=0 url="https://postmarketos.org" license="MIT" arch="riscv64" -# pmb:strict: avoid grub-related install error during build with pmbootstrap -options="!check !archcheck pmb:strict" +options="!check !archcheck" depends=" linux-postmarketos-allwinner-d1 postmarketos-base diff --git a/device/archived/device-lenovo-yoga-c630/APKBUILD b/device/archived/device-lenovo-yoga-c630/APKBUILD index 788c319cc..b97de6fde 100644 --- a/device/archived/device-lenovo-yoga-c630/APKBUILD +++ b/device/archived/device-lenovo-yoga-c630/APKBUILD @@ -8,8 +8,7 @@ pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" -# pmb:strict: avoid grub-related install error during build with pmbootstrap -options="!check !archcheck pmb:strict" +options="!check !archcheck" depends="postmarketos-base linux-postmarketos-qcom-sdm845 systemd-boot diff --git a/device/archived/device-mangopi-mq-pro/APKBUILD b/device/archived/device-mangopi-mq-pro/APKBUILD index 5d35019a6..62ae37b89 100644 --- a/device/archived/device-mangopi-mq-pro/APKBUILD +++ b/device/archived/device-mangopi-mq-pro/APKBUILD @@ -8,8 +8,7 @@ pkgrel=0 url="https://postmarketos.org" license="MIT" arch="riscv64" -# pmb:strict: avoid grub-related install error during build with pmbootstrap -options="!check !archcheck pmb:strict" +options="!check !archcheck" depends=" linux-postmarketos-allwinner-d1 postmarketos-base diff --git a/extra-repos/systemd/dbus/APKBUILD b/extra-repos/systemd/dbus/APKBUILD index 184783564..0b7b701cb 100644 --- a/extra-repos/systemd/dbus/APKBUILD +++ b/extra-repos/systemd/dbus/APKBUILD @@ -14,10 +14,8 @@ pkggroups="messagebus" provider_priority=1 install="$pkgname.pre-install" triggers="$pkgname.trigger=/usr/share/dbus-1/system.d" -# pmb:strict: force zap after building this package so we don't still have -# systemd-stage0 installed # !check: tests don't pass in pmbootstrap -options="!check pmb:strict" +options="!check" depends=" dbus-libs libexpat diff --git a/extra-repos/systemd/polkit/APKBUILD b/extra-repos/systemd/polkit/APKBUILD index 39b52ba58..322f0f264 100644 --- a/extra-repos/systemd/polkit/APKBUILD +++ b/extra-repos/systemd/polkit/APKBUILD @@ -8,11 +8,9 @@ pkgdesc="Application development toolkit for controlling system-wide privileges" url="https://github.com/polkit-org/polkit" arch="all" license="GPL-2.0-or-later" -# pmb:strict: force zap after building this package so we don't still have -# systemd-stage0 installed # !check: needs a functioning dbus daemon # !pmb:crossdirect: otherwise we see lto1: fatal error: compiler does not support ZSTD LTO compression -options="suid pmb:strict !check !pmb:crossdirect" +options="suid !check !pmb:crossdirect" makedepends=" dbus-dev duktape-dev diff --git a/extra-repos/systemd/systemd-stage0/APKBUILD b/extra-repos/systemd/systemd-stage0/APKBUILD index 92ddf082a..b0a37ef95 100644 --- a/extra-repos/systemd/systemd-stage0/APKBUILD +++ b/extra-repos/systemd/systemd-stage0/APKBUILD @@ -23,7 +23,7 @@ depends="!postmarketos-base" depends_libs="!postmarketos-base libucontext" depends_dev="!postmarketos-base" depends_doc="!postmarketos-base" -options="!tracedeps !check pmb:cross-native2 pmb:strict" +options="!tracedeps !check pmb:cross-native2" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" makedepends_build=" diff --git a/extra-repos/systemd/systemd/APKBUILD b/extra-repos/systemd/systemd/APKBUILD index ed3d9e86a..336131546 100644 --- a/extra-repos/systemd/systemd/APKBUILD +++ b/extra-repos/systemd/systemd/APKBUILD @@ -24,7 +24,7 @@ url="https://github.com/systemd/systemd" arch="all !armhf" license="MIT AND GPL-2.0-only AND LGPL-2.1-or-later" # crossdirect disabled because of "ERROR: Problem encountered: unable to determine gperf len type" -options="pmb:strict !pmb:crossdirect" +options="!pmb:crossdirect" _bootloader="enabled" case "$CARCH" in