diff --git a/device/community/device-google-asurada/APKBUILD b/device/community/device-google-asurada/APKBUILD index 6439c18b5..8de2ed6df 100644 --- a/device/community/device-google-asurada/APKBUILD +++ b/device/community/device-google-asurada/APKBUILD @@ -3,7 +3,7 @@ maintainer="WeirdTreeThing " pkgname=device-google-asurada pkgdesc="Google Asurada Chromebooks" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,6 +12,9 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mediatek + linux-firmware-rtl_bt + linux-firmware-rtw88 linux-postmarketos-mediatek-mt81 postmarketos-base postmarketos-cros-common @@ -19,7 +22,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -29,12 +31,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="linux-firmware-mediatek linux-firmware-rtw88 linux-firmware-rtl_bt" - mkdir "$subpkgdir" -} - sha512sums=" fdb0fb9ee08daf97653dbd772658a65958e99d0efedc64bcc9b9c66299177d569bd18391f778cda028abdb901e6f0ec630f3a7c88e4354da4c6402cafeb329a8 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/community/device-google-bonito/APKBUILD b/device/community/device-google-bonito/APKBUILD index 4ce923569..6cac8fdfa 100644 --- a/device/community/device-google-bonito/APKBUILD +++ b/device/community/device-google-bonito/APKBUILD @@ -2,7 +2,7 @@ maintainer="Anjandev Momi " pkgname=device-google-bonito pkgdesc="Google Pixel 3a XL" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -48,7 +48,7 @@ build() { } package() { - replaces="$pkgname-nonfree-firmware" + replaces="device-google-bonito-nonfree-firmware" devicepkg_package $startdir $pkgname # Sensors depend on ADSP firmware and the sensors registry served over FastRPC. diff --git a/device/community/device-google-cherry/APKBUILD b/device/community/device-google-cherry/APKBUILD index 6a4cb3653..f4ee68bd0 100644 --- a/device/community/device-google-cherry/APKBUILD +++ b/device/community/device-google-cherry/APKBUILD @@ -3,7 +3,7 @@ maintainer="Ingo Reitz <9l@9lo.re>" pkgname=device-google-cherry pkgdesc="Google Cherry Chromebooks" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,6 +12,7 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mediatek linux-postmarketos-mediatek-mt81 postmarketos-base postmarketos-cros-common @@ -19,7 +20,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -29,12 +29,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT Firmware" - depends="linux-firmware-mediatek" - mkdir "$subpkgdir" -} - sha512sums=" e1940e47cfefaec5e421191de6523b769a3c4bbf12a84e6b5769749229155932f08fb70a71b644819adc91c00ce0721ab077f888e7263c296851ae36d69fc0a8 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/community/device-google-corsola/APKBUILD b/device/community/device-google-corsola/APKBUILD index 69ca799ad..cfa42a7dc 100644 --- a/device/community/device-google-corsola/APKBUILD +++ b/device/community/device-google-corsola/APKBUILD @@ -3,7 +3,7 @@ maintainer="Alicja Michalska " pkgname=device-google-corsola pkgdesc="Google Corsola Chromebooks" -pkgver=11 +pkgver=12 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,19 +12,20 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mediatek linux-postmarketos-mediatek-mt81 postmarketos-base postmarketos-cros-common soc-mediatek-mt8183 " makedepends="devicepkg-dev" +replaces="device-google-corsola-nonfree-firmware" _ucm_commit="b728563a07ebcd05545c60989412ae023b1dd06d" source="deviceinfo kernel-cmdline.conf modules-initfs alsa-ucm-conf-$_ucm_commit.tar.gz::https://github.com/alsa-project/alsa-ucm-conf/archive/$_ucm_commit.tar.gz " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -32,19 +33,13 @@ build() { package() { devicepkg_package $startdir $pkgname -} - -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="linux-firmware-mediatek alsa-ucm-conf" + mkdir -p "$pkgdir"/usr/lib/firmware/mediatek/sof-tplg # Symlink for SOF firmware - _dir="$subpkgdir/usr/lib/firmware/mediatek/sof-tplg" - mkdir -p "$_dir" + ln -s sof-mt8186.tplg.zst \ + "$pkgdir"/usr/lib/firmware/mediatek/sof-tplg/sof-mt8186-google-steelix.tplg.zst - ln -s sof-mt8186.tplg.zst "$_dir"/sof-mt8186-google-steelix.tplg.zst - - # Alsa UCM configs + local _ucm_files _ucm_files=" ucm2/MediaTek/mt8186-sof/init.conf ucm2/MediaTek/mt8186-sof/mt6366-rt1019-rt5682s/HiFi.conf @@ -54,8 +49,8 @@ nonfree_firmware() { " for file in $_ucm_files do - install -Dm644 "$srcdir/alsa-ucm-conf-$_ucm_commit/$file" \ - "$subpkgdir/usr/share/alsa/$file" + install -Dm644 "$srcdir"/alsa-ucm-conf-"$_ucm_commit"/"$file" \ + "$pkgdir"/usr/share/alsa/"$file" done } diff --git a/device/community/device-google-gru/APKBUILD b/device/community/device-google-gru/APKBUILD index efac1f172..e3d6b7296 100644 --- a/device/community/device-google-gru/APKBUILD +++ b/device/community/device-google-gru/APKBUILD @@ -2,8 +2,8 @@ maintainer="Sebastian Fleer " pkgname=device-google-gru pkgdesc="Google Gru Chromebooks" -pkgver=12 -pkgrel=1 +pkgver=13 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,6 +11,10 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-ath10k + linux-firmware-mrvl + linux-firmware-qca + linux-firmware-rockchip linux-postmarketos-rockchip postmarketos-base postmarketos-cros-common @@ -18,7 +22,6 @@ depends=" " makedepends="devicepkg-dev" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc $pkgname-systemd " @@ -55,12 +58,6 @@ package() { "$pkgdir"/usr/lib/systemd/system.conf.d/90-gru-watchdog.conf } -nonfree_firmware() { - pkgdesc="WiFi/BT and DP firmware" - depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mrvl linux-firmware-rockchip" - mkdir "$subpkgdir" -} - openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" depends="eudev-hwids>=3.2.12-r0" diff --git a/device/community/device-google-kukui/APKBUILD b/device/community/device-google-kukui/APKBUILD index 9b58fb2ff..8b72e2b99 100644 --- a/device/community/device-google-kukui/APKBUILD +++ b/device/community/device-google-kukui/APKBUILD @@ -3,7 +3,7 @@ maintainer="WeirdTreeThing " pkgname=device-google-kukui pkgdesc="Google Kukui Chromebooks" -pkgver=13 +pkgver=14 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,6 +12,9 @@ options="!check !archcheck" depends=" alsa-ucm-conf-cros depthcharge-tools + linux-firmware-ath10k + linux-firmware-mediatek + linux-firmware-qca linux-postmarketos-mediatek-mt81 postmarketos-base postmarketos-cros-common @@ -19,7 +22,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" # provides and replaces to switch old installations to this package provides=" @@ -67,12 +69,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mediatek" - mkdir "$subpkgdir" -} - sha512sums=" f4f2560477dfd8d02c03ed110000966784e01b05ec5a7e26ac16ffabdc6bafc53f52892ba24a164743c917c57bf5d614a548c384d1038c557aa53604449fafc9 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/community/device-google-oak/APKBUILD b/device/community/device-google-oak/APKBUILD index 71de03d90..08be3e365 100644 --- a/device/community/device-google-oak/APKBUILD +++ b/device/community/device-google-oak/APKBUILD @@ -5,8 +5,8 @@ maintainer="Adam Thiede " pkgname=device-google-oak pkgdesc="Google Oak Chromebooks" -pkgver=10 -pkgrel=1 +pkgver=11 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -14,6 +14,9 @@ options="!check !archcheck" depends=" alsa-utils depthcharge-tools + firmware-powervr-gx6250 + linux-firmware-mediatek + linux-firmware-mrvl linux-postmarketos-mediatek-mt8173 mesa-vulkan-imagination postmarketos-base @@ -21,7 +24,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" # provides and replaces to switch old installations to this package provides="google-elm=$pkgver-r$pkgrel google-hana=$pkgver-r$pkgrel" @@ -35,12 +37,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT and GPU firmware" - depends="linux-firmware-mrvl linux-firmware-mediatek firmware-powervr-gx6250" - mkdir "$subpkgdir" -} - sha512sums=" cab64e21c7710d875cac4ed459a7c6ca8547d7234704e8cb80e875a5cfc65cab6cac00be0c3d9b9300e96f9a45c1b315896708b488024dcffc7cb42c850127e0 deviceinfo 09dfc86138379250bc72b3395a4a94257da81d359cb210ee871cfa8efe6450ca3bbd95a134f365bc509bebcde5e882433805d9b265bdd8df12fd85c86491d66f kernel-cmdline.conf diff --git a/device/community/device-google-peach-pit/APKBUILD b/device/community/device-google-peach-pit/APKBUILD index db2df9460..64ef5071a 100644 --- a/device/community/device-google-peach-pit/APKBUILD +++ b/device/community/device-google-peach-pit/APKBUILD @@ -2,8 +2,8 @@ maintainer="Henrik Grimler " pkgname=device-google-peach-pit pkgdesc="Samsung Chromebook 2 (11.6 inch)" -pkgver=10 -pkgrel=1 +pkgver=11 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -11,6 +11,8 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mrvl + linux-firmware-s5p-mfc linux-postmarketos-exynos5 postmarketos-base postmarketos-cros-common @@ -26,7 +28,6 @@ source=" " subpackages=" $pkgname-i3wm - $pkgname-nonfree-firmware:nonfree_firmware " build() { @@ -51,12 +52,6 @@ i3wm() { "$subpkgdir"/usr/share/X11/xorg.conf.d/90-tap-to-click.conf } -nonfree_firmware() { - pkgdesc="WiFi/BT and MFC firmware" - depends="linux-firmware-mrvl linux-firmware-s5p-mfc" - mkdir "$subpkgdir" -} - sha512sums=" e0bf8ca7cb16d413b51c24860cd4018f3ee52f9ce4da80367832dd67e7bce5c98b249ccf2e212ee9d13b0e8664fcb8f08e97410f6021e2d465951d74f651cc21 deviceinfo fef8383cd86332dbdb247b81791a7e5ca0775f93f5cd2ef5033d1ea340920fcdddf9e6b5c15bcc79562a5da784964503643e184030211019f08e103aafcf4b83 kernel-cmdline.conf diff --git a/device/community/device-google-sargo/APKBUILD b/device/community/device-google-sargo/APKBUILD index 52fe7906d..7bd52b9e8 100644 --- a/device/community/device-google-sargo/APKBUILD +++ b/device/community/device-google-sargo/APKBUILD @@ -2,8 +2,8 @@ maintainer="Richard Acayan " pkgname=device-google-sargo pkgdesc="Google Pixel 3a" -pkgver=18 -pkgrel=1 +pkgver=19 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -27,6 +27,7 @@ depends=" unl0kr-fbforcerefresh " makedepends="devicepkg-dev" +replaces="device-google-sargo-nonfree-firmware" install="$pkgname-openrc.post-install" source=" 81-libssc-google-sargo.rules @@ -50,7 +51,6 @@ build() { } package() { - replaces="$pkgname-nonfree-firmware" devicepkg_package $startdir $pkgname # Sensors depend on ADSP firmware and the sensors registry served over FastRPC. diff --git a/device/community/device-google-trogdor/APKBUILD b/device/community/device-google-trogdor/APKBUILD index c2d16688f..0be6d16f4 100644 --- a/device/community/device-google-trogdor/APKBUILD +++ b/device/community/device-google-trogdor/APKBUILD @@ -3,7 +3,7 @@ maintainer="Alicja Michalska " pkgname=device-google-trogdor pkgdesc="Google Trogdor Chromebooks" -pkgver=12 +pkgver=13 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,14 +12,18 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + firmware-google-trogdor + linux-firmware-ath10k + linux-firmware-qca + linux-firmware-qcom linux-postmarketos-qcom-sc7180 + msm-cros-efs-loader postmarketos-base postmarketos-cros-common soc-qcom-sc7180 " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source=" deviceinfo kernel-cmdline.conf @@ -37,18 +41,6 @@ package() { "$pkgdir"/usr/lib/udev/rules.d/99-google-trogdor-accel.rules } -nonfree_firmware() { - pkgdesc="WiFi/BT, Modem, GPU, Venus firmware" - depends=" - linux-firmware-qcom - linux-firmware-qca - linux-firmware-ath10k - firmware-google-trogdor - msm-cros-efs-loader - " - mkdir "$subpkgdir" -} - openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" depends="eudev-hwids" diff --git a/device/community/device-google-veyron/APKBUILD b/device/community/device-google-veyron/APKBUILD index 940b489b4..d4e210b76 100644 --- a/device/community/device-google-veyron/APKBUILD +++ b/device/community/device-google-veyron/APKBUILD @@ -3,7 +3,7 @@ maintainer="Eric Anderson " pkgname=device-google-veyron pkgdesc="Google Veyron Chromebooks" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,11 +12,12 @@ options="!check !archcheck" depends=" alsa-ucm-conf>=1.2.7.1-r0 depthcharge-tools + firmware-google-veyron-brcm + linux-firmware-mrvl linux-google-veyron postmarketos-base postmarketos-cros-common " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" @@ -46,13 +47,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="linux-firmware-mrvl firmware-google-veyron-brcm" - mkdir "$subpkgdir" -} - - sha512sums=" aa1e5318136f26709eb978639cfe3be264c36a757e0240eeb7c450f5596fb7b1fbb3c52f73ecd3dc67d6a48d9165c1e02e4d494a3e7ec93960b45027fc24eae5 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index 7f5daef17..0aaf05519 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -2,7 +2,7 @@ maintainer="Casey Connolly " pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" -pkgver=27 +pkgver=28 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -40,13 +40,13 @@ subpackages=" $pkgname-openrc $pkgname-systemd " +replaces="device-oneplus-enchilada-nonfree-firmware" build() { devicepkg_build $startdir $pkgname } package() { - replaces="$pkgname-nonfree-firmware" devicepkg_package $startdir $pkgname install -Dm644 "$srcdir"/q6voiced.conf \ diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD index 42915e3eb..223cbb593 100644 --- a/device/community/device-pine64-pinebookpro/APKBUILD +++ b/device/community/device-pine64-pinebookpro/APKBUILD @@ -2,7 +2,7 @@ maintainer="Hugo Osvaldo Barrera " pkgname=device-pine64-pinebookpro pkgdesc="PINE64 Pinebook Pro" -pkgver=22 +pkgver=23 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,12 +10,14 @@ arch="aarch64" options="!check !archcheck" depends=" alsa-ucm-conf>=1.2.7 + iw + linux-firmware-brcm + linux-firmware-rockchip linux-postmarketos-rockchip>=5.14 nvme-cli postmarketos-base>=25-r1 soc-rockchip-rk3399 u-boot-pinebookpro - iw " makedepends="devicepkg-dev" install=" @@ -24,7 +26,11 @@ install=" $pkgname-openrc.post-install $pkgname-openrc.post-upgrade " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind $pkgname-openrc" +subpackages=" + $pkgname-elogind + $pkgname-openrc + " +replaces="device-pine64-pinebookpro-nonfree-firmware" source=" deviceinfo kernel-cmdline.conf @@ -46,6 +52,12 @@ package() { install -D -m755 "$srcdir"/wlan-powersave-off.initd \ "$pkgdir"/etc/init.d/wlan-powersave-off + + # Workaround for kernel load brcm43455 firmware bug + # details: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/4285 + mkdir -p "$pkgdir"/usr/lib/firmware/brcm + ln -s brcmfmac43455-sdio.AW-CM256SM.txt.zst \ + "$pkgdir"/usr/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt.zst } elogind() { @@ -54,16 +66,6 @@ elogind() { "$subpkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf } -nonfree_firmware() { - pkgdesc="Wifi, Bluetooth and video-out firmware" - depends="linux-firmware-brcm linux-firmware-rockchip" - mkdir "$subpkgdir" - # Workaround for kernel load brcm43455 firmware bug - # details: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/4285 - mkdir -p "$subpkgdir"/usr/lib/firmware/brcm - ln -s brcmfmac43455-sdio.AW-CM256SM.txt.zst "$subpkgdir"/usr/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt.zst -} - openrc() { default_openrc depends="eudev-hwids openrc" diff --git a/device/community/device-pine64-pinenote/APKBUILD b/device/community/device-pine64-pinenote/APKBUILD index 48b62695e..6a53c0cdc 100644 --- a/device/community/device-pine64-pinenote/APKBUILD +++ b/device/community/device-pine64-pinenote/APKBUILD @@ -1,8 +1,8 @@ maintainer="Antoine Martin (ayakael) " pkgname=device-pine64-pinenote pkgdesc="Pine64 PineNote" -pkgver=15 -pkgrel=3 +pkgver=16 +pkgrel=0 _commit="42cf0c3dc26d6e0b2a32ef5a00e7ca4ae77034c7" _swayconfver="v1.1.0" url="https://postmarketos.org" @@ -11,6 +11,8 @@ arch="aarch64" options="!check !archcheck" # py3-numpy used by rockchip_ebc management libraries depends=" + linux-firmware-brcm + linux-firmware-cypress linux-pine64-pinenote postmarketos-base py3-numpy @@ -47,9 +49,6 @@ source=" tinydm-ebc-workaround-openrc.initd " subpackages=" - $pkgname-nonfree-firmware - $pkgname-nonfree-firmware-openrc:firmware_openrc - $pkgname-nonfree-firmware-systemd:firmware_systemd $pkgname-openrc $pkgname-sway-hrdl $pkgname-systemd @@ -57,12 +56,15 @@ subpackages=" $pkgname-x11 " install=" - $pkgname-sway-hrdl.post-install - $pkgname-sway-hrdl.post-deinstall - $pkgname-nonfree-firmware.post-upgrade - $pkgname-nonfree-firmware.pre-install - $pkgname-nonfree-firmware-openrc.post-install $pkgname-openrc.post-install + $pkgname.post-upgrade + $pkgname.pre-install + $pkgname-sway-hrdl.post-deinstall + $pkgname-sway-hrdl.post-install +" +replaces=" + device-pine64-pinenote-nonfree-firmware + firmware-pine64-pinenote " builddir="$srcdir"/pinenote-dist-$_commit _swayconfdir="$srcdir"/pinenote-config-sway-$_swayconfver @@ -106,6 +108,21 @@ package() { ./udev/rules.d/83-backlight.rules \ ./udev/rules.d/84-rockchip-ebc-power.rules \ -t "$pkgdir"/usr/lib/udev/rules.d + + # waveform firmware is provided locally via /dev/disk/by-label/waveform + # extracted using waveform_exctract.sh, then adapted to kernel using wbf_to_custom.py + # initd or systemd service execute these on first boot + install -Dm644 "$srcdir"/30-eink-waveform.files \ + "$pkgdir"/usr/share/mkinitfs/files/30-eink-waveform.files + install -Dm755 \ + "$builddir"/bin/wbf_to_custom.py \ + "$builddir"/bin/read_file.py \ + "$builddir"/bin/waveform_extract.sh \ + -t "$pkgdir"/usr/lib/pinenote + + # symbolic link for wifi firmware to where drivers expects it + mkdir -p "$pkgdir"/usr/lib/firmware/brcm + ln -s ../cypress/cyfmac43455-sdio.bin.zst "$pkgdir"/usr/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.bin.zst ) # bins @@ -222,49 +239,13 @@ xournalpp() { -t "$subpkgdir"/etc/skel/.config/xournalpp } -firmware() { - pkgdesc="WiFi, Bluetooth and display firmware" - depends="linux-firmware-cypress linux-firmware-brcm" - replaces="firmware-pine64-pinenote" - - # waveform firmware is provided locally via /dev/disk/by-label/waveform - # extracted using waveform_exctract.sh, then adapted to kernel using wbf_to_custom.py - # initd or systemd service execute these on first boot - install -Dm644 "$srcdir"/30-eink-waveform.files \ - "$subpkgdir"/usr/share/mkinitfs/files/30-eink-waveform.files - install -Dm755 \ - "$builddir"/bin/wbf_to_custom.py \ - "$builddir"/bin/read_file.py \ - "$builddir"/bin/waveform_extract.sh \ - -t "$subpkgdir"/usr/lib/pinenote - - # symbolic link for wifi firmware to where drivers expects it - mkdir -p "$subpkgdir"/usr/lib/firmware/brcm - ln -s ../cypress/cyfmac43455-sdio.bin.zst "$subpkgdir"/usr/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.bin.zst -} - openrc() { + replaces="device-pine64-pinenote-nonfree-firmware-openrc" # rockchip_ebc sometimes fails to load the initial waveform. # This forces a reload before starting tinydm install -Dm755 "$srcdir"/tinydm-ebc-workaround-openrc.initd \ "$subpkgdir"/etc/init.d/tinydm-ebc - # source `install_if`, `pkgdesc` and `depends` - default_openrc -} - -systemd() { - # rockchip_ebc sometimes fails to load the initial waveform. - # This forces a reload before starting tinydm - install -Dm644 \ - "$srcdir"/tinydm-ebc-workaround-systemd.conf \ - "$subpkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf - - # source `install_if`, `pkgdesc` and `depends` - default_systemd -} - -firmware_openrc() { install -Dm755 "$srcdir"/pinenote-init-waveform.initd \ "$subpkgdir"/etc/init.d/pinenote-init-waveform @@ -272,7 +253,14 @@ firmware_openrc() { default_openrc } -firmware_systemd() { +systemd() { + replaces="device-pine64-pinenote-nonfree-firmware-systemd" + # rockchip_ebc sometimes fails to load the initial waveform. + # This forces a reload before starting tinydm + install -Dm644 \ + "$srcdir"/tinydm-ebc-workaround-systemd.conf \ + "$subpkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf + install -Dm644 \ "$builddir"/systemd/pinenote-hrdl-extract-waveform.service \ "$builddir"/systemd/pinenote-hrdl-convert-waveform.service \ diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware-openrc.post-install b/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware-openrc.post-install deleted file mode 100644 index ea28c9830..000000000 --- a/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware-openrc.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rc-update add pinenote-init-waveform boot diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.pre-install b/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.pre-install deleted file mode 120000 index ecf1adf87..000000000 --- a/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.pre-install +++ /dev/null @@ -1 +0,0 @@ -device-pine64-pinenote-nonfree-firmware.post-upgrade \ No newline at end of file diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote-openrc.post-install b/device/community/device-pine64-pinenote/device-pine64-pinenote-openrc.post-install index 3985a432d..5262dc164 100644 --- a/device/community/device-pine64-pinenote/device-pine64-pinenote-openrc.post-install +++ b/device/community/device-pine64-pinenote/device-pine64-pinenote-openrc.post-install @@ -1,3 +1,4 @@ #!/bin/sh +rc-update add pinenote-init-waveform boot rc-update add tinydm-ebc diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.post-upgrade b/device/community/device-pine64-pinenote/device-pine64-pinenote.post-upgrade similarity index 100% rename from device/community/device-pine64-pinenote/device-pine64-pinenote-nonfree-firmware.post-upgrade rename to device/community/device-pine64-pinenote/device-pine64-pinenote.post-upgrade diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote.pre-install b/device/community/device-pine64-pinenote/device-pine64-pinenote.pre-install new file mode 120000 index 000000000..d0e4381ac --- /dev/null +++ b/device/community/device-pine64-pinenote/device-pine64-pinenote.pre-install @@ -0,0 +1 @@ +device-pine64-pinenote.post-upgrade \ No newline at end of file diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD index 7d7b3277a..ef6709a27 100644 --- a/device/community/device-pine64-pinephone/APKBUILD +++ b/device/community/device-pine64-pinephone/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Jan Jasper de Kroon maintainer="Arnav Singh " pkgname=device-pine64-pinephone -pkgver=13 +pkgver=14 pkgrel=0 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" @@ -13,7 +13,6 @@ subpackages=" $pkgname-audio $pkgname-gnome $pkgname-kirigami:kirigami - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc $pkgname-plasma-mobile:plasma_mobile $pkgname-sensorfw @@ -26,7 +25,11 @@ subpackages=" depends=" atinout eg25-manager + firmware-pine64-ov5640 + fwupd>=1.8.6 iw + linux-firmware-rtl_bt + linux-firmware-rtlwifi linux-postmarketos-allwinner>=5.14 megapixels mesa-egl @@ -34,7 +37,6 @@ depends=" postprocessd u-boot-pinephone>=2021.01_git20201228-r2 u-boot-tools - fwupd>=1.8.6 " makedepends=" devicepkg-dev @@ -77,7 +79,6 @@ source=" # workaround to purge the -elogind subpackage that was previously # created/installed provides="$pkgname-elogind=$pkgver-r$pkgrel" -_pmb_recommends="$pkgname-nonfree-firmware" build() { devicepkg_build $startdir $pkgname @@ -152,16 +153,6 @@ package() { install -Dm755 "$srcdir"/ppkb.sh "$pkgdir"/etc/profile.d/ppkb.sh } -nonfree_firmware() { - pkgdesc="Wifi, Bluetooth and Autofocus firmware" - depends=" - linux-firmware-rtlwifi - linux-firmware-rtl_bt - firmware-pine64-ov5640 - " - mkdir "$subpkgdir" -} - openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" depends="eg25-manager-openrc openrc" diff --git a/device/community/device-pine64-pinephonepro/APKBUILD b/device/community/device-pine64-pinephonepro/APKBUILD index c5d86ba37..c49f12a12 100644 --- a/device/community/device-pine64-pinephonepro/APKBUILD +++ b/device/community/device-pine64-pinephonepro/APKBUILD @@ -2,8 +2,8 @@ maintainer="Jan Jasper de Kroon " pkgname=device-pine64-pinephonepro pkgdesc="PINE64 PinePhone Pro" -pkgver=8 -pkgrel=1 +pkgver=9 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -12,9 +12,11 @@ options="!check !archcheck pmb:strict" depends=" alsa-ucm-conf>=1.2.6.2 eg25-manager>=0.4.2 + fwupd>=1.8.6 + linux-firmware-brcm + linux-firmware-rockchip linux-pine64-pinephonepro postmarketos-base>=25-r1 - fwupd>=1.8.6 soc-rockchip-rk3399 " makedepends=" @@ -24,7 +26,6 @@ makedepends=" " install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-gnome $pkgname-openrc $pkgname-sway @@ -105,15 +106,6 @@ package() { install -Dm755 "$srcdir"/ppkb.sh "$pkgdir"/etc/profile.d/ppkb.sh } -nonfree_firmware() { - pkgdesc="Wifi, Bluetooth and video-out firmware" - depends=" - linux-firmware-brcm - linux-firmware-rockchip - " - mkdir "$subpkgdir" -} - gnome() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome" install -Dm644 "$srcdir"/51_keyboard.gschema.override -t \ diff --git a/device/community/device-pine64-rockpro64/APKBUILD b/device/community/device-pine64-rockpro64/APKBUILD index fd977c732..1777d4cf9 100644 --- a/device/community/device-pine64-rockpro64/APKBUILD +++ b/device/community/device-pine64-rockpro64/APKBUILD @@ -1,16 +1,23 @@ # Reference: maintainer="Bart Ribbers " pkgname=device-pine64-rockpro64 -pkgver=5 +pkgver=6 pkgrel=0 pkgdesc="PINE64 ROCKPro64" url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base>=25-r1 linux-postmarketos-rockchip soc-rockchip-rk3399 u-boot-rockchip" +depends=" + firmware-pine64-rockpro64 + linux-firmware-brcm + linux-firmware-rockchip + linux-postmarketos-rockchip + postmarketos-base>=25-r1 + soc-rockchip-rk3399 + u-boot-rockchip + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf" build() { @@ -21,12 +28,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Wi-Fi, Bluetooth and video-out firmware" - depends="firmware-pine64-rockpro64 linux-firmware-brcm linux-firmware-rockchip" - mkdir "$subpkgdir" -} - sha512sums=" c0adebb2ea75d9ec429d2b3bdf91bd11d35d4bb9ce8ffcffa5f21f9686a0e8e47aed344ea167df7aa7a12d5efd89ef12aefed27476e908d2b6bca5857c76f716 deviceinfo b7708fa690798ece0368d21cda7379a8824aaa050444401029a1aa698b85a9920dc4aed78b909370e005f2ace9554cd2e499eefd1570615e14a25e2be420bbc5 kernel-cmdline.conf diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD index 637961edd..7f3e9d7d1 100644 --- a/device/community/device-purism-librem5/APKBUILD +++ b/device/community/device-purism-librem5/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Stefan Hansson maintainer="Alistair Francis " pkgname=device-purism-librem5 -pkgver=14 +pkgver=15 pkgrel=0 _confver=77 _purismrel=2 @@ -20,6 +20,8 @@ depends=" bluez bluez-deprecated bm818-tools + firmware-brcm43752 + firmware-siliconlabs-rs9116 gnss-share i2c-tools iw @@ -28,8 +30,8 @@ depends=" millipixels postmarketos-base postmarketos-base-ui-audio-backend-pulseaudio - pulseaudio<9990 postprocessd + pulseaudio<9990 u-boot-librem5 u-boot-tools wys @@ -60,7 +62,6 @@ source=" # $pkgname-openrc is out of order to allow collecting the remaining openrc # files using the default function subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-pulseaudio $pkgname-smartcard $pkgname-smartcard-openrc:smartcard_openrc @@ -191,12 +192,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Wifi and Bluetooth firmware" - depends="firmware-siliconlabs-rs9116 firmware-brcm43752" - mkdir "$subpkgdir" -} - sha512sums=" ab1db95e614070eee712914b8b7f1133f4993d6ed0a9d4b88f1d87e87c024c726b6260e570211656f02712565e23ae92ad2c4708c4d0d7bd1eb30dc1443fa33c librem5-base-pureos-77pureos2.tar.gz 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509 00-mesa.sh diff --git a/device/community/device-samsung-espresso10/APKBUILD b/device/community/device-samsung-espresso10/APKBUILD index 55b6a62e2..a8233e50c 100644 --- a/device/community/device-samsung-espresso10/APKBUILD +++ b/device/community/device-samsung-espresso10/APKBUILD @@ -2,16 +2,20 @@ maintainer="Mithil Bavishi " pkgname=device-samsung-espresso10 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)" -pkgver=6 -pkgrel=1 +pkgver=7 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" -depends="postmarketos-base linux-postmarketos-omap mkbootimg" +depends=" + firmware-samsung-espresso + linux-postmarketos-omap + mkbootimg + postmarketos-base + " makedepends="devicepkg-dev" source="deviceinfo" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -21,12 +25,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="$pkgdesc (WiFi firmware)" - depends="firmware-samsung-espresso" - mkdir "$subpkgdir" -} - sha512sums=" 82d2bb832411d9ef220d3be02bf84b7a6be2c5177b48549d8e90f10c651962ba5721ad35ab153a195e8ec26ceccb37dc23318b5d72b5cf1b0014a3fe07fa3a1e deviceinfo " diff --git a/device/community/device-samsung-espresso7/APKBUILD b/device/community/device-samsung-espresso7/APKBUILD index 004556e20..c14f665c4 100644 --- a/device/community/device-samsung-espresso7/APKBUILD +++ b/device/community/device-samsung-espresso7/APKBUILD @@ -3,16 +3,20 @@ maintainer="Mithil Bavishi " pkgname=device-samsung-espresso7 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)" -pkgver=7 -pkgrel=1 +pkgver=8 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" -depends="postmarketos-base linux-postmarketos-omap mkbootimg" +depends=" + firmware-samsung-espresso + linux-postmarketos-omap + mkbootimg + postmarketos-base + " makedepends="devicepkg-dev" source="deviceinfo" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" replaces="device-samsung-espresso3g" provides="device-samsung-espresso3g=$pkgver-r$pkgrel" @@ -24,12 +28,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="$pkgdesc (WiFi firmware)" - depends="firmware-samsung-espresso" - mkdir "$subpkgdir" -} - sha512sums=" b9ff401a7ea1a2e9037cd5ef392a6a5eafbb6bb164d1a6ba7ac74bf39de3cddc92db536e0e3fed83a7b74a6036cad3c1703e4b6791fef43d3b560a776e09cfe3 deviceinfo " diff --git a/device/community/device-samsung-m0/APKBUILD b/device/community/device-samsung-m0/APKBUILD index 07206fccb..041f385c0 100644 --- a/device/community/device-samsung-m0/APKBUILD +++ b/device/community/device-samsung-m0/APKBUILD @@ -2,7 +2,7 @@ maintainer="Stefan Hansson " pkgname=device-samsung-m0 pkgdesc="Samsung Galaxy S III" -pkgver=12 +pkgver=13 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,6 +10,9 @@ arch="armv7" options="!check !archcheck" depends=" alsa-ucm-conf + firmware-samsung-midas-bluetooth + firmware-samsung-midas-wifi + linux-firmware-s5p-mfc linux-postmarketos-exynos4 mkbootimg postmarketos-base @@ -17,7 +20,6 @@ depends=" " makedepends="devicepkg-dev" install="$pkgname.post-install" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source=" deviceinfo ucm/Midas.conf @@ -41,16 +43,6 @@ package() { -t "$_midas_audio_dir" } -nonfree_firmware() { - pkgdesc="WiFi, Bluetooth, MFC firmware" - depends=" - firmware-samsung-midas-bluetooth - firmware-samsung-midas-wifi - linux-firmware-s5p-mfc - " - mkdir "$subpkgdir" -} - sha512sums=" 81ab1b1999a20a10618578c17de208fa8508494435b2410c9d827e02f09c74f17c51e613e932de782fb3c6e9fc3a538a3983f0c6e66746263208fd14c67260e8 deviceinfo caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc Midas.conf diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index 18805d846..316aaaa05 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -4,7 +4,7 @@ maintainer="Alexander Martinz " pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" -pkgver=23 +pkgver=24 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,12 +12,15 @@ arch="aarch64" options="!check !archcheck" depends=" alsa-ucm-conf-sdm845 + firmware-shift-sdm845>=20230815-r2 fwupd>=1.8.6 + hexagonrpcd>=0.3.2-r3 linux-postmarketos-qcom-sdm845 make-dynpart-mappings mkbootimg postmarketos-base soc-qcom + soc-qcom-modem soc-qcom-qbootctl systemd-boot unl0kr-fbforcerefresh @@ -32,10 +35,10 @@ source=" 81-libssc-shift-axolotl.rules " subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc + $pkgname-openrc $pkgname-pmtest " +replaces="device-shift-axolotl-nonfree-firmware" build() { devicepkg_build $startdir $pkgname @@ -43,28 +46,20 @@ build() { package() { devicepkg_package $startdir $pkgname -} -nonfree_firmware() { - pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl" - depends=" - firmware-shift-sdm845>=20230815-r2 - hexagonrpcd>=0.3.2-r3 - hexagonrpcd - soc-qcom-modem - " - - install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/ + install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules \ + -t "$pkgdir"/usr/lib/udev/rules.d/ install -Dm644 "$srcdir"/q6voiced.conf \ - "$subpkgdir"/etc/conf.d/q6voiced + "$pkgdir"/etc/conf.d/q6voiced install -Dm644 "$srcdir"/hexagonrpcd.confd \ - "$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf + "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf } -nonfree_firmware_openrc() { - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + default_openrc + replaces="device-shift-axolotl-nonfree-firmware-openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="hexagonrpcd-openrc openrc" + depends="hexagonrpcd-openrc" mkdir -p "$subpkgdir" } diff --git a/device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-upgrade b/device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-upgrade deleted file mode 120000 index 409224e8c..000000000 --- a/device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -device-shift-axolotl-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-install b/device/community/device-shift-axolotl/device-shift-axolotl-openrc.post-install similarity index 100% rename from device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-install rename to device/community/device-shift-axolotl/device-shift-axolotl-openrc.post-install diff --git a/device/community/device-shift-axolotl/device-shift-axolotl-openrc.post-upgrade b/device/community/device-shift-axolotl/device-shift-axolotl-openrc.post-upgrade new file mode 120000 index 000000000..4481e81f8 --- /dev/null +++ b/device/community/device-shift-axolotl/device-shift-axolotl-openrc.post-upgrade @@ -0,0 +1 @@ +device-shift-axolotl-openrc.post-install \ No newline at end of file diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD index facd7e576..4d30777f7 100644 --- a/device/community/device-xiaomi-beryllium/APKBUILD +++ b/device/community/device-xiaomi-beryllium/APKBUILD @@ -2,26 +2,30 @@ maintainer="Joel Selvaraj " pkgname=device-xiaomi-beryllium pkgdesc="Xiaomi Poco F1" -pkgver=20 +pkgver=21 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg alsa-ucm-conf-sdm845 + firmware-xiaomi-beryllium + firmware-xiaomi-beryllium-sensors + hexagonrpcd + hexagonrpcd>=0.3.2-r3 + mkbootimg + postmarketos-base soc-qcom + soc-qcom-modem " makedepends="devicepkg-dev" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc $pkgname-kernel-tianma:kernel_tianma $pkgname-kernel-ebbg:kernel_ebbg + $pkgname-openrc " - +replaces="device-xiaomi-beryllium-nonfree-firmware" source=" deviceinfo kernel-cmdline.conf @@ -44,24 +48,10 @@ package() { "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf } -nonfree_firmware() { - pkgdesc="GPU, venus, modem and sensor firmware" - depends=" - firmware-xiaomi-beryllium - firmware-xiaomi-beryllium-sensors - hexagonrpcd>=0.3.2-r3 - soc-qcom-modem - hexagonrpcd - " - - amove etc/conf.d/q6voiced - amove usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf -} - -nonfree_firmware_openrc() { - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - depends="hexagonrpcd-openrc openrc" + depends="hexagonrpcd-openrc" mkdir -p "$subpkgdir" } diff --git a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware-openrc.post-upgrade b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware-openrc.post-upgrade deleted file mode 120000 index c9d480f93..000000000 --- a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -device-xiaomi-beryllium-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware-openrc.post-install b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-openrc.post-install similarity index 100% rename from device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware-openrc.post-install rename to device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-openrc.post-install diff --git a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-openrc.post-upgrade b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-openrc.post-upgrade new file mode 120000 index 000000000..23a83f12e --- /dev/null +++ b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-openrc.post-upgrade @@ -0,0 +1 @@ +device-xiaomi-beryllium-openrc.post-install \ No newline at end of file diff --git a/device/community/firmware-oneplus-sdm845/APKBUILD b/device/community/firmware-oneplus-sdm845/APKBUILD index cf000d235..6b65ecf78 100644 --- a/device/community/firmware-oneplus-sdm845/APKBUILD +++ b/device/community/firmware-oneplus-sdm845/APKBUILD @@ -1,6 +1,6 @@ maintainer="Casey Connolly " pkgname=firmware-oneplus-sdm845 -pkgver=15 +pkgver=16 pkgrel=0 _commit="3e31a0c3e5a061645c09f805387b49fa9d35acbf" pkgdesc="Firmware for OnePlus 6 / 6T" diff --git a/device/community/firmware-shift-sdm845/APKBUILD b/device/community/firmware-shift-sdm845/APKBUILD index 034296540..a980f07ac 100644 --- a/device/community/firmware-shift-sdm845/APKBUILD +++ b/device/community/firmware-shift-sdm845/APKBUILD @@ -1,7 +1,7 @@ maintainer="Alexander Martinz " pkgname=firmware-shift-sdm845 pkgver=20260428 -pkgrel=2 +pkgrel=3 _commit="a3ff3738b8ba541561d790b84f6ee82b28ed5d43" pkgdesc="Firmware for SHIFT sdm845 devices" url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845" diff --git a/device/community/soc-qcom/APKBUILD b/device/community/soc-qcom/APKBUILD index 99760114e..ac042edc7 100644 --- a/device/community/soc-qcom/APKBUILD +++ b/device/community/soc-qcom/APKBUILD @@ -2,8 +2,8 @@ maintainer="Casey Connolly " pkgname=soc-qcom pkgdesc="Common package for Qualcomm devices" -pkgver=9 -pkgrel=1 +pkgver=10 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" @@ -16,7 +16,7 @@ depends=" replaces=" soc-qcom-sdm845 soc-qcom-sdm845-nonfree-firmware -" + " subpackages=" $pkgname-gstreamer-openrc:gstreamer_openrc $pkgname-gstreamer-systemd:gstreamer_systemd