diff --git a/device/community/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD index 627e7cf29..afff8f572 100644 --- a/device/community/device-fairphone-fp4/APKBUILD +++ b/device/community/device-fairphone-fp4/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-fairphone-fp4 pkgdesc="Fairphone 4" pkgver=5 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -34,6 +34,7 @@ depends=" tqftpserv " makedepends="devicepkg-dev" +install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade" subpackages="$pkgname-openrc" source=" 81-libssc-fairphone-fp4.rules @@ -57,7 +58,6 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" hexagonrpcd-openrc openrc diff --git a/device/community/device-google-bonito/APKBUILD b/device/community/device-google-bonito/APKBUILD index 1c6eba13f..6b2ed294a 100644 --- a/device/community/device-google-bonito/APKBUILD +++ b/device/community/device-google-bonito/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-google-bonito pkgdesc="Google Pixel 3a XL" pkgver=6 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -25,6 +25,7 @@ depends=" unl0kr-fbforcerefresh " makedepends="devicepkg-dev" +install="$pkgname-openrc.post-install" source=" 81-libssc-google-sargo.rules deviceinfo @@ -76,7 +77,6 @@ openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" # Enable HexagonRPCD by default, but not if the user installed this # package then disabled it. - install="$subpkgname.post-install" depends="hexagonrpcd-openrc openrc" # The FastRPC service is only enabled when non-free firmware is installed. diff --git a/device/community/device-google-sargo/APKBUILD b/device/community/device-google-sargo/APKBUILD index 922ab7b27..5d11a7326 100644 --- a/device/community/device-google-sargo/APKBUILD +++ b/device/community/device-google-sargo/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-google-sargo pkgdesc="Google Pixel 3a" pkgver=13 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -26,6 +26,7 @@ depends=" unl0kr-fbforcerefresh " makedepends="devicepkg-dev" +install="$pkgname-openrc.post-install" source=" 81-libssc-google-sargo.rules deviceinfo @@ -67,9 +68,6 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - # Enable HexagonRPCD by default, but not if the user installed this - # package then disabled it. - install="$subpkgname.post-install" depends="hexagonrpcd-openrc openrc" # The FastRPC service is only enabled when non-free firmware is installed. diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD index ae6fe6187..eb1c6a9d8 100644 --- a/device/community/device-nokia-n900/APKBUILD +++ b/device/community/device-nokia-n900/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Danct12 pkgname=device-nokia-n900 pkgver=51 -pkgrel=0 +pkgrel=1 pkgdesc="Nokia N900" url="https://postmarketos.org" arch="armv7" @@ -27,7 +27,11 @@ makedepends=" kbd-bkeymaps postmarketos-mvcfg " -install="$pkgname.post-install $pkgname.pre-upgrade" +install=" + $pkgname.post-install + $pkgname.pre-upgrade + $pkgname-openrc.post-install +" subpackages=" $pkgname-foot $pkgname-i3blocks @@ -202,7 +206,6 @@ upower() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" depends="wl1251-cal-openrc" mkdir -p "$subpkgdir" diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index 35d6de682..5e0440f19 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" pkgver=17 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -31,6 +31,10 @@ source=" 80-device-oneplus-enchilada.preset 81-libssc-oneplus-enchilada.rules " +install=" + $pkgname-openrc.post-install + $pkgname-openrc.post-upgrade + " subpackages=" $pkgname-pmtest $pkgname-openrc @@ -55,7 +59,6 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc" mkdir -p "$subpkgdir" } diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD index 8c41336f2..4f80cd661 100644 --- a/device/community/device-oneplus-fajita/APKBUILD +++ b/device/community/device-oneplus-fajita/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-fajita pkgdesc="OnePlus 6T" pkgver=17 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -28,6 +28,10 @@ source=" 80-device-oneplus-fajita.preset 81-libssc-oneplus-fajita.rules " +install=" + $pkgname-nonfree-firmware-openrc.post-install + $pkgname-nonfree-firmware-openrc.post-upgrade + " subpackages=" $pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc @@ -41,7 +45,6 @@ build() { package() { devicepkg_package $startdir $pkgname - } nonfree_firmware() { @@ -60,7 +63,6 @@ nonfree_firmware() { nonfree_firmware_openrc() { install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc openrc" mkdir -p "$subpkgdir" diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD index 929a76a71..367d34a6a 100644 --- a/device/community/device-pine64-pinebookpro/APKBUILD +++ b/device/community/device-pine64-pinebookpro/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-pine64-pinebookpro pkgdesc="PINE64 Pinebook Pro" pkgver=16 -pkgrel=9 +pkgrel=10 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -18,6 +18,12 @@ depends=" iw " makedepends="devicepkg-dev" +install=" + $pkgname-elogind.post-install + $pkgname-elogind.post-upgrade + $pkgname-openrc.post-install + $pkgname-openrc.post-upgrade + " subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind $pkgname-openrc" source=" deviceinfo @@ -43,7 +49,6 @@ package() { elogind() { install_if="$pkgname=$pkgver-r$pkgrel elogind" - install="$subpkgname.post-install $subpkgname.post-upgrade" install -D -m644 "$srcdir"/enable-s2idle.conf \ "$subpkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf } @@ -56,7 +61,6 @@ nonfree_firmware() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="eudev-hwids openrc" mkdir -p "$subpkgdir" diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD index 7345daaff..777ee6ec0 100644 --- a/device/community/device-pine64-pinephone/APKBUILD +++ b/device/community/device-pine64-pinephone/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Jan Jasper de Kroon pkgname=device-pine64-pinephone pkgver=9 -pkgrel=2 +pkgrel=3 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -41,7 +41,11 @@ makedepends=" dtc u-boot-tools " -install="$pkgname.pre-upgrade" +install=" + $pkgname.pre-upgrade + $pkgname-openrc.post-install + $pkgname-openrc.post-upgrade + " source=" 00_alsa_pinephone_dshare.conf 10-pinephone-proximity.rules @@ -163,7 +167,6 @@ nonfree_firmware() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="eg25-manager-openrc openrc" mkdir "$subpkgdir" } diff --git a/device/community/device-pine64-pinephonepro/APKBUILD b/device/community/device-pine64-pinephonepro/APKBUILD index 4c9a6384e..a11093c9c 100644 --- a/device/community/device-pine64-pinephonepro/APKBUILD +++ b/device/community/device-pine64-pinephonepro/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-pine64-pinephonepro pkgdesc="PINE64 PinePhone Pro" pkgver=5 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -22,6 +22,7 @@ makedepends=" grub grub-efi " +install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade" subpackages=" $pkgname-nonfree-firmware:nonfree_firmware $pkgname-gnome @@ -123,7 +124,6 @@ gnome() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="eg25-manager-openrc openrc" mkdir -p "$subpkgdir" diff --git a/device/community/device-qcom-sm7150/APKBUILD b/device/community/device-qcom-sm7150/APKBUILD index dff73df04..2a3c1c505 100644 --- a/device/community/device-qcom-sm7150/APKBUILD +++ b/device/community/device-qcom-sm7150/APKBUILD @@ -7,7 +7,7 @@ pkgname=device-qcom-sm7150 pkgdesc="Generic device package for Qualcomm SM7150 devices" pkgver=4 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -26,6 +26,7 @@ depends=" unl0kr-fbforcerefresh " makedepends="devicepkg-dev" +install="$pkgname-openrc.post-install" subpackages=" $pkgname-openrc " @@ -48,7 +49,6 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" depends=" hexagonrpcd-openrc openrc diff --git a/device/community/device-xiaomi-elish/APKBUILD b/device/community/device-xiaomi-elish/APKBUILD index ee9421284..66bc2d075 100644 --- a/device/community/device-xiaomi-elish/APKBUILD +++ b/device/community/device-xiaomi-elish/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-xiaomi-elish pkgdesc="Xiaomi Mi Pad 5 Pro" pkgver=6 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -18,6 +18,7 @@ depends=" soc-qcom-qbootctl " makedepends="devicepkg-dev" +install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade" source=" 81-libssc-xiaomi-elish.rules alsa-ucm-conf/elish.conf @@ -91,7 +92,6 @@ nonfree_firmware() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc" mkdir -p "$subpkgdir" diff --git a/device/community/firmware-samsung-pxa1908/APKBUILD b/device/community/firmware-samsung-pxa1908/APKBUILD index f5ab0c159..e43da64b1 100644 --- a/device/community/firmware-samsung-pxa1908/APKBUILD +++ b/device/community/firmware-samsung-pxa1908/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-pxa1908 pkgver=2 -pkgrel=5 +pkgrel=6 pkgdesc="Firmware for Samsung PXA1908 devices" url="https://postmarketos.org" arch="aarch64" @@ -15,6 +15,7 @@ source=" _fw_file="sd8777_uapsta.bin" _misc_files="WlanCalData_ext.conf txpwrlimit_cfg.bin bt_cal_data.conf" builddir="$srcdir/$_repo-$_commit" +install="$pkgname-downstream-openrc.post-install" subpackages=" $pkgname-downstream:downstream $pkgname-downstream-openrc:downstream_openrc @@ -44,7 +45,6 @@ downstream_openrc() { pkgdesc="Service for enabling WLAN on downstream kernels" depends="$pkgname-downstream" install_if="$pkgname-downstream=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" install -Dm755 "$srcdir"/sd8x-wlan.initd "$subpkgdir"/etc/init.d/sd8x-wlan } diff --git a/device/community/soc-qcom-msm8953/APKBUILD b/device/community/soc-qcom-msm8953/APKBUILD index 723598f4d..f0a9b4bf5 100644 --- a/device/community/soc-qcom-msm8953/APKBUILD +++ b/device/community/soc-qcom-msm8953/APKBUILD @@ -3,12 +3,13 @@ pkgname=soc-qcom-msm8953 pkgdesc="Common package for Qualcomm MSM8953 devices" pkgver=18 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" options="!check !archcheck !tracedeps pmb:cross-native" depends="$pkgname-ucm swclock-offset" +install="$pkgname-modem-openrc.post-install $pkgname-modem-openrc.post-upgrade" subpackages=" $pkgname-gpu $pkgname-modem @@ -54,7 +55,6 @@ modem() { modem_openrc() { install_if="$pkgname-modem=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" openrc q6voiced-openrc diff --git a/device/community/soc-qcom-sc7180/APKBUILD b/device/community/soc-qcom-sc7180/APKBUILD index 8769f8536..fed449e50 100644 --- a/device/community/soc-qcom-sc7180/APKBUILD +++ b/device/community/soc-qcom-sc7180/APKBUILD @@ -2,11 +2,17 @@ pkgname=soc-qcom-sc7180 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices" pkgver=2 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" options="!check !archcheck !tracedeps" +install=" + $pkgname-nonfree-firmware-openrc.post-install + $pkgname-nonfree-firmware-openrc.post-upgrade + $pkgname-nonfree-firmware-woa-openrc.post-install + $pkgname-nonfree-firmware-woa-openrc.post-upgrade + " subpackages=" $pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc @@ -32,7 +38,6 @@ nonfree_firmware() { nonfree_firmware_openrc() { depends="openrc rmtfs-openrc" install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" mkdir "$subpkgdir" } @@ -54,7 +59,6 @@ nonfree_firmware_woa_openrc() { tqftpserv-openrc " install_if="$pkgname-nonfree-firmware-woa=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" mkdir "$subpkgdir" } diff --git a/device/community/wl1251-cal/APKBUILD b/device/community/wl1251-cal/APKBUILD index 019bce869..d6f4f2cb4 100644 --- a/device/community/wl1251-cal/APKBUILD +++ b/device/community/wl1251-cal/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Dang Huynh pkgname=wl1251-cal pkgver=1.2 -pkgrel=7 +pkgrel=8 pkgdesc="Retrieve wl1251 calibration data from a CAL partition and feed it to the driver" url="https://github.com/maemo-leste/wl1251-cal" arch="armv7" license="LGPL-2.1-only" makedepends="linux-headers" +install="$pkgname-openrc.post-install" subpackages="$pkgname-openrc $pkgname-systemd" source="$pkgname-$pkgver.tar.gz::https://github.com/maemo-leste/wl1251-cal/archive/refs/tags/$pkgver.tar.gz wl1251-cal.initd @@ -26,7 +27,6 @@ package() { openrc() { default_openrc - install="$subpkgname.post-install" install -Dm755 "$srcdir"/wl1251-cal.initd "$subpkgdir"/etc/init.d/wl1251-cal } diff --git a/device/testing/device-lenovo-q706f/APKBUILD b/device/testing/device-lenovo-q706f/APKBUILD index 98367cbf4..fdb699113 100644 --- a/device/testing/device-lenovo-q706f/APKBUILD +++ b/device/testing/device-lenovo-q706f/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-lenovo-q706f pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)" pkgver=4 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -21,6 +21,12 @@ depends=" swclock-offset " makedepends="devicepkg-dev" +install=" + $pkgname-nonfree-firmware-openrc.post-install + $pkgname-nonfree-firmware-openrc.post-upgrade + $pkgname-openrc.post-install + $pkgname-openrc.post-upgrade + " source=" 81-libssc-lenovo-q706f.rules alsa-ucm-conf/q706f.conf @@ -80,7 +86,6 @@ nonfree_firmware() { nonfree_firmware_openrc() { install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="openrc" mkdir "$subpkgdir" @@ -88,7 +93,6 @@ nonfree_firmware_openrc() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc openrc" mkdir -p "$subpkgdir" diff --git a/device/testing/device-xiaomi-perseus/APKBUILD b/device/testing/device-xiaomi-perseus/APKBUILD index a0d18bfdc..d11b85466 100644 --- a/device/testing/device-xiaomi-perseus/APKBUILD +++ b/device/testing/device-xiaomi-perseus/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-xiaomi-perseus pkgdesc="Xiaomi Mi Mix 3" pkgver=1 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -17,6 +17,10 @@ depends=" unl0kr-fbforcerefresh " makedepends="devicepkg-dev" +install=" + $pkgname-nonfree-firmware-openrc.post-install + $pkgname-nonfree-firmware-openrc.post-upgrade +" subpackages=" $pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc @@ -46,7 +50,7 @@ nonfree_firmware() { soc-qcom-modem " - install -Dm644 81-libssc-xiaomi-perseus.rules \ + install -Dm644 "$srcdir"/81-libssc-xiaomi-perseus.rules \ "$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-perseus.rules install -Dm644 "$srcdir"/hexagonrpcd.confd \ "$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf @@ -54,7 +58,6 @@ nonfree_firmware() { nonfree_firmware_openrc() { install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc" mkdir -p "$subpkgdir" @@ -63,9 +66,11 @@ nonfree_firmware_openrc() { pmtest() { depends="bootrr qrtr firmware-xiaomi-perseus unl0kr" install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci" - install="$subpkgname.post-install" + install="$subpkgdir/$subpkgname.post-install" - devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgname.post-install" + mkdir -p "$subpkgdir" + + devicepkg_pmtest_post_install "ttyMSM0,115200" > "$subpkgdir/$subpkgname.post-install" } sha512sums=" diff --git a/device/testing/soc-qcom-msm8909/APKBUILD b/device/testing/soc-qcom-msm8909/APKBUILD index 1c04923e2..0c4497483 100644 --- a/device/testing/soc-qcom-msm8909/APKBUILD +++ b/device/testing/soc-qcom-msm8909/APKBUILD @@ -1,12 +1,13 @@ pkgname=soc-qcom-msm8909 pkgdesc="Common package for Qualcomm MSM8909 devices" pkgver=1 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="GPL-3.0-or-later" arch="armv7 aarch64" options="!check !archcheck" depends="soc-qcom-msm8916" +install="$pkgname-modem-openrc.post-install" subpackages=" $pkgname-modem $pkgname-modem-openrc:modem_openrc @@ -29,7 +30,6 @@ modem() { modem_openrc() { install_if="$pkgname-modem=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install" install -D -m755 "$srcdir"/msm8909-modem-wwan-port.initd \ "$subpkgdir"/etc/init.d/msm8909-modem-wwan-port