From e63c70b6e895662726b1f4c6ec22aff4c5a59c5e Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 7 Aug 2025 09:32:02 -0700 Subject: [PATCH] Rebuild -systemd subpkgs These packages were previously built by a WIP abuild patch that added install scripts to each -systemd subpkg for handling preset application on install and symlink cleanup on uninstall. This functionality has been replaced by a trigger/commit hook, so we need to rebuild these packages to drop the install scripts that were previously generated. [ci:ignore-count] Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6892 --- device/testing/pinenote-dbus-service/APKBUILD | 2 +- extra-repos/systemd/cups/APKBUILD | 2 +- extra-repos/systemd/dbus/APKBUILD | 2 +- extra-repos/systemd/dsme/APKBUILD | 2 +- extra-repos/systemd/gdm/APKBUILD | 2 +- extra-repos/systemd/gnome-keyring/APKBUILD | 2 +- extra-repos/systemd/gnome-session/APKBUILD | 2 +- extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD | 2 +- extra-repos/systemd/gnome-settings-daemon/APKBUILD | 2 +- extra-repos/systemd/kwin/APKBUILD | 2 +- extra-repos/systemd/networkmanager/APKBUILD | 2 +- extra-repos/systemd/phosh/APKBUILD | 2 +- extra-repos/systemd/pipewire/APKBUILD | 3 +-- extra-repos/systemd/plasma-workspace/APKBUILD | 2 +- extra-repos/systemd/polkit/APKBUILD | 2 +- extra-repos/systemd/systemd-services/APKBUILD | 5 ++--- extra-repos/systemd/upower/APKBUILD | 2 +- extra-repos/systemd/wireplumber/APKBUILD | 2 +- main/bootmac/APKBUILD | 2 +- main/cros-keyboard-map/APKBUILD | 2 +- main/hexagonfs-firmware-loader/APKBUILD | 2 +- main/msm-firmware-loader/APKBUILD | 2 +- main/postmarketos-ui-buffyboard/APKBUILD | 2 +- main/postmarketos-ui-fbkeyboard/APKBUILD | 2 +- main/postmarketos-ui-plasma-desktop/APKBUILD | 2 +- main/swclock-offset/APKBUILD | 2 +- main/woa-firmware-yoinker/APKBUILD | 2 +- modem/msm-cros-efs-loader/APKBUILD | 2 +- temp/81voltd/APKBUILD | 2 +- temp/gnome-settings-daemon-mobile/APKBUILD | 2 +- 30 files changed, 31 insertions(+), 33 deletions(-) diff --git a/device/testing/pinenote-dbus-service/APKBUILD b/device/testing/pinenote-dbus-service/APKBUILD index 9b64b7d97..64b466ce7 100644 --- a/device/testing/pinenote-dbus-service/APKBUILD +++ b/device/testing/pinenote-dbus-service/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=pinenote-dbus-service pkgver=0.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Dbus daemon for controlling driver aspects on Pine64 Pinenote" url="https://github.com/m-weigand/pinenote_dbus_service" arch="aarch64" diff --git a/extra-repos/systemd/cups/APKBUILD b/extra-repos/systemd/cups/APKBUILD index 6e168eea9..521f377b7 100644 --- a/extra-repos/systemd/cups/APKBUILD +++ b/extra-repos/systemd/cups/APKBUILD @@ -4,7 +4,7 @@ maintainer="Jane Rachinger " pkgname=cups _pkgver=2.4.12 pkgver=9999$_pkgver -pkgrel=0 +pkgrel=1 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" # armhf: pmb#2618 diff --git a/extra-repos/systemd/dbus/APKBUILD b/extra-repos/systemd/dbus/APKBUILD index 736279e1e..7eaf998e6 100644 --- a/extra-repos/systemd/dbus/APKBUILD +++ b/extra-repos/systemd/dbus/APKBUILD @@ -3,7 +3,7 @@ pkgname=dbus pkgver=9991.16.2 _pkgver=1.16.2 -pkgrel=3 +pkgrel=4 pkgdesc="Freedesktop.org message bus system" url="https://www.freedesktop.org/Software/dbus" # armhf: pmb#2618 diff --git a/extra-repos/systemd/dsme/APKBUILD b/extra-repos/systemd/dsme/APKBUILD index 953b1275c..1521b735e 100644 --- a/extra-repos/systemd/dsme/APKBUILD +++ b/extra-repos/systemd/dsme/APKBUILD @@ -4,7 +4,7 @@ maintainer="Bart Ribbers " pkgname=dsme pkgver=99990.84.7 _pkgver=0.84.7 -pkgrel=0 +pkgrel=1 _commit_dbusglib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="Device State Management Entity" url="https://github.com/sailfishos/dsme" diff --git a/extra-repos/systemd/gdm/APKBUILD b/extra-repos/systemd/gdm/APKBUILD index 020c4dc89..9fdb2db87 100644 --- a/extra-repos/systemd/gdm/APKBUILD +++ b/extra-repos/systemd/gdm/APKBUILD @@ -3,7 +3,7 @@ pkgname=gdm pkgver=99948.0 _pkgver=48.0 -pkgrel=4 +pkgrel=5 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" # blocked by gnome-shell diff --git a/extra-repos/systemd/gnome-keyring/APKBUILD b/extra-repos/systemd/gnome-keyring/APKBUILD index ce07112d4..a09ca821e 100644 --- a/extra-repos/systemd/gnome-keyring/APKBUILD +++ b/extra-repos/systemd/gnome-keyring/APKBUILD @@ -4,7 +4,7 @@ pkgname=gnome-keyring pkgver=99948.0 _pkgver=48.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-session/APKBUILD b/extra-repos/systemd/gnome-session/APKBUILD index 6369e65d8..d10c65e26 100644 --- a/extra-repos/systemd/gnome-session/APKBUILD +++ b/extra-repos/systemd/gnome-session/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnome-session pkgver=99948.0 _pkgver=48.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD index 428301703..decf5512b 100644 --- a/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnome-settings-daemon-mobile pkgver=99948.0 _pkgver=48.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" # armhf: pmb#2618 diff --git a/extra-repos/systemd/gnome-settings-daemon/APKBUILD b/extra-repos/systemd/gnome-settings-daemon/APKBUILD index 096dfb41a..204e1d128 100644 --- a/extra-repos/systemd/gnome-settings-daemon/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnome-settings-daemon pkgver=99948.1 _pkgver=48.1 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" # armhf: pmb#2618 diff --git a/extra-repos/systemd/kwin/APKBUILD b/extra-repos/systemd/kwin/APKBUILD index e3781a572..1ec2a41da 100644 --- a/extra-repos/systemd/kwin/APKBUILD +++ b/extra-repos/systemd/kwin/APKBUILD @@ -3,7 +3,7 @@ pkgname=kwin pkgver=99996.4.4 _pkgver=6.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="An easy to use, but flexible, composited Window Manager" # armhf blocked by qt6-qtdeclarative arch="all !armhf" diff --git a/extra-repos/systemd/networkmanager/APKBUILD b/extra-repos/systemd/networkmanager/APKBUILD index c722c12f2..ccd7fb92c 100644 --- a/extra-repos/systemd/networkmanager/APKBUILD +++ b/extra-repos/systemd/networkmanager/APKBUILD @@ -5,7 +5,7 @@ maintainer="Jane Rachinger " pkgname=networkmanager pkgver=9991.54.0 _pkgver=1.54.0 -pkgrel=0 +pkgrel=1 pkgdesc="Network Management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" # armhf: pmb#2618 diff --git a/extra-repos/systemd/phosh/APKBUILD b/extra-repos/systemd/phosh/APKBUILD index ac818bcdf..a5f83444d 100644 --- a/extra-repos/systemd/phosh/APKBUILD +++ b/extra-repos/systemd/phosh/APKBUILD @@ -3,7 +3,7 @@ pkgname=phosh _pkgver=0.49.0 pkgver=9999$_pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Wayland shell for GNOME on mobile devices" # armhf: blocked by gnome-shell-schemas and pmb#2618 arch="all !armhf" diff --git a/extra-repos/systemd/pipewire/APKBUILD b/extra-repos/systemd/pipewire/APKBUILD index 9096b300c..c5a20dada 100644 --- a/extra-repos/systemd/pipewire/APKBUILD +++ b/extra-repos/systemd/pipewire/APKBUILD @@ -3,7 +3,7 @@ pkgname=pipewire _pkgver=1.4.7 pkgver=999$_pkgver -pkgrel=1 +pkgrel=2 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" @@ -162,7 +162,6 @@ pulse_systemd() { # We can't just call default_systemd because that would take # all the systemd unit files! install_if="systemd pipewire-pulse=$pkgver-r$pkgrel" - default_systemd_install_scripts } jack() { diff --git a/extra-repos/systemd/plasma-workspace/APKBUILD b/extra-repos/systemd/plasma-workspace/APKBUILD index 6d4b1976c..f7d2591b6 100644 --- a/extra-repos/systemd/plasma-workspace/APKBUILD +++ b/extra-repos/systemd/plasma-workspace/APKBUILD @@ -3,7 +3,7 @@ pkgname=plasma-workspace pkgver=99996.4.4 _pkgver=6.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="KDE Plasma Workspace" # armhf blocked by qt6-qtdeclarative arch="all !armhf" diff --git a/extra-repos/systemd/polkit/APKBUILD b/extra-repos/systemd/polkit/APKBUILD index 01d740c80..b4cf167e0 100644 --- a/extra-repos/systemd/polkit/APKBUILD +++ b/extra-repos/systemd/polkit/APKBUILD @@ -4,7 +4,7 @@ maintainer="Jane Rachinger " pkgname=polkit pkgver=999126 _pkgver=126 -pkgrel=2 +pkgrel=3 pkgdesc="Application development toolkit for controlling system-wide privileges" url="https://github.com/polkit-org/polkit" # armhf: pmb#2618 diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD index de42821dd..bf7482236 100644 --- a/extra-repos/systemd/systemd-services/APKBUILD +++ b/extra-repos/systemd/systemd-services/APKBUILD @@ -8,7 +8,7 @@ pkgname=systemd-services # 1. bump pkgver pkgver=92 -pkgrel=0 +pkgrel=1 pkgdesc="Systemd service files" url="https://postmarketos.org" # armhf: pmb#2618 @@ -388,11 +388,10 @@ _service() { done # NOTE: we do not call default_systemd because it generates an incorrect - # install_if. Instead, call the relevant parts from default_systemd directly + # install_if. # See: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6334#note_474497 depends="systemd" pkgdesc="$pkgdesc (systemd files)" - default_systemd_install_scripts } package() { diff --git a/extra-repos/systemd/upower/APKBUILD b/extra-repos/systemd/upower/APKBUILD index 4e064d360..56ba5821a 100644 --- a/extra-repos/systemd/upower/APKBUILD +++ b/extra-repos/systemd/upower/APKBUILD @@ -3,7 +3,7 @@ pkgname=upower _pkgver=1.90.10 pkgver=9999$_pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" # armhf: pmb#2618 diff --git a/extra-repos/systemd/wireplumber/APKBUILD b/extra-repos/systemd/wireplumber/APKBUILD index fa17e381e..5b2f57da1 100644 --- a/extra-repos/systemd/wireplumber/APKBUILD +++ b/extra-repos/systemd/wireplumber/APKBUILD @@ -3,7 +3,7 @@ pkgname=wireplumber _pkgver=0.5.11 pkgver=999$_pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.org/" # armhf: pmb#2618 diff --git a/main/bootmac/APKBUILD b/main/bootmac/APKBUILD index d2f8ed79e..b03c95648 100644 --- a/main/bootmac/APKBUILD +++ b/main/bootmac/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dylan Van Assche pkgname=bootmac pkgver=0.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Configure MAC addresses at boot" url="https://gitlab.postmarketos.org/postmarketOS/bootmac" arch="all" diff --git a/main/cros-keyboard-map/APKBUILD b/main/cros-keyboard-map/APKBUILD index f4e58fff7..b954f2ce9 100644 --- a/main/cros-keyboard-map/APKBUILD +++ b/main/cros-keyboard-map/APKBUILD @@ -2,7 +2,7 @@ pkgname=cros-keyboard-map pkgdesc="Keyboard mapping for Chrome OS devices" pkgver=0_git20240313 -pkgrel=2 +pkgrel=3 url="https://github.com/WeirdTreeThing/cros-keyboard-map" license="BSD-3-Clause" arch="aarch64 armv7 x86_64" # there are no cros devices of other arches diff --git a/main/hexagonfs-firmware-loader/APKBUILD b/main/hexagonfs-firmware-loader/APKBUILD index c7dd251b7..ceb30a979 100644 --- a/main/hexagonfs-firmware-loader/APKBUILD +++ b/main/hexagonfs-firmware-loader/APKBUILD @@ -1,6 +1,6 @@ pkgname=hexagonfs-firmware-loader pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Prepare the HexagonFS directory from msm-firmware-loader mounts" url="https://postmarketos.org/" subpackages="$pkgname-openrc $pkgname-systemd" diff --git a/main/msm-firmware-loader/APKBUILD b/main/msm-firmware-loader/APKBUILD index bc3166532..6da4ab493 100644 --- a/main/msm-firmware-loader/APKBUILD +++ b/main/msm-firmware-loader/APKBUILD @@ -1,6 +1,6 @@ pkgname=msm-firmware-loader pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Set of init services to automatically load firmware from device partitions" url="https://postmarketos.org/" subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss" diff --git a/main/postmarketos-ui-buffyboard/APKBUILD b/main/postmarketos-ui-buffyboard/APKBUILD index 80e537de1..0bb1c97c1 100644 --- a/main/postmarketos-ui-buffyboard/APKBUILD +++ b/main/postmarketos-ui-buffyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: exkc pkgname=postmarketos-ui-buffyboard pkgver=2 -pkgrel=1 +pkgrel=2 pkgdesc="Plain framebuffer console with modern touchscreen keyboard support" url="https://gitlab.postmarketos.org/postmarketOS/buffybox" arch="all" diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index 7ec26642d..3e99b9741 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard pkgver=5 -pkgrel=3 +pkgrel=4 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index 9b78c703d..0ec6bd8d6 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-desktop pkgver=3 -pkgrel=4 +pkgrel=5 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" # armhf and riscv64 blocked by plasma diff --git a/main/swclock-offset/APKBUILD b/main/swclock-offset/APKBUILD index d80b8d76c..9dcc2b38b 100644 --- a/main/swclock-offset/APKBUILD +++ b/main/swclock-offset/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakko pkgname=swclock-offset pkgver=0.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="Keep system time at an offset to a non-writable RTC" url="https://gitlab.postmarketos.org/postmarketOS/swclock-offset" arch="noarch" diff --git a/main/woa-firmware-yoinker/APKBUILD b/main/woa-firmware-yoinker/APKBUILD index b3786e360..3a60743d9 100644 --- a/main/woa-firmware-yoinker/APKBUILD +++ b/main/woa-firmware-yoinker/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Casey Connolly pkgname=woa-firmware-yoinker pkgver=0.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Automatically pull firmware from Windows on X1 Elite devices" url="https://github.com/CadmiumLinux/woa-firmware-yoinker" arch="aarch64" diff --git a/modem/msm-cros-efs-loader/APKBUILD b/modem/msm-cros-efs-loader/APKBUILD index 1876b39ca..c5950b742 100644 --- a/modem/msm-cros-efs-loader/APKBUILD +++ b/modem/msm-cros-efs-loader/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: WeirdTreeThing pkgname=msm-cros-efs-loader pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="EFS loader for Qualcomm-based Chrome OS devices" url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader" arch="aarch64" diff --git a/temp/81voltd/APKBUILD b/temp/81voltd/APKBUILD index d9d30366a..7eaf6af93 100644 --- a/temp/81voltd/APKBUILD +++ b/temp/81voltd/APKBUILD @@ -1,6 +1,6 @@ pkgname=81voltd pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Server-side implementation of the QMI IMS Data service" url="https://gitlab.com/flamingradian/81voltd" arch="all" diff --git a/temp/gnome-settings-daemon-mobile/APKBUILD b/temp/gnome-settings-daemon-mobile/APKBUILD index d9dc2c587..db7a36e09 100644 --- a/temp/gnome-settings-daemon-mobile/APKBUILD +++ b/temp/gnome-settings-daemon-mobile/APKBUILD @@ -1,6 +1,6 @@ pkgname=gnome-settings-daemon-mobile pkgver=48.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" arch="all"