From 38404b35d395097c7fd783938c6c2aca64364c4f Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Tue, 23 Jun 2026 16:38:31 +0200 Subject: [PATCH] treewide: move etc/init.d and etc/conf.d into openrc subpackages and cleanup Moves the remaining init.d and conf.d files into the OpenRC subpackages. Most of these issues were caused by wrongly reimplementing the default_openrc function, which can be caught in the future with https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items/4643. This commit also makes some very minor cleanup of APKBUILDs if it made sense while fixing the subpackages. [ci:skip-grep] Signed-off-by: Aster Boese Part-of: --- device/community/device-google-manta/APKBUILD | 18 +++++++++++------ .../community/device-purism-librem5/APKBUILD | 17 ++++++---------- main/hisi-wlan/APKBUILD | 12 +++-------- main/postmarketos-ui-buffyboard/APKBUILD | 10 ++++------ main/postmarketos-ui-fbkeyboard/APKBUILD | 10 ++++------ modem/msm-cros-efs-loader/APKBUILD | 20 +++++++++++++------ modem/samsungipcd/APKBUILD | 11 ++-------- 7 files changed, 45 insertions(+), 53 deletions(-) diff --git a/device/community/device-google-manta/APKBUILD b/device/community/device-google-manta/APKBUILD index 7039a2f7a..d8067431b 100644 --- a/device/community/device-google-manta/APKBUILD +++ b/device/community/device-google-manta/APKBUILD @@ -3,7 +3,7 @@ maintainer="Alexandre Marquet " pkgname=device-google-manta pkgdesc="Google Nexus 10" -pkgver=16 +pkgver=17 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -20,7 +20,10 @@ depends=" u-boot-manta " makedepends="devicepkg-dev" -subpackages="$pkgname-disable-gsd-color:disable_gsd_color" +subpackages=" + $pkgname-disable-gsd-color:disable_gsd_color + $pkgname-openrc + " source=" deviceinfo modules-initfs @@ -28,10 +31,7 @@ source=" ucm/HiFi.conf ucm/Manta_WM1811.conf " -replaces=" - device-samsung-manta - openrc -" # replaces openrc for hwclock configuration +replaces="device-samsung-manta" provides="device-samsung-manta=$pkgver-r$pkgrel" build() { @@ -68,6 +68,12 @@ disable_gsd_color() { ln -s /dev/null "$subpkgdir"/usr/share/systemd/user/org.gnome.SettingsDaemon.Color.service } +openrc() { + default_openrc + # replaces openrc for hwclock configuration + replaces="openrc" +} + sha512sums=" a48d23e90e7ed26cb83d24c4daa1542465910a9c759377d337827d25e38ccbbf1112a5d6d653b8f78084474839e07678fa5a50c94d38841771ed61a5074c5c3a deviceinfo e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136 modules-initfs diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD index be3519d0e..963529bbe 100644 --- a/device/community/device-purism-librem5/APKBUILD +++ b/device/community/device-purism-librem5/APKBUILD @@ -2,8 +2,8 @@ # Co-Maintainer: Stefan Hansson maintainer="Alistair Francis " pkgname=device-purism-librem5 -pkgver=12 -pkgrel=1 +pkgver=13 +pkgrel=0 _confver=69 _purismrel=2 # . @@ -57,18 +57,21 @@ source=" udev/70-brcm-bluetooth.rules udev/70-wifi-pm.rules " +# $pkgname-openrc is out of order to allow collecting the remaining openrc +# files using the default function subpackages=" $pkgname-gnome $pkgname-nonfree-firmware:nonfree_firmware $pkgname-pulseaudio - $pkgname-openrc $pkgname-smartcard $pkgname-smartcard-openrc:smartcard_openrc + $pkgname-openrc $pkgname-systemd $pkgname-tinydm $pkgname-usbguard $pkgname-x11 " +install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade" # TODO: remove "replaces" when upstream ucm has proper L5 support... replaces="alsa-ucm-conf" @@ -104,14 +107,6 @@ tinydm() { "$subpkgdir"/usr/share/tinydm/env-wayland.d/70-librem5-xwayland-accel.sh } -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="openrc" - - mkdir -p "$subpkgdir" -} - smartcard() { pkgdesc="OpenPGP SmartCard support for the Librem 5" depends="$pkgname ccid gnupg-scdaemon pcsc-lite pcsc-tools" diff --git a/main/hisi-wlan/APKBUILD b/main/hisi-wlan/APKBUILD index 5e0bf4cad..fd88e7364 100644 --- a/main/hisi-wlan/APKBUILD +++ b/main/hisi-wlan/APKBUILD @@ -1,26 +1,20 @@ maintainer="Ignacy Kuchciński " pkgname=hisi-wlan -pkgver=2 -pkgrel=3 +pkgver=4 +pkgrel=0 pkgdesc="Init script for enabling hisi wlan driver (downstream Android kernels)" url="https://gitlab.postmarketos.org/postmarketOS/pmaports" arch="noarch" license="GPL-3.0-or-later" subpackages="$pkgname-openrc" source="$pkgname.initd" +install="$pkgname-openrc.post-install" options="!check" # No tests package() { install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/hisi-wlan } -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" - - mkdir -p "$subpkgdir" -} - sha512sums=" 752c7d7e12e73b8933f36046e878e81fd4717814144dff14289fd4b4b8ae1949aeff14daa078841d07827a5afc158179692dbfe9d508f3c317d4fa1dfa1a720b hisi-wlan.initd " diff --git a/main/postmarketos-ui-buffyboard/APKBUILD b/main/postmarketos-ui-buffyboard/APKBUILD index 68d223c5e..71e2d885b 100644 --- a/main/postmarketos-ui-buffyboard/APKBUILD +++ b/main/postmarketos-ui-buffyboard/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg maintainer="exkc " pkgname=postmarketos-ui-buffyboard -pkgver=2 -pkgrel=2 +pkgver=3 +pkgrel=0 pkgdesc="Plain framebuffer console with modern touchscreen keyboard support" url="https://gitlab.postmarketos.org/postmarketOS/buffybox" arch="all" @@ -24,14 +24,12 @@ package() { } openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" + default_openrc install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" depends=" openrc networkmanager-openrc - " - - mkdir -p "$subpkgdir" + " } sha512sums=" diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index c8986ba51..4c8635e97 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg maintainer="Robert Bloy " pkgname=postmarketos-ui-fbkeyboard -pkgver=5 -pkgrel=5 +pkgver=6 +pkgrel=0 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" @@ -24,14 +24,12 @@ package() { } openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" + default_openrc install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" depends=" openrc networkmanager-openrc - " - - mkdir -p "$subpkgdir" + " } sha512sums=" diff --git a/modem/msm-cros-efs-loader/APKBUILD b/modem/msm-cros-efs-loader/APKBUILD index 5dc372f68..bdf10ce99 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.1 -pkgrel=0 +pkgrel=1 pkgdesc="EFS loader for Qualcomm-based Chrome OS devices" url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader" arch="aarch64" @@ -12,21 +12,29 @@ source="$pkgname-$pkgver.tar.gz::$url/-/archive/$_tag/msm-cros-efs-loader-$_tag. rmtfs.confd " options="!check !archcheck" -subpackages="$pkgname-rmtfs $pkgname-openrc $pkgname-systemd" +subpackages=" + $pkgname-rmtfs-openrc:rmtfs_openrc + $pkgname-openrc + $pkgname-systemd + " builddir="$srcdir/$pkgname-$_tag" package() { install -Dm755 "$pkgname.sh" "$pkgdir/usr/sbin/$pkgname" install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" install -Dm644 "$srcdir/$pkgname-v$pkgver/10-$pkgname.conf" "$pkgdir"/usr/lib/systemd/system/rmtfs.service.d/10-$pkgname.conf + install -Dm644 "$srcdir"/rmtfs.confd "$pkgdir"/etc/conf.d/rmtfs } -rmtfs() { - pkgdesc="RMTFS config for Chrome OS devices" +# Must come before the openrc subpackage function to install the config +# in this subpackage +rmtfs_openrc() { + pkgdesc="RMTFS config for Chrome OS devices (OpenRC init scripts)" install_if="$pkgname=$pkgver-r$pkgrel rmtfs-openrc" - replaces="rmtfs-openrc" + provides="$pkgname-rmtfs=$pkgver-r$pkgrel" + replaces="$pkgname-rmtfs rmtfs-openrc" - install -Dm644 "$srcdir"/rmtfs.confd "$subpkgdir"/etc/conf.d/rmtfs + amove etc/conf.d/rmtfs } openrc() { diff --git a/modem/samsungipcd/APKBUILD b/modem/samsungipcd/APKBUILD index ddc7c5b2c..634d35324 100644 --- a/modem/samsungipcd/APKBUILD +++ b/modem/samsungipcd/APKBUILD @@ -1,7 +1,7 @@ maintainer="sleirsgoevy " pkgname=samsungipcd pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="AT modem emulation using libsamsung-ipc" url="https://gitlab.com/sleirsgoevy/samsungipcd" arch="all" @@ -9,6 +9,7 @@ license="GPL-2.0-or-later" depends="libsamsung-ipc ppp networkmanager-ppp" makedepends="libsamsung-ipc gcc make ppp-dev" subpackages="$pkgname-openrc" +install="$pkgname-openrc.post-install" source=" samsungipcd-v$pkgver.tgz::$url/-/archive/v$pkgver/samsungipcd-v$pkgver.tar.gz samsungipcd.sh @@ -31,14 +32,6 @@ package() { install -Dm644 "$srcdir/options.ttywc" "$pkgdir/etc/ppp/options.ttywd" } -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" - depends="openrc" - - mkdir -p "$subpkgdir" -} - sha512sums=" 46203ef88db8cfd31bb0a2d37e4213f1e99834b78e407c3d1a46c089247ba4b7952485dda722ac61e31a5eae4a418ae992259c990e5696344658371c4956b809 samsungipcd-v0.3.0.tgz 7bdc6cbc4a9add0f4a5a5d4584fbf4fc64cf4a1f0d93a85e97229eba47bbe66a8e0bd8958b4606141a0189422e13af252d3c0301f61069dc75a64e0a3b59d959 samsungipcd.sh