snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*/*: rely on abuild's systemd integration

Browse Source 
abuild's default behaviour copies files from usr/lib/systemd into a the
$pkgname-split subpackage.

Several APKBUILD definitions do this manually, since they predate this
feature.

Remove the superfluous systemd() function in these cases.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8023>
This commit is contained in:
Hugo Osvaldo Barrera
2026-04-01 21:40:48 +00:00
committed by The Friendly Meow (merge) Bot
parent 58348da036
commit 6d1ef68afc
7 changed files with 29 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/community/device-google-gru/APKBUILD
+4 -8
View File
@@ -4,7 +4,7 @@ maintainer="Sebastian Fleer <dev@dwurp.de>"
pkgname=device-google-gru pkgname=device-google-gru
pkgdesc="Google Gru Chromebooks" pkgdesc="Google Gru Chromebooks"
pkgver=12 pkgver=12
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@@ -51,6 +51,9 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname devicepkg_package $startdir $pkgname
install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
"$pkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
} }
nonfree_firmware() { nonfree_firmware() {
@@ -65,13 +68,6 @@ openrc() {
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }
systemd() {
install_if="$pkgname=$pkgver-r$pkgrel systemd"
install -Dm644 "$srcdir"/systemd-gru-watchdog.conf \
"$subpkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf
default_systemd
}
sha512sums=" sha512sums="
aa8ded3034eae5bca4c3cfd8add13d8aaa4f1f1dde3e86b4c6f001507d4b5a4d89a532adc9813f42a0fa2526db8223643481736eeffaf13bd673d312ecd06adf deviceinfo aa8ded3034eae5bca4c3cfd8add13d8aaa4f1f1dde3e86b4c6f001507d4b5a4d89a532adc9813f42a0fa2526db8223643481736eeffaf13bd673d312ecd06adf deviceinfo
a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090 modules-initfs a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090 modules-initfs
device/community/device-oneplus-enchilada/APKBUILD
+3 -7
View File
@@ -3,7 +3,7 @@ maintainer="Casey Connolly <kcxt@postmarketos.org>"
pkgname=device-oneplus-enchilada pkgname=device-oneplus-enchilada
pkgdesc="OnePlus 6" pkgdesc="OnePlus 6"
pkgver=24 pkgver=24
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@@ -56,6 +56,8 @@ package() {
"$pkgdir"/etc/conf.d/q6voiced "$pkgdir"/etc/conf.d/q6voiced
install -Dm644 "$srcdir"/hexagonrpcd.confd \ install -Dm644 "$srcdir"/hexagonrpcd.confd \
"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
install -Dm644 -t "$pkgdir"/usr/lib/systemd/system-preset \
"$srcdir"/80-device-oneplus-enchilada.preset
} }
openrc() { openrc() {
@@ -71,12 +73,6 @@ pmtest() {
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
} }
systemd() {
install -Dm644 -t "$subpkgdir"/usr/lib/systemd/system-preset \
"$srcdir"/80-device-oneplus-enchilada.preset
default_systemd
}
sha512sums=" sha512sums="
73088bcff276b1e2f03efc3776be4c7d9a367ef898031686b88e5a853f8910373eb9f77b8e035d58149947929e908e745f255fbd24d02bed7bdc816afd703d2b deviceinfo 73088bcff276b1e2f03efc3776be4c7d9a367ef898031686b88e5a853f8910373eb9f77b8e035d58149947929e908e745f255fbd24d02bed7bdc816afd703d2b deviceinfo
f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51 kernel-cmdline.conf f16e550f623522be29027954c69a956eb6543f2f608a4c6b37c1a3983403a3edaa24e70aa42dbe88e76216991aba867b48c7341c9b8a81f675902d6223937b51 kernel-cmdline.conf
main/postmarketos-bootsplash/APKBUILD
+6 -15
View File
@@ -1,7 +1,7 @@
maintainer="Casey Connolly <kcxt@postmarketos.org>" maintainer="Casey Connolly <kcxt@postmarketos.org>"
pkgname=postmarketos-bootsplash pkgname=postmarketos-bootsplash
pkgver=0.3.1 pkgver=0.3.1
pkgrel=0 pkgrel=1
pkgdesc="pmOS integration components for pbsplash" pkgdesc="pmOS integration components for pbsplash"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="all" arch="all"
@@ -21,6 +21,7 @@ source="
pmos-logo-text-epaper.svg pmos-logo-text-epaper.svg
postmarketos-bootsplash.files postmarketos-bootsplash.files
" "
install="postmarketos-bootsplash-openrc.post-install"
package() { package() {
install -Dm755 "$srcdir/kill-pbsplash" -t "$pkgdir"/etc/init.d/ install -Dm755 "$srcdir/kill-pbsplash" -t "$pkgdir"/etc/init.d/
@@ -31,29 +32,19 @@ package() {
install -Dm644 "$srcdir"/pmos-logo-text-epaper.svg -t "$pkgdir"/usr/share/pbsplash/ install -Dm644 "$srcdir"/pmos-logo-text-epaper.svg -t "$pkgdir"/usr/share/pbsplash/
install -Dm644 "$srcdir"/postmarketos-bootsplash.files \ install -Dm644 "$srcdir"/postmarketos-bootsplash.files \
"$pkgdir"/usr/share/mkinitfs/files/30-postmarketos-bootsplash.files "$pkgdir"/usr/share/mkinitfs/files/30-postmarketos-bootsplash.files
}
openrc() {
install="$subpkgname.post-install"
default_openrc
}
systemd() {
install_if="$pkgname=$pkgver-r$pkgrel systemd"
for _service in display-manager emergency getty@ rescue shutdown-splash; do for _service in display-manager emergency getty@ rescue shutdown-splash; do
install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t \ install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t \
"$subpkgdir"/usr/lib/systemd/system/"$_service".service.d/ "$pkgdir"/usr/lib/systemd/system/"$_service".service.d/
done done
install -Dm644 "$srcdir/shutdown-splash.service" \ install -Dm644 "$srcdir/shutdown-splash.service" \
-t "$subpkgdir"/usr/lib/systemd/system/ -t "$pkgdir"/usr/lib/systemd/system/
for target in halt reboot shutdown; do for target in halt reboot shutdown; do
mkdir -p "$subpkgdir"/usr/lib/systemd/system/"$target".target.wants mkdir -p "$pkgdir"/usr/lib/systemd/system/"$target".target.wants
ln -s ../shutdown-splash.service \ ln -s ../shutdown-splash.service \
"$subpkgdir"/usr/lib/systemd/system/"$target".target.wants/ "$pkgdir"/usr/lib/systemd/system/"$target".target.wants/
done done
} }
sha512sums=" sha512sums="
main/postmarketos-ui-plasma-mobile/APKBUILD
+3 -8
View File
@@ -2,7 +2,7 @@
maintainer="Bart Ribbers <bribbers@disroot.org>" maintainer="Bart Ribbers <bribbers@disroot.org>"
pkgname=postmarketos-ui-plasma-mobile pkgname=postmarketos-ui-plasma-mobile
pkgver=6 pkgver=6
pkgrel=6 pkgrel=7
pkgdesc="(Wayland) Mobile variant of KDE Plasma" pkgdesc="(Wayland) Mobile variant of KDE Plasma"
url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
# armhf blocked by pmaports#75 # armhf blocked by pmaports#75
@@ -55,6 +55,8 @@ package() {
install -Dm644 "$srcdir"/org.kde.plasma.mobile.homescreen.folio.js \ install -Dm644 "$srcdir"/org.kde.plasma.mobile.homescreen.folio.js \
"$pkgdir"/usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/plasmoidsetupscripts/org.kde.plasma.mobile.homescreen.folio.js "$pkgdir"/usr/share/plasma/look-and-feel/org.kde.breeze.mobile/contents/plasmoidsetupscripts/org.kde.plasma.mobile.homescreen.folio.js
install -Dm755 "$srcdir"/system-generators-plasma-mobile-user-override \
-t "$pkgdir"/usr/lib/systemd/system-generators
} }
extras() { extras() {
@@ -90,13 +92,6 @@ openrc() {
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
} }
systemd() {
default_systemd
install -Dm755 "$srcdir"/system-generators-plasma-mobile-user-override \
-t "$subpkgdir"/usr/lib/systemd/system-generators
}
sha512sums=" sha512sums="
b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c kscreenlockerrc b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c kscreenlockerrc
9396bb437c8a6e4b13eff1d16d1dee5804beafd126f4be55ab6deec7bcc42e2473c824b9a37717e347f99c33037d4de7accfb67943cb282fde38eb89ed6f2b89 org.kde.plasma.mobile.homescreen.folio.js 9396bb437c8a6e4b13eff1d16d1dee5804beafd126f4be55ab6deec7bcc42e2473c824b9a37717e347f99c33037d4de7accfb67943cb282fde38eb89ed6f2b89 org.kde.plasma.mobile.homescreen.folio.js
main/woa-firmware-yoinker/APKBUILD
+1 -9
View File
@@ -1,7 +1,7 @@
maintainer="Casey Connolly <kcxt@postmarketos.org>" maintainer="Casey Connolly <kcxt@postmarketos.org>"
pkgname=woa-firmware-yoinker pkgname=woa-firmware-yoinker
pkgver=0.0.1 pkgver=0.0.1
pkgrel=3 pkgrel=4
pkgdesc="Automatically pull firmware from Windows on X1 Elite devices" pkgdesc="Automatically pull firmware from Windows on X1 Elite devices"
url="https://github.com/CadmiumLinux/woa-firmware-yoinker" url="https://github.com/CadmiumLinux/woa-firmware-yoinker"
arch="aarch64" arch="aarch64"
@@ -16,16 +16,8 @@ package() {
install -Dm755 yoink-firmware "$pkgdir"/usr/libexec/yoink-firmware install -Dm755 yoink-firmware "$pkgdir"/usr/libexec/yoink-firmware
install -Dm755 yoink-firmware.initd "$pkgdir"/etc/init.d/yoink-firmware install -Dm755 yoink-firmware.initd "$pkgdir"/etc/init.d/yoink-firmware
install -Dm644 yoink-firmware.service "$pkgdir"/usr/lib/systemd/system/yoink-firmware.service install -Dm644 yoink-firmware.service "$pkgdir"/usr/lib/systemd/system/yoink-firmware.service
}
systemd() {
# FIXME: once systemd support is merged we can rely on abuild to do
# this automatically
# FIXME: add a preset for yoink-firmware.service # FIXME: add a preset for yoink-firmware.service
depends="systemd $pkgname"
install_if="$pkgname systemd"
amove usr/lib/systemd/system/yoink-firmware.service
} }
sha512sums=" sha512sums="
modem/unisoc-nvitem-daemon/APKBUILD
+6 -10
View File
@@ -2,7 +2,7 @@ maintainer="Affe Null <affenull2345@gmail.com>"
pkgname=unisoc-nvitem-daemon pkgname=unisoc-nvitem-daemon
pkgver=0_git20250618 pkgver=0_git20250618
_commit="23f3be10fd5b54bd0fedde3189b98dcfb88f16c2" _commit="23f3be10fd5b54bd0fedde3189b98dcfb88f16c2"
pkgrel=1 pkgrel=2
pkgdesc="NV item daemon for Unisoc modems" pkgdesc="NV item daemon for Unisoc modems"
url="https://git.abscue.de/linux-mainlining/unisoc-nvitem-daemon" url="https://git.abscue.de/linux-mainlining/unisoc-nvitem-daemon"
arch="aarch64" arch="aarch64"
@@ -24,6 +24,11 @@ package() {
install -Dm755 "$srcdir"/unisoc-nvitem-daemon.initd \ install -Dm755 "$srcdir"/unisoc-nvitem-daemon.initd \
"$pkgdir"/etc/init.d/unisoc-nvitem-daemon "$pkgdir"/etc/init.d/unisoc-nvitem-daemon
install -Dm644 "$builddir"/unisoc-nvitem-daemon.service \
-t "$pkgdir"/usr/lib/systemd/system
install -Dm644 "$srcdir"/90-unisoc-nvitem-daemon.preset \
-t "$pkgdir"/usr/lib/systemd/system-preset
} }
openrc() { openrc() {
@@ -31,15 +36,6 @@ openrc() {
default_openrc default_openrc
} }
systemd() {
install_if="$pkgname=$pkgver-r$pkgrel systemd"
install -Dm644 "$builddir"/unisoc-nvitem-daemon.service \
-t "$subpkgdir"/usr/lib/systemd/system
install -Dm644 "$srcdir"/90-unisoc-nvitem-daemon.preset \
-t "$subpkgdir"/usr/lib/systemd/system-preset
}
sha512sums=" sha512sums="
eafbd3fe9fb80ad09b24e0f420fd8e1f29fd1457b003d78c6a8bf0e9ca8937547d6b1dc2147d55de517ab049f486e112d89bae38da14681aa198443dd4c3bfc0 unisoc-nvitem-daemon-23f3be10fd5b54bd0fedde3189b98dcfb88f16c2.tar.gz eafbd3fe9fb80ad09b24e0f420fd8e1f29fd1457b003d78c6a8bf0e9ca8937547d6b1dc2147d55de517ab049f486e112d89bae38da14681aa198443dd4c3bfc0 unisoc-nvitem-daemon-23f3be10fd5b54bd0fedde3189b98dcfb88f16c2.tar.gz
65a6bd77e9e277afbe8940dbe9897a0ba0d07c0030a8cea8f2468e731ccaf1b1ecdddce6f9da0d316f62b4592af109808b64bf58c11ef83b4899cad265129c4a unisoc-nvitem-daemon.initd 65a6bd77e9e277afbe8940dbe9897a0ba0d07c0030a8cea8f2468e731ccaf1b1ecdddce6f9da0d316f62b4592af109808b64bf58c11ef83b4899cad265129c4a unisoc-nvitem-daemon.initd
modem/unisoc-timesync-daemon/APKBUILD
+6 -10
View File
@@ -2,7 +2,7 @@ maintainer="Affe Null <affenull2345@gmail.com>"
pkgname=unisoc-timesync-daemon pkgname=unisoc-timesync-daemon
pkgver=0_git20250619 pkgver=0_git20250619
_commit="5b137db011231e0f9dfa3d3d23aebadb30700806" _commit="5b137db011231e0f9dfa3d3d23aebadb30700806"
pkgrel=1 pkgrel=2
pkgdesc="NV item daemon for Unisoc modems" pkgdesc="NV item daemon for Unisoc modems"
url="https://git.abscue.de/linux-mainlining/unisoc-timesync-daemon" url="https://git.abscue.de/linux-mainlining/unisoc-timesync-daemon"
arch="aarch64" arch="aarch64"
@@ -24,6 +24,11 @@ package() {
install -Dm755 "$srcdir"/unisoc-timesync-daemon.initd \ install -Dm755 "$srcdir"/unisoc-timesync-daemon.initd \
"$pkgdir"/etc/init.d/unisoc-timesync-daemon "$pkgdir"/etc/init.d/unisoc-timesync-daemon
install -Dm644 "$builddir"/unisoc-timesync-daemon.service \
-t "$pkgdir"/usr/lib/systemd/system
install -Dm644 "$srcdir"/90-unisoc-timesync-daemon.preset \
-t "$pkgdir"/usr/lib/systemd/system-preset
} }
openrc() { openrc() {
@@ -31,15 +36,6 @@ openrc() {
default_openrc default_openrc
} }
systemd() {
install_if="$pkgname=$pkgver-r$pkgrel systemd"
install -Dm644 "$builddir"/unisoc-timesync-daemon.service \
-t "$subpkgdir"/usr/lib/systemd/system
install -Dm644 "$srcdir"/90-unisoc-timesync-daemon.preset \
-t "$subpkgdir"/usr/lib/systemd/system-preset
}
sha512sums=" sha512sums="
be4297461d482fd3acf739804c1fe5a7cef840c3b329cf11bf691f434b2a4d8ebdc4093934cb1eed3e781ce65861f0b103258a76c46816a211fa78a8aaae3a37 unisoc-timesync-daemon-5b137db011231e0f9dfa3d3d23aebadb30700806.tar.gz be4297461d482fd3acf739804c1fe5a7cef840c3b329cf11bf691f434b2a4d8ebdc4093934cb1eed3e781ce65861f0b103258a76c46816a211fa78a8aaae3a37 unisoc-timesync-daemon-5b137db011231e0f9dfa3d3d23aebadb30700806.tar.gz
492fe8d8da7b9578bd0cd552a2cdbaf219590770cacbe42acff967a534be150957252f96a5b5cc93995ebade25f233ccb214b285ff2f3740f901d4bea9aa94bb unisoc-timesync-daemon.initd 492fe8d8da7b9578bd0cd552a2cdbaf219590770cacbe42acff967a534be150957252f96a5b5cc93995ebade25f233ccb214b285ff2f3740f901d4bea9aa94bb unisoc-timesync-daemon.initd