Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: move etc/init.d and etc/conf.d into openrc subpackages and cleanup

Browse source 
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 <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8871>
This commit is contained in:
Aster Boese 2026-06-23 16:38:31 +02:00 • committed by The Friendly Meow (merge) Bot
parent 535fba79ee
commit 38404b35d3
No known key found for this signature in database
7 changed files with 45 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

18
device/community/device-google-manta/APKBUILD
View file

@ -3,7 +3,7 @@
maintainer="Alexandre Marquet <tb@a-marquet.fr>" maintainer="Alexandre Marquet <tb@a-marquet.fr>"
pkgname=device-google-manta pkgname=device-google-manta
pkgdesc="Google Nexus 10" pkgdesc="Google Nexus 10"
pkgver=16 pkgver=17
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
@ -20,7 +20,10 @@ depends="
u-boot-manta u-boot-manta
" "
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
subpackages="$pkgname-disable-gsd-color:disable_gsd_color" subpackages="
$pkgname-disable-gsd-color:disable_gsd_color
$pkgname-openrc
"
source=" source="
deviceinfo deviceinfo
modules-initfs modules-initfs
@ -28,10 +31,7 @@ source="
ucm/HiFi.conf ucm/HiFi.conf
ucm/Manta_WM1811.conf ucm/Manta_WM1811.conf
" "
replaces=" replaces="device-samsung-manta"
device-samsung-manta
openrc
" # replaces openrc for hwclock configuration
provides="device-samsung-manta=$pkgver-r$pkgrel" provides="device-samsung-manta=$pkgver-r$pkgrel"
build() { build() {
@ -68,6 +68,12 @@ disable_gsd_color() {
ln -s /dev/null "$subpkgdir"/usr/share/systemd/user/org.gnome.SettingsDaemon.Color.service 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=" sha512sums="
a48d23e90e7ed26cb83d24c4daa1542465910a9c759377d337827d25e38ccbbf1112a5d6d653b8f78084474839e07678fa5a50c94d38841771ed61a5074c5c3a deviceinfo a48d23e90e7ed26cb83d24c4daa1542465910a9c759377d337827d25e38ccbbf1112a5d6d653b8f78084474839e07678fa5a50c94d38841771ed61a5074c5c3a deviceinfo
e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136 modules-initfs e00c58936fa4340f8531538136ad028d002342a4399b68d26190b931831108007486257f9d8a48c3ed454696b45d176b1497d624c33ace21e61eba33ac7ce136 modules-initfs

17
device/community/device-purism-librem5/APKBUILD
View file

@ -2,8 +2,8 @@
# Co-Maintainer: Stefan Hansson <newbyte@postmarketos.org> # Co-Maintainer: Stefan Hansson <newbyte@postmarketos.org>
maintainer="Alistair Francis <alistair@alistair23.me>" maintainer="Alistair Francis <alistair@alistair23.me>"
pkgname=device-purism-librem5 pkgname=device-purism-librem5
pkgver=12 pkgver=13
pkgrel=1 pkgrel=0
_confver=69 _confver=69
_purismrel=2 _purismrel=2
# <librem5-base ver>.<purism release> # <librem5-base ver>.<purism release>
@ -57,18 +57,21 @@ source="
udev/70-brcm-bluetooth.rules udev/70-brcm-bluetooth.rules
udev/70-wifi-pm.rules udev/70-wifi-pm.rules
" "
# $pkgname-openrc is out of order to allow collecting the remaining openrc
# files using the default function
subpackages=" subpackages="
$pkgname-gnome $pkgname-gnome
$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-firmware:nonfree_firmware
$pkgname-pulseaudio $pkgname-pulseaudio
$pkgname-openrc
$pkgname-smartcard $pkgname-smartcard
$pkgname-smartcard-openrc:smartcard_openrc $pkgname-smartcard-openrc:smartcard_openrc
$pkgname-openrc
$pkgname-systemd $pkgname-systemd
$pkgname-tinydm $pkgname-tinydm
$pkgname-usbguard $pkgname-usbguard
$pkgname-x11 $pkgname-x11
" "
install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
# TODO: remove "replaces" when upstream ucm has proper L5 support... # TODO: remove "replaces" when upstream ucm has proper L5 support...
replaces="alsa-ucm-conf" replaces="alsa-ucm-conf"
@ -104,14 +107,6 @@ tinydm() {
"$subpkgdir"/usr/share/tinydm/env-wayland.d/70-librem5-xwayland-accel.sh "$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() { smartcard() {
pkgdesc="OpenPGP SmartCard support for the Librem 5" pkgdesc="OpenPGP SmartCard support for the Librem 5"
depends="$pkgname ccid gnupg-scdaemon pcsc-lite pcsc-tools" depends="$pkgname ccid gnupg-scdaemon pcsc-lite pcsc-tools"

12
main/hisi-wlan/APKBUILD
View file

@ -1,26 +1,20 @@
maintainer="Ignacy Kuchciński <ignacykuchcinski@gmail.com>" maintainer="Ignacy Kuchciński <ignacykuchcinski@gmail.com>"
pkgname=hisi-wlan pkgname=hisi-wlan
pkgver=2 pkgver=4
pkgrel=3 pkgrel=0
pkgdesc="Init script for enabling hisi wlan driver (downstream Android kernels)" pkgdesc="Init script for enabling hisi wlan driver (downstream Android kernels)"
url="https://gitlab.postmarketos.org/postmarketOS/pmaports" url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
arch="noarch" arch="noarch"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
subpackages="$pkgname-openrc" subpackages="$pkgname-openrc"
source="$pkgname.initd" source="$pkgname.initd"
install="$pkgname-openrc.post-install"
options="!check" # No tests options="!check" # No tests
package() { package() {
install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/hisi-wlan 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=" sha512sums="
752c7d7e12e73b8933f36046e878e81fd4717814144dff14289fd4b4b8ae1949aeff14daa078841d07827a5afc158179692dbfe9d508f3c317d4fa1dfa1a720b hisi-wlan.initd 752c7d7e12e73b8933f36046e878e81fd4717814144dff14289fd4b4b8ae1949aeff14daa078841d07827a5afc158179692dbfe9d508f3c317d4fa1dfa1a720b hisi-wlan.initd
" "

10
main/postmarketos-ui-buffyboard/APKBUILD
View file

@ -1,8 +1,8 @@
# Reference: https://postmarketos.org/uipkg # Reference: https://postmarketos.org/uipkg
maintainer="exkc <exkc@exkc.moe>" maintainer="exkc <exkc@exkc.moe>"
pkgname=postmarketos-ui-buffyboard pkgname=postmarketos-ui-buffyboard
pkgver=2 pkgver=3
pkgrel=2 pkgrel=0
pkgdesc="Plain framebuffer console with modern touchscreen keyboard support" pkgdesc="Plain framebuffer console with modern touchscreen keyboard support"
url="https://gitlab.postmarketos.org/postmarketOS/buffybox" url="https://gitlab.postmarketos.org/postmarketOS/buffybox"
arch="all" arch="all"
@ -24,14 +24,12 @@ package() {
} }
openrc() { openrc() {
install_if="$pkgname=$pkgver-r$pkgrel openrc" default_openrc
install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
depends=" depends="
openrc openrc
networkmanager-openrc networkmanager-openrc
" "
mkdir -p "$subpkgdir"
} }
sha512sums=" sha512sums="

10
main/postmarketos-ui-fbkeyboard/APKBUILD
View file

@ -1,8 +1,8 @@
# Reference: https://postmarketos.org/uipkg # Reference: https://postmarketos.org/uipkg
maintainer="Robert Bloy <ph0nix.foss@mailbox.org>" maintainer="Robert Bloy <ph0nix.foss@mailbox.org>"
pkgname=postmarketos-ui-fbkeyboard pkgname=postmarketos-ui-fbkeyboard
pkgver=5 pkgver=6
pkgrel=5 pkgrel=0
pkgdesc="Plain framebuffer console with touchscreen keyboard support" pkgdesc="Plain framebuffer console with touchscreen keyboard support"
url="https://github.com/bakonyiferenc/fbkeyboard" url="https://github.com/bakonyiferenc/fbkeyboard"
arch="all" arch="all"
@ -24,14 +24,12 @@ package() {
} }
openrc() { openrc() {
install_if="$pkgname=$pkgver-r$pkgrel openrc" default_openrc
install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade" install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
depends=" depends="
openrc openrc
networkmanager-openrc networkmanager-openrc
" "
mkdir -p "$subpkgdir"
} }
sha512sums=" sha512sums="

20
modem/msm-cros-efs-loader/APKBUILD
View file

@ -1,7 +1,7 @@
maintainer="WeirdTreeThing <bradyn127@protonmail.com>" maintainer="WeirdTreeThing <bradyn127@protonmail.com>"
pkgname=msm-cros-efs-loader pkgname=msm-cros-efs-loader
pkgver=1.2.1 pkgver=1.2.1
pkgrel=0 pkgrel=1
pkgdesc="EFS loader for Qualcomm-based Chrome OS devices" pkgdesc="EFS loader for Qualcomm-based Chrome OS devices"
url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader" url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader"
arch="aarch64" arch="aarch64"
@ -12,21 +12,29 @@ source="$pkgname-$pkgver.tar.gz::$url/-/archive/$_tag/msm-cros-efs-loader-$_tag.
rmtfs.confd rmtfs.confd
" "
options="!check !archcheck" options="!check !archcheck"
subpackages="$pkgname-rmtfs $pkgname-openrc $pkgname-systemd" subpackages="
$pkgname-rmtfs-openrc:rmtfs_openrc
$pkgname-openrc
$pkgname-systemd
"
builddir="$srcdir/$pkgname-$_tag" builddir="$srcdir/$pkgname-$_tag"
package() { package() {
install -Dm755 "$pkgname.sh" "$pkgdir/usr/sbin/$pkgname" install -Dm755 "$pkgname.sh" "$pkgdir/usr/sbin/$pkgname"
install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$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/$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() { # Must come before the openrc subpackage function to install the config
pkgdesc="RMTFS config for Chrome OS devices" # in this subpackage
rmtfs_openrc() {
pkgdesc="RMTFS config for Chrome OS devices (OpenRC init scripts)"
install_if="$pkgname=$pkgver-r$pkgrel rmtfs-openrc" 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() { openrc() {

11
modem/samsungipcd/APKBUILD
View file

@ -1,7 +1,7 @@
maintainer="sleirsgoevy <sleirsgoevy@gmail.com>" maintainer="sleirsgoevy <sleirsgoevy@gmail.com>"
pkgname=samsungipcd pkgname=samsungipcd
pkgver=0.3.0 pkgver=0.3.0
pkgrel=1 pkgrel=2
pkgdesc="AT modem emulation using libsamsung-ipc" pkgdesc="AT modem emulation using libsamsung-ipc"
url="https://gitlab.com/sleirsgoevy/samsungipcd" url="https://gitlab.com/sleirsgoevy/samsungipcd"
arch="all" arch="all"
@ -9,6 +9,7 @@ license="GPL-2.0-or-later"
depends="libsamsung-ipc ppp networkmanager-ppp" depends="libsamsung-ipc ppp networkmanager-ppp"
makedepends="libsamsung-ipc gcc make ppp-dev" makedepends="libsamsung-ipc gcc make ppp-dev"
subpackages="$pkgname-openrc" subpackages="$pkgname-openrc"
install="$pkgname-openrc.post-install"
source=" source="
samsungipcd-v$pkgver.tgz::$url/-/archive/v$pkgver/samsungipcd-v$pkgver.tar.gz samsungipcd-v$pkgver.tgz::$url/-/archive/v$pkgver/samsungipcd-v$pkgver.tar.gz
samsungipcd.sh samsungipcd.sh
@ -31,14 +32,6 @@ package() {
install -Dm644 "$srcdir/options.ttywc" "$pkgdir/etc/ppp/options.ttywd" 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=" sha512sums="
46203ef88db8cfd31bb0a2d37e4213f1e99834b78e407c3d1a46c089247ba4b7952485dda722ac61e31a5eae4a418ae992259c990e5696344658371c4956b809 samsungipcd-v0.3.0.tgz 46203ef88db8cfd31bb0a2d37e4213f1e99834b78e407c3d1a46c089247ba4b7952485dda722ac61e31a5eae4a418ae992259c990e5696344658371c4956b809 samsungipcd-v0.3.0.tgz
7bdc6cbc4a9add0f4a5a5d4584fbf4fc64cf4a1f0d93a85e97229eba47bbe66a8e0bd8958b4606141a0189422e13af252d3c0301f61069dc75a64e0a3b59d959 samsungipcd.sh 7bdc6cbc4a9add0f4a5a5d4584fbf4fc64cf4a1f0d93a85e97229eba47bbe66a8e0bd8958b4606141a0189422e13af252d3c0301f61069dc75a64e0a3b59d959 samsungipcd.sh