From 682ad68e4c07df02053e8ed76e200eaacda7799b Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 23 Jun 2025 15:38:52 -0700 Subject: [PATCH] extra-repos/systemd: drop armhf We currently don't build systemd for armhf anymore. Disable all other packages in the systemd repo too, as these can't be built without the systemd dependency. FWIW all of Phosh, Gnome Mobile and Plasma Mobile already have major packages not building for armhf so they couldn't be used on this arch anyway. Once pmb issue 2618 is resolved, we can re-enable systemd for armhf. Co-authored-by: Oliver Smith Related to !6637 Fixes #3783 [ci:skip-build], [ci:skip-vercheck]: changing arch= only Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6710 --- extra-repos/systemd/accountsservice/APKBUILD | 3 ++- extra-repos/systemd/cups/APKBUILD | 3 ++- extra-repos/systemd/dbus/APKBUILD | 3 ++- extra-repos/systemd/drkonqi/APKBUILD | 2 +- extra-repos/systemd/dsme/APKBUILD | 3 ++- extra-repos/systemd/gnome-desktop/APKBUILD | 3 ++- extra-repos/systemd/gnome-keyring/APKBUILD | 3 ++- extra-repos/systemd/gnome-logs/APKBUILD | 3 ++- extra-repos/systemd/gnome-session/APKBUILD | 3 ++- extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD | 3 ++- extra-repos/systemd/gnome-settings-daemon/APKBUILD | 3 ++- extra-repos/systemd/kjournald/APKBUILD | 2 +- extra-repos/systemd/kscreenlocker/APKBUILD | 2 +- extra-repos/systemd/kwin/APKBUILD | 2 +- extra-repos/systemd/multipath-tools/APKBUILD | 3 ++- extra-repos/systemd/mutter-mobile/APKBUILD | 3 ++- extra-repos/systemd/mutter/APKBUILD | 3 ++- extra-repos/systemd/networkmanager/APKBUILD | 3 ++- extra-repos/systemd/phosh/APKBUILD | 2 +- extra-repos/systemd/pipewire/APKBUILD | 3 ++- extra-repos/systemd/plasma-workspace/APKBUILD | 2 +- extra-repos/systemd/polkit/APKBUILD | 3 ++- extra-repos/systemd/postmarketos-base-systemd/APKBUILD | 3 ++- extra-repos/systemd/systemd-services/APKBUILD | 3 ++- extra-repos/systemd/systemd-stage0/APKBUILD | 3 ++- extra-repos/systemd/upower/APKBUILD | 3 ++- extra-repos/systemd/wireplumber/APKBUILD | 3 ++- extra-repos/systemd/xorg-server/APKBUILD | 3 ++- 28 files changed, 50 insertions(+), 28 deletions(-) diff --git a/extra-repos/systemd/accountsservice/APKBUILD b/extra-repos/systemd/accountsservice/APKBUILD index 855fb59d2..18a6776f3 100644 --- a/extra-repos/systemd/accountsservice/APKBUILD +++ b/extra-repos/systemd/accountsservice/APKBUILD @@ -8,7 +8,8 @@ _pkgver=23.13.9 pkgrel=0 pkgdesc="D-Bus interface for user account query and manipulation" url="https://www.freedesktop.org/software/accountsservice/" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-3.0-or-later" depends_dev="gobject-introspection-dev" makedepends=" diff --git a/extra-repos/systemd/cups/APKBUILD b/extra-repos/systemd/cups/APKBUILD index d4c73e7b4..abe3aaccf 100644 --- a/extra-repos/systemd/cups/APKBUILD +++ b/extra-repos/systemd/cups/APKBUILD @@ -7,7 +7,8 @@ _pkgver=2.4.11 pkgrel=2 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="Apache-2.0" depends_dev="libgcrypt-dev gnutls-dev zlib-dev" makedepends=" diff --git a/extra-repos/systemd/dbus/APKBUILD b/extra-repos/systemd/dbus/APKBUILD index 5a82f93a1..5e72771ac 100644 --- a/extra-repos/systemd/dbus/APKBUILD +++ b/extra-repos/systemd/dbus/APKBUILD @@ -6,7 +6,8 @@ _pkgver=1.16.2 pkgrel=2 pkgdesc="Freedesktop.org message bus system" url="https://www.freedesktop.org/Software/dbus" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="AFL-2.1 OR GPL-2.0-or-later" depends_dev="util-linux-dev" pkggroups="messagebus" diff --git a/extra-repos/systemd/drkonqi/APKBUILD b/extra-repos/systemd/drkonqi/APKBUILD index d0cc2cc4f..4af65d4cb 100644 --- a/extra-repos/systemd/drkonqi/APKBUILD +++ b/extra-repos/systemd/drkonqi/APKBUILD @@ -5,7 +5,7 @@ pkgver=99996.3.5 _pkgver=6.3.5 pkgrel=0 pkgdesc="The KDE crash handler" -# armhf blocked by qt6-qtdeclarative -> ki18n +# armhf blocked by qt6-qtdeclarative -> ki18n and pmb#2618 arch="all !armhf" url="https://kde.org/plasma-desktop/" license="GPL-2.0-or-later" diff --git a/extra-repos/systemd/dsme/APKBUILD b/extra-repos/systemd/dsme/APKBUILD index 8f06f6953..278e8e2fb 100644 --- a/extra-repos/systemd/dsme/APKBUILD +++ b/extra-repos/systemd/dsme/APKBUILD @@ -8,7 +8,8 @@ pkgrel=0 _commit_dbusglib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="Device State Management Entity" url="https://github.com/sailfishos/dsme" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="LGPL-2.1-only" depends_dev=" cryptsetup-dev diff --git a/extra-repos/systemd/gnome-desktop/APKBUILD b/extra-repos/systemd/gnome-desktop/APKBUILD index 4b669d169..4d8238aa4 100644 --- a/extra-repos/systemd/gnome-desktop/APKBUILD +++ b/extra-repos/systemd/gnome-desktop/APKBUILD @@ -6,7 +6,8 @@ _pkgver=44.3 pkgrel=0 pkgdesc="GNOME desktop core libraries" url="https://gitlab.gnome.org/GNOME/gnome-desktop" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-or-later AND LGPL-2.1-or-later" depends_dev="gobject-introspection-dev gsettings-desktop-schemas-dev" makedepends="$depends_dev diff --git a/extra-repos/systemd/gnome-keyring/APKBUILD b/extra-repos/systemd/gnome-keyring/APKBUILD index 45b92b9db..c7a511235 100644 --- a/extra-repos/systemd/gnome-keyring/APKBUILD +++ b/extra-repos/systemd/gnome-keyring/APKBUILD @@ -7,7 +7,8 @@ _pkgver=48.0 pkgrel=0 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-only LGPL-2.0-only" # the gcr binaries are needed for things to open the keyring via libsecret depends="gcr" diff --git a/extra-repos/systemd/gnome-logs/APKBUILD b/extra-repos/systemd/gnome-logs/APKBUILD index 629bab670..6e79495fd 100644 --- a/extra-repos/systemd/gnome-logs/APKBUILD +++ b/extra-repos/systemd/gnome-logs/APKBUILD @@ -5,7 +5,8 @@ pkgver=45.0 pkgrel=0 pkgdesc="Log viewer for the systemd journal" url="https://apps.gnome.org/Logs" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-3.0-or-later" makedepends=" desktop-file-utils diff --git a/extra-repos/systemd/gnome-session/APKBUILD b/extra-repos/systemd/gnome-session/APKBUILD index dbf80137f..6369e65d8 100644 --- a/extra-repos/systemd/gnome-session/APKBUILD +++ b/extra-repos/systemd/gnome-session/APKBUILD @@ -6,7 +6,8 @@ _pkgver=48.0 pkgrel=1 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-or-later" depends=" alsa-plugins-pulse diff --git a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD index 52f060bd8..019e058f3 100644 --- a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD @@ -6,7 +6,8 @@ _pkgver=48.0 pkgrel=0 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" options="!check" # tests fail on builders license="GPL-2.0-only AND LGPL-2.1-only" depends="pulseaudio" diff --git a/extra-repos/systemd/gnome-settings-daemon/APKBUILD b/extra-repos/systemd/gnome-settings-daemon/APKBUILD index 2ea082fd8..0f5e2e5c1 100644 --- a/extra-repos/systemd/gnome-settings-daemon/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon/APKBUILD @@ -6,7 +6,8 @@ _pkgver=48.1 pkgrel=0 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" options="!check" # tests fail on builders license="GPL-2.0-only AND LGPL-2.1-only" depends="pulseaudio" diff --git a/extra-repos/systemd/kjournald/APKBUILD b/extra-repos/systemd/kjournald/APKBUILD index 782014e74..d0c9cc4f8 100644 --- a/extra-repos/systemd/kjournald/APKBUILD +++ b/extra-repos/systemd/kjournald/APKBUILD @@ -3,7 +3,7 @@ pkgname=kjournald pkgver=24.12.3 pkgrel=0 pkgdesc="Framework for interacting with systemd-journald" -# armhf blocked by qt6-qtdeclarative +# armhf blocked by qt6-qtdeclarative and pmb#2618 arch="all !armhf" url="https://invent.kde.org/system/kjournald" license="BSD-3-Clause AND LGPL-2.1-or-later AND MIT" diff --git a/extra-repos/systemd/kscreenlocker/APKBUILD b/extra-repos/systemd/kscreenlocker/APKBUILD index 916e60aaf..83c0e2177 100644 --- a/extra-repos/systemd/kscreenlocker/APKBUILD +++ b/extra-repos/systemd/kscreenlocker/APKBUILD @@ -5,7 +5,7 @@ pkgver=99996.3.5 _pkgver=6.3.5 pkgrel=0 pkgdesc="Library and components for secure lock screen architecture" -# armhf blocked by qt6-qtdeclarative -> ki18n +# armhf blocked by qt6-qtdeclarative -> ki18n and pmb#2618 arch="all !armhf !armv7" url="https://kde.org/plasma-desktop/" license="GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)" diff --git a/extra-repos/systemd/kwin/APKBUILD b/extra-repos/systemd/kwin/APKBUILD index 31a6e65ab..d6d7b373d 100644 --- a/extra-repos/systemd/kwin/APKBUILD +++ b/extra-repos/systemd/kwin/APKBUILD @@ -5,7 +5,7 @@ pkgver=99996.3.5 _pkgver=6.3.5 pkgrel=0 pkgdesc="An easy to use, but flexible, composited Window Manager" -# armhf blocked by qt6-qtdeclarative +# armhf blocked by qt6-qtdeclarative and pmb#2618 arch="all !armhf !armv7" url="https://kde.org/plasma-desktop/" license="GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only" diff --git a/extra-repos/systemd/multipath-tools/APKBUILD b/extra-repos/systemd/multipath-tools/APKBUILD index 6337763d2..2f92f3830 100644 --- a/extra-repos/systemd/multipath-tools/APKBUILD +++ b/extra-repos/systemd/multipath-tools/APKBUILD @@ -6,7 +6,8 @@ _pkgver=0.11.1 pkgrel=0 pkgdesc="Device Mapper Multipathing Driver" url="http://christophe.varoqui.free.fr/" -arch="all !s390x !ppc64le" # temp disable build due to failure +# armhf: pmb#2618 +arch="all !s390x !ppc64le !armhf" # temp disable build due to failure license="LGPL-2.0-only" depends="device-mapper" makedepends=" diff --git a/extra-repos/systemd/mutter-mobile/APKBUILD b/extra-repos/systemd/mutter-mobile/APKBUILD index 74a382f55..e46924d90 100644 --- a/extra-repos/systemd/mutter-mobile/APKBUILD +++ b/extra-repos/systemd/mutter-mobile/APKBUILD @@ -8,7 +8,8 @@ pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" # ricsv64: doesn't build currently: # https://builds.sr.ht/~postmarketos/job/869829#task-pmbootstrap_build-1224 -arch="all !riscv64" +# armhf: pmb#2618 +arch="all !riscv64 !armhf" license="GPL-2.0-or-later" depends=" gnome-settings-daemon-mobile diff --git a/extra-repos/systemd/mutter/APKBUILD b/extra-repos/systemd/mutter/APKBUILD index 90046d781..3b47f9c68 100644 --- a/extra-repos/systemd/mutter/APKBUILD +++ b/extra-repos/systemd/mutter/APKBUILD @@ -6,7 +6,8 @@ _pkgver=48.4 pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" -arch="all !s390x" # no libei-dev for s390x +# armhf: pmb#2618 +arch="all !s390x !armhf" # no libei-dev for s390x license="GPL-2.0-or-later" depends=" gnome-settings-daemon diff --git a/extra-repos/systemd/networkmanager/APKBUILD b/extra-repos/systemd/networkmanager/APKBUILD index 054d42c8d..b0d5645de 100644 --- a/extra-repos/systemd/networkmanager/APKBUILD +++ b/extra-repos/systemd/networkmanager/APKBUILD @@ -8,7 +8,8 @@ _pkgver=1.52.0 pkgrel=2 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-or-later" depends_dev="$pkgname=$pkgver-r$pkgrel libnm=$pkgver-r$pkgrel" makedepends=" diff --git a/extra-repos/systemd/phosh/APKBUILD b/extra-repos/systemd/phosh/APKBUILD index c2c02e445..d4c4cec05 100644 --- a/extra-repos/systemd/phosh/APKBUILD +++ b/extra-repos/systemd/phosh/APKBUILD @@ -5,7 +5,7 @@ _pkgver=0.47.0 pkgver=9999$_pkgver pkgrel=2 pkgdesc="Wayland shell for GNOME on mobile devices" -# armhf: blocked by gnome-shell-schemas +# armhf: blocked by gnome-shell-schemas and pmb#2618 arch="all !armhf" url="https://gitlab.gnome.org/World/Phosh/phosh" license="GPL-3.0-only" diff --git a/extra-repos/systemd/pipewire/APKBUILD b/extra-repos/systemd/pipewire/APKBUILD index d43eb7971..793df0887 100644 --- a/extra-repos/systemd/pipewire/APKBUILD +++ b/extra-repos/systemd/pipewire/APKBUILD @@ -7,7 +7,8 @@ pkgrel=0 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="LGPL-2.1-or-later" pkggroups="pipewire" makedepends=" diff --git a/extra-repos/systemd/plasma-workspace/APKBUILD b/extra-repos/systemd/plasma-workspace/APKBUILD index b57c2f679..50df06c10 100644 --- a/extra-repos/systemd/plasma-workspace/APKBUILD +++ b/extra-repos/systemd/plasma-workspace/APKBUILD @@ -5,7 +5,7 @@ pkgver=99996.3.5 _pkgver=6.3.5 pkgrel=0 pkgdesc="KDE Plasma Workspace" -# armhf blocked by qt6-qtdeclarative +# armhf blocked by qt6-qtdeclarative and pmb#2618 arch="all !armhf !armv7" url="https://kde.org/plasma-desktop/" license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-or-later AND MIT AND LGPL-2.1-only AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only" diff --git a/extra-repos/systemd/polkit/APKBUILD b/extra-repos/systemd/polkit/APKBUILD index c9ddae12b..6a5ed9ef1 100644 --- a/extra-repos/systemd/polkit/APKBUILD +++ b/extra-repos/systemd/polkit/APKBUILD @@ -7,7 +7,8 @@ _pkgver=126 pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" url="https://github.com/polkit-org/polkit" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-or-later" # pmb:strict: force zap after building this package so we don't still have # systemd-stage0 installed diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD index 2700fad14..b508f5c21 100644 --- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD +++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD @@ -6,7 +6,8 @@ pkgver=47 pkgrel=0 pkgdesc="Meta package for running postmarketOS with systemd" url="https://postmarketos.org" -arch="noarch" +# armhf: pmb#2618 +arch="noarch !armhf" license="GPL-3.0-or-later" options="!check" diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD index 8049bda88..a2862c13d 100644 --- a/extra-repos/systemd/systemd-services/APKBUILD +++ b/extra-repos/systemd/systemd-services/APKBUILD @@ -11,7 +11,8 @@ pkgver=75 pkgrel=0 pkgdesc="Systemd service files" url="https://postmarketos.org" -arch="noarch" +# armhf: pmb#2618 +arch="noarch !armhf" options="!check" license="BSD-3-Clause" diff --git a/extra-repos/systemd/systemd-stage0/APKBUILD b/extra-repos/systemd/systemd-stage0/APKBUILD index 38df2ae39..feb15f1ec 100644 --- a/extra-repos/systemd/systemd-stage0/APKBUILD +++ b/extra-repos/systemd/systemd-stage0/APKBUILD @@ -9,7 +9,8 @@ _pkgver="musl-v${pkgver//_/-}-split-usr" pkgrel=0 pkgdesc="Minimal systemd bootstrap package" url="https://github.com/systemd/systemd" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="MIT AND GPL-2.0-only AND LGPL-2.1-or-later" # This is only for bootstrapping other packages, make sure it does not get diff --git a/extra-repos/systemd/upower/APKBUILD b/extra-repos/systemd/upower/APKBUILD index c319e7205..2631800ba 100644 --- a/extra-repos/systemd/upower/APKBUILD +++ b/extra-repos/systemd/upower/APKBUILD @@ -6,7 +6,8 @@ pkgver=9999$_pkgver pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="GPL-2.0-or-later" makedepends=" docbook-xsl diff --git a/extra-repos/systemd/wireplumber/APKBUILD b/extra-repos/systemd/wireplumber/APKBUILD index 81ca87279..292b5650b 100644 --- a/extra-repos/systemd/wireplumber/APKBUILD +++ b/extra-repos/systemd/wireplumber/APKBUILD @@ -6,7 +6,8 @@ pkgver=999$_pkgver pkgrel=0 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.org/" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="LGPL-2.1-or-later" depends_dev=" systemd-dev diff --git a/extra-repos/systemd/xorg-server/APKBUILD b/extra-repos/systemd/xorg-server/APKBUILD index 9c9690358..7678925ee 100644 --- a/extra-repos/systemd/xorg-server/APKBUILD +++ b/extra-repos/systemd/xorg-server/APKBUILD @@ -6,7 +6,8 @@ _pkgver=21.1.18 pkgrel=0 pkgdesc="X.Org X servers" url="https://www.x.org/wiki" -arch="all" +# armhf: pmb#2618 +arch="all !armhf" license="MIT" # !check: fails with pmbootstrap cross compile to armv7 options="suid !check"