diff --git a/device/testing/device-amediatech-x96-mini/APKBUILD b/device/testing/device-amediatech-x96-mini/APKBUILD index 45cf560c6..ecaaf19fa 100644 --- a/device/testing/device-amediatech-x96-mini/APKBUILD +++ b/device/testing/device-amediatech-x96-mini/APKBUILD @@ -1,16 +1,21 @@ # Reference: maintainer="exkc " pkgname=device-amediatech-x96-mini -pkgver=5 +pkgver=6 pkgrel=0 pkgdesc="Amediatech X96 mini" url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-amediatech-x96-mini soc-amlogic-aarch64 linux-postmarketos-amlogic" +depends=" + linux-firmware-meson + linux-postmarketos-amlogic + postmarketos-base + soc-amlogic-aarch64 + u-boot-amlogic-amediatech-x96-mini + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="asound.state deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -23,13 +28,6 @@ package() { "$pkgdir"/var/lib/alsa/asound.state } -nonfree_firmware() { - pkgdesc="Amediatech X96 mini firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - - sha512sums=" 981ef458837524b2b1922e7bc5abd4936d629e3f83e92062b46597cef985b65fdb90900de1ef93a7d741b9b0ac4b41cef9c3c2625181ff0e10effc22cb2fa3a3 asound.state eee027b5ca603bfcb4e047147f4b80508178a616a702b8ad46debcf60a82fcc7bed3e52618b243508e170e532a4650349af7ea71c6ff9f5be1696e5363b7dcef deviceinfo diff --git a/device/testing/device-arrow-db410c/APKBUILD b/device/testing/device-arrow-db410c/APKBUILD index 2087d6465..4962297de 100644 --- a/device/testing/device-arrow-db410c/APKBUILD +++ b/device/testing/device-arrow-db410c/APKBUILD @@ -2,17 +2,26 @@ maintainer="Nikita Travkin " pkgname=device-arrow-db410c pkgdesc="Arrow DragonBoard 410c" -pkgver=7 -pkgrel=1 +pkgver=8 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc" +depends=" + firmware-qcom-adreno-a300 + firmware-qcom-db410c-modem + firmware-qcom-db410c-wcnss + firmware-qcom-db410c-wcnss-nv + firmware-qcom-msm8916-venus + linux-postmarketos-qcom-msm8916 + mkbootimg + postmarketos-base + soc-qcom-msm8916 + soc-qcom-msm8916-rproc + " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -22,14 +31,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video firmware" - depends="firmware-qcom-adreno-a300 firmware-qcom-db410c-modem - firmware-qcom-db410c-wcnss firmware-qcom-db410c-wcnss-nv - firmware-qcom-msm8916-venus" - mkdir "$subpkgdir" -} - sha512sums=" 2113140e98aa4e040e576653920de3f5e77d946d237d912c3431251cdaaca9d224ea4adacd1c6d54b64fdd8d66cda73b53dd36c8de7aa11ca71ff43c6c3db9d9 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD b/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD index 73c3ebf09..eb34ce9a1 100644 --- a/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD +++ b/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD @@ -2,15 +2,20 @@ maintainer="Ferass El Hafidi " pkgname=device-bananapi-bpi-cm4-cm4io pkgdesc="BananaPi BPI-CM4IO Baseboard with BPI-CM4" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-bananapi-bpi-cm4-cm4io soc-amlogic-aarch64 linux-postmarketos-amlogic" +depends=" + linux-firmware-meson + linux-postmarketos-amlogic + postmarketos-base + soc-amlogic-aarch64 + u-boot-amlogic-bananapi-bpi-cm4-cm4io + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -21,12 +26,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="vdec firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" 049a0a937e5401d27eb03af06e0e4d3e900283a107feac32840ae080a174e6dfe21ab88cc54596571d1a06df6ef9ee372daca9f531ba26efe6f5927b93a5315b deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-goclever-gcta741l/APKBUILD b/device/testing/device-goclever-gcta741l/APKBUILD index 462b1ee22..b57e69cc4 100644 --- a/device/testing/device-goclever-gcta741l/APKBUILD +++ b/device/testing/device-goclever-gcta741l/APKBUILD @@ -2,25 +2,25 @@ maintainer="Jacek Pruciak " pkgname=device-goclever-gcta741l pkgdesc="GoClever Orion 70L" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" + linux-firmware-rtlwifi linux-postmarketos-allwinner mesa-egl postmarketos-base - u-boot-tools u-boot-goclever-gcta741l + u-boot-tools " makedepends="devicepkg-dev linux-postmarketos-allwinner u-boot-tools" source=" deviceinfo u-boot-script.cmd " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -45,12 +45,6 @@ package() { "$pkgdir"/boot/boot.scr } -nonfree_firmware() { - pkgdesc="Wifi firmware (rtl8188eu)" - depends="linux-firmware-rtlwifi" - mkdir "$subpkgdir" -} - sha512sums=" d46fafb69907f5ea97e5c727697d1c9b92d693acb4313f6411ef8f122f934826a614d7e60be115c3d19787f9e8bf5cfd9054482620e87c94f2c08433abf4520a deviceinfo 5b8c1d440867a3cee891168a156fb428b14dfeaf0b437da3e4dc1dd1408458bde98b4ce4682dfb0c5f9c5055a0e2c34cc78ba6160b6ca64281f9721d8d02dede u-boot-script.cmd diff --git a/device/testing/device-google-nyan-big/APKBUILD b/device/testing/device-google-nyan-big/APKBUILD index a8d28d85d..554bc159a 100644 --- a/device/testing/device-google-nyan-big/APKBUILD +++ b/device/testing/device-google-nyan-big/APKBUILD @@ -3,7 +3,7 @@ maintainer="WeirdTreeThing " pkgname=device-google-nyan-big pkgdesc="Acer Chromebook 13 CB5-311 / Acer Chromebook C810" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,6 +12,8 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mrvl + linux-firmware-nvidia postmarketos-base postmarketos-cros-common " @@ -20,7 +22,6 @@ subpackages=" $pkgname-kernel-nyan-big-fhd:kernel_nyan_big_fhd $pkgname-mpv-wayland:mpv_wayland $pkgname-mpv-xorg:mpv_xorg - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-sway " makedepends="devicepkg-dev" @@ -45,6 +46,10 @@ package() { # Block nouveau as it is in very bad condition install -Dm644 "$srcdir"/gpu.conf \ "$pkgdir"/usr/lib/modprobe.d/gpu.conf + + # Firmware needed to boot from USB + install -Dm644 "$srcdir"/30-xusb-firmware.files \ + -t "$pkgdir"/usr/share/mkinitfs/files/ } kernel_nyan_big() { @@ -88,16 +93,6 @@ mpv_xorg() { "$subpkgdir"/etc/mpv/mpv.conf } -nonfree_firmware() { - pkgdesc="WiFi/BT, USB and GPU firmware" - depends="linux-firmware-mrvl linux-firmware-nvidia" - mkdir "$subpkgdir" - - # Firmware needed to boot from USB - install -Dm644 "$srcdir"/30-xusb-firmware.files \ - "$subpkgdir"/usr/share/mkinitfs/files/30-xusb-firmware.files -} - sway() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway" install -Dm755 "$srcdir"/10-no-hardware-cursor.sh \ diff --git a/device/testing/device-google-nyan-blaze/APKBUILD b/device/testing/device-google-nyan-blaze/APKBUILD index 244c6b416..d0ab69619 100644 --- a/device/testing/device-google-nyan-blaze/APKBUILD +++ b/device/testing/device-google-nyan-blaze/APKBUILD @@ -3,7 +3,7 @@ maintainer="WeirdTreeThing " pkgname=device-google-nyan-blaze pkgdesc="HP Chromebook 14 G3" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -12,6 +12,8 @@ options="!check !archcheck" depends=" alsa-ucm-conf depthcharge-tools + linux-firmware-mrvl + linux-firmware-nvidia linux-google-nyan>=6.1.27-r0 postmarketos-base postmarketos-cros-common @@ -19,7 +21,6 @@ depends=" subpackages=" $pkgname-mpv-wayland:mpv_wayland $pkgname-mpv-xorg:mpv_xorg - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-sway " makedepends="devicepkg-dev" @@ -44,15 +45,10 @@ package() { # Block nouveau as it is in very bad condition install -Dm644 "$srcdir"/gpu.conf \ "$pkgdir"/usr/lib/modprobe.d/gpu.conf -} - -nonfree_firmware() { - pkgdesc="WiFi/BT, USB and GPU firmware" - depends="linux-firmware-mrvl linux-firmware-nvidia" # Firmware needed to boot from USB install -Dm644 "$srcdir"/30-xusb-firmware.files \ - "$subpkgdir"/usr/share/mkinitfs/files/30-xusb-firmware.files + "$pkgdir"/usr/share/mkinitfs/files/30-xusb-firmware.files } mpv_wayland() { diff --git a/device/testing/device-google-snow/APKBUILD b/device/testing/device-google-snow/APKBUILD index be2422647..df0f3b88b 100644 --- a/device/testing/device-google-snow/APKBUILD +++ b/device/testing/device-google-snow/APKBUILD @@ -2,8 +2,8 @@ maintainer="Henrik Grimler " pkgname=device-google-snow pkgdesc="Samsung Chromebook" -pkgver=11 -pkgrel=1 +pkgver=12 +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 @@ -24,10 +26,7 @@ source=" ucm/Snow-I2S-MAX98090.conf sway/foot/foot.ini " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-sway -" +subpackages="$pkgname-sway" build() { devicepkg_build $startdir $pkgname @@ -43,12 +42,6 @@ package() { "$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/HiFi.conf } -nonfree_firmware() { - pkgdesc="WiFi/BT and MFC firmware" - depends="linux-firmware-mrvl linux-firmware-s5p-mfc" - mkdir "$subpkgdir" -} - sway() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway" install -Dm644 "$srcdir"/foot.ini \ diff --git a/device/testing/device-htc-m8qlul/APKBUILD b/device/testing/device-htc-m8qlul/APKBUILD index 02d8aab07..6f6cd7bfd 100644 --- a/device/testing/device-htc-m8qlul/APKBUILD +++ b/device/testing/device-htc-m8qlul/APKBUILD @@ -2,18 +2,23 @@ maintainer="Stefan Hansson " pkgname=device-htc-m8qlul pkgdesc="HTC One M8s" -pkgver=3 -pkgrel=1 +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg soc-qcom-msm8939 linux-postmarketos-qcom-msm8939" +depends=" + firmware-htc-m8qlul-venus + firmware-htc-m8qlul-wcnss + linux-firmware-qcom + linux-postmarketos-qcom-msm8939 + mkbootimg + postmarketos-base + soc-qcom-msm8939 + " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" build() { devicepkg_build $startdir $pkgname @@ -23,12 +28,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware" - depends="linux-firmware-qcom firmware-htc-m8qlul-venus firmware-htc-m8qlul-wcnss" - mkdir "$subpkgdir" -} - sha512sums=" 10f4e8b7dd2242cc11ac2f35bbb76d18a7b3bfbeeb66e277857de4aaf2191e7563699ae9ac5cb0a6ef8735f385a3d2bdf3ecf033cd15780cd4164f83c99180ba deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-khadas-vim3/APKBUILD b/device/testing/device-khadas-vim3/APKBUILD index d21dc8a92..27f57c014 100644 --- a/device/testing/device-khadas-vim3/APKBUILD +++ b/device/testing/device-khadas-vim3/APKBUILD @@ -2,13 +2,14 @@ maintainer="Mattijs Korpershoek " pkgname=device-khadas-vim3 pkgdesc="Khadas VIM3 Amlogic A311D" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-firmware-meson linux-postmarketos-amlogic postmarketos-base soc-amlogic-aarch64 @@ -19,7 +20,6 @@ source=" 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="vdec firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" bbcbd6f55b1f8df2c9d0aacb1c979201caead9cb30c32bb0d9627fbbe3ea00c926f399f4aa7f91767ec372c323d11ba1d335473a03358a447afbde2863f41be5 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-lark-freeme-70-2s/APKBUILD b/device/testing/device-lark-freeme-70-2s/APKBUILD index 7d4f4390b..0955fa319 100644 --- a/device/testing/device-lark-freeme-70-2s/APKBUILD +++ b/device/testing/device-lark-freeme-70-2s/APKBUILD @@ -2,25 +2,25 @@ maintainer="Jacek Pruciak " pkgname=device-lark-freeme-70-2s pkgdesc="Lark FreeMe 70.2S" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" + linux-firmware-rtlwifi linux-postmarketos-allwinner mesa-egl postmarketos-base - u-boot-tools u-boot-lark-freeme-70-2s + u-boot-tools " makedepends="devicepkg-dev linux-postmarketos-allwinner u-boot-tools" source=" deviceinfo u-boot-script.cmd " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -45,12 +45,6 @@ package() { "$pkgdir"/boot/boot.scr } -nonfree_firmware() { - pkgdesc="Wifi firmware (rtl8188ctv)" - depends="linux-firmware-rtlwifi" - mkdir "$subpkgdir" -} - sha512sums=" 6a9954ff513e838079dcd9a3eb815430d954b5f45a3640991ca146ae11d340bc6e8f617c3cb3fe79be10fc5bd7e117a3be3936fa045cad1807aaa34324c39eed deviceinfo 5b8c1d440867a3cee891168a156fb428b14dfeaf0b437da3e4dc1dd1408458bde98b4ce4682dfb0c5f9c5055a0e2c34cc78ba6160b6ca64281f9721d8d02dede u-boot-script.cmd diff --git a/device/testing/device-librecomputer-lafrite/APKBUILD b/device/testing/device-librecomputer-lafrite/APKBUILD index 81ae27da6..70b2cf6f0 100644 --- a/device/testing/device-librecomputer-lafrite/APKBUILD +++ b/device/testing/device-librecomputer-lafrite/APKBUILD @@ -2,13 +2,14 @@ maintainer="Ferass El Hafidi " pkgname=device-librecomputer-lafrite pkgdesc="Libre Computer AML-S805X-AC-V1.0" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-firmware-meson linux-postmarketos-amlogic postmarketos-base soc-amlogic-aarch64 @@ -19,7 +20,6 @@ source=" 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="vdec firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" b1bd5edbe63d7a878865d240dbea36489b4789a3e8a483fd4e6ca4b476c06015840f69f828b288d00afadca790e1555af3020a6f664feba5d602faac4969ca57 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-librecomputer-lepotato/APKBUILD b/device/testing/device-librecomputer-lepotato/APKBUILD index 7bc9790ed..21292e793 100644 --- a/device/testing/device-librecomputer-lepotato/APKBUILD +++ b/device/testing/device-librecomputer-lepotato/APKBUILD @@ -2,13 +2,14 @@ maintainer="Ferass El Hafidi " pkgname=device-librecomputer-lepotato pkgdesc="Libre Computer AML-S905X-CC-V1.0" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-firmware-meson linux-postmarketos-amlogic postmarketos-base soc-amlogic-aarch64 @@ -20,7 +21,6 @@ source=" kernel-cmdline.conf modules-initfs " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -30,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="vdec firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" c1cf5b70bcfdbb2595c3867cc5d1ea2b9dc4bb07bb781a21dc8d082668638c9d6dce3f2e06976f53f5f7dfd86d8c78002a4622806cb16574ba00496091cc1a73 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-librecomputer-solitude/APKBUILD b/device/testing/device-librecomputer-solitude/APKBUILD index 0a82e236a..33724642b 100644 --- a/device/testing/device-librecomputer-solitude/APKBUILD +++ b/device/testing/device-librecomputer-solitude/APKBUILD @@ -3,13 +3,14 @@ maintainer="Stefan Hansson " pkgname=device-librecomputer-solitude pkgdesc="Libre Computer AML-S905D3-CC" -pkgver=4 -pkgrel=1 +pkgver=5 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-firmware-meson linux-postmarketos-amlogic postmarketos-base soc-amlogic-s905 @@ -19,8 +20,7 @@ source=" deviceinfo kernel-cmdline.conf modules-initfs - " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" +" build() { devicepkg_build $startdir $pkgname @@ -30,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="vdec firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" 4f644a32b0aa3eca8fd3dab4f1f99a65b85dbf12bc7d11ebdbad1e1705d99b79f17f6b99ce7be418372f742d6b33653639989806d01f6c054eb591c2aa52722c deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-microsoft-surface-rt/APKBUILD b/device/testing/device-microsoft-surface-rt/APKBUILD index 4f7a6d625..2eebe01d8 100644 --- a/device/testing/device-microsoft-surface-rt/APKBUILD +++ b/device/testing/device-microsoft-surface-rt/APKBUILD @@ -2,7 +2,7 @@ maintainer="Jethrob " pkgname=device-microsoft-surface-rt pkgdesc="Microsoft Surface RT" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -11,14 +11,12 @@ arch="armv7" options="!check !archcheck pmb:strict" depends=" alsa-ucm-conf + linux-firmware-mrvl linux-postmarketos-grate postmarketos-base " makedepends="devicepkg-dev grub grub-efi" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-x11 -" +subpackages="$pkgname-x11" source="deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -47,12 +45,6 @@ package() { "$pkgdir"/boot/EFI/Boot/bootarm.efi } -nonfree_firmware() { - pkgdesc="WiFi firmware" - depends="linux-firmware-mrvl" - mkdir "$subpkgdir" -} - x11() { install_if="$pkgname xorg-server" depends="xf86-video-opentegra libvdpau-tegra" diff --git a/device/testing/device-odroid-c4/APKBUILD b/device/testing/device-odroid-c4/APKBUILD index a10938905..940289090 100644 --- a/device/testing/device-odroid-c4/APKBUILD +++ b/device/testing/device-odroid-c4/APKBUILD @@ -2,15 +2,20 @@ maintainer="hexaheximal " pkgname=device-odroid-c4 pkgdesc="ODROID C4" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-odroid-c4 soc-amlogic-aarch64 linux-postmarketos-amlogic" +depends=" + linux-firmware-meson + linux-postmarketos-amlogic + postmarketos-base + soc-amlogic-aarch64 + u-boot-amlogic-odroid-c4 + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -21,12 +26,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="ODROID C4 firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" ee6387a937d7f558c5489292a159a0e3b4329111b38b2df8dc1671c8a5bda0e86be8ad66594fd847d2f0239bb2d4e2b0f097dd7d19e3cb5e0de83c1383f9d901 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-odroid-hc2/APKBUILD b/device/testing/device-odroid-hc2/APKBUILD index 303e0867a..756b86f44 100644 --- a/device/testing/device-odroid-hc2/APKBUILD +++ b/device/testing/device-odroid-hc2/APKBUILD @@ -2,20 +2,23 @@ maintainer="knuxify " pkgname=device-odroid-hc2 pkgdesc="ODROID HC2" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends="linux-stable + firmware-odroid-hc2 + linux-firmware-other + linux-firmware-rtl_nic + linux-firmware-s5p-mfc postmarketos-base u-boot-odroid u-boot-tools " makedepends="devicepkg-dev u-boot-tools" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-tools" -_commit="42ac93dcfbbb8a08c2bdc02e19f96eb35a81891a" +subpackages="$pkgname-tools" source="deviceinfo modules-initfs uboot-script.cmd install-rootfs-hdd.sh" build() { @@ -38,12 +41,6 @@ package() { "$pkgdir"/boot/boot.scr } -nonfree_firmware() { - pkgdesc="U-Boot, Samsung JPEG encoder, and Realtek firmware, required for a bootable system" - depends="firmware-odroid-hc2 linux-firmware-rtl_nic linux-firmware-other linux-firmware-s5p-mfc" - mkdir "$subpkgdir" -} - tools() { pkgdesc="ODROID HC2 tools" depends="rsync e2fsprogs-extra" diff --git a/device/testing/device-odroid-n2plus/APKBUILD b/device/testing/device-odroid-n2plus/APKBUILD index d16ff91ea..5aa0f056d 100644 --- a/device/testing/device-odroid-n2plus/APKBUILD +++ b/device/testing/device-odroid-n2plus/APKBUILD @@ -2,15 +2,20 @@ maintainer="hexaheximal " pkgname=device-odroid-n2plus pkgdesc="ODROID N2+" -pkgver=4 +pkgver=5 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-odroid-n2plus soc-amlogic-aarch64 linux-postmarketos-amlogic" +depends=" + linux-firmware-meson + linux-postmarketos-amlogic + postmarketos-base + soc-amlogic-aarch64 + u-boot-amlogic-odroid-n2plus + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -21,12 +26,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="ODROID N2+ firmware" - depends="linux-firmware-meson" - mkdir "$subpkgdir" -} - sha512sums=" 73c58559ed8aacb5d821dd708b63c668b43e84dd2e40fc9d8a24918e51f803b8b06085277cc7dd780b5882f21fddcac9e1040e38647c624b492dc975415812b9 deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-qcom-msm8916/APKBUILD b/device/testing/device-qcom-msm8916/APKBUILD index 17ccb6b81..bbcf78838 100644 --- a/device/testing/device-qcom-msm8916/APKBUILD +++ b/device/testing/device-qcom-msm8916/APKBUILD @@ -2,13 +2,17 @@ maintainer="Nikita Travkin " pkgname=device-qcom-msm8916 pkgdesc="Generic device package for various Qualcomm MSM8916/MSM8939-based devices" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-qcom-adreno-a300 + firmware-qcom-adreno-a420 + firmware-qcom-db410c-wcnss-nv + msm-firmware-loader postmarketos-base soc-qcom-msm8916 " @@ -19,7 +23,6 @@ source=" modules-initfs " subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-extlinux:kernel_extlinux $pkgname-kernel-efi:kernel_efi " @@ -30,20 +33,14 @@ build() { package() { devicepkg_package $startdir $pkgname -} - -nonfree_firmware() { - pkgdesc="WiFi/BT/Modem/Video firmware" - depends="msm-firmware-loader firmware-qcom-adreno-a300 firmware-qcom-adreno-a420 firmware-qcom-db410c-wcnss-nv" - mkdir "$subpkgdir" # HACK: For devices that don't have a nv file in persist we # temporarily link the db410c file to the expected location. # It will be overriden if the file is in persist or when user # installs the device-specific firmware packages. - mkdir -p "$subpkgdir"/lib/firmware/wlan/prima/ - ln -s /lib/firmware/qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin \ - "$subpkgdir"/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin + mkdir -p "$pkgdir"/usr/lib/firmware/wlan/prima/ + ln -s /usr/lib/firmware/qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin \ + "$pkgdir"/usr/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin } kernel_extlinux() { diff --git a/device/testing/device-radxa-zero/APKBUILD b/device/testing/device-radxa-zero/APKBUILD index d47dc2c6a..9e1dbbd41 100644 --- a/device/testing/device-radxa-zero/APKBUILD +++ b/device/testing/device-radxa-zero/APKBUILD @@ -1,16 +1,21 @@ # Reference: maintainer="exkc " pkgname=device-radxa-zero -pkgver=5 +pkgver=6 pkgrel=0 pkgdesc="Radxa Zero" url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base linux-postmarketos-amlogic u-boot-amlogic-radxa-zero" +depends=" + firmware-radxa-zero + linux-firmware-meson + linux-postmarketos-amlogic + postmarketos-base + u-boot-amlogic-radxa-zero + " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf modules-initfs" build() { @@ -21,13 +26,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="firmware-radxa-zero linux-firmware-meson" - mkdir "$subpkgdir" -} - - sha512sums=" b45c235d36e47e7d734d6e1965fc09e33ec07cc19680548a2f8430d4762aeef31b3e2776162577c03ddf7462f4d5e0e1a9c80491ec0cd58fcc772128483bb638 deviceinfo cf9d03ab06004b4629bde4eff29028ffb07edc512a08c397f773dc49bed1aa2aead46496333c530f51bc10b653eb3ac706966cbc86997cdc37c7518b24acc368 kernel-cmdline.conf diff --git a/device/testing/device-samsung-a3/APKBUILD b/device/testing/device-samsung-a3/APKBUILD index 00213b4a4..2c877e44c 100644 --- a/device/testing/device-samsung-a3/APKBUILD +++ b/device/testing/device-samsung-a3/APKBUILD @@ -3,30 +3,45 @@ maintainer="Mis012 " pkgname=device-samsung-a3 pkgdesc="Samsung Galaxy A3 (2015)" -pkgver=17 +pkgver=18 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround" +depends=" + firmware-qcom-adreno-a300 + firmware-samsung-a3-wcnss-nv + linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base + soc-qcom-msm8916 + soc-qcom-msm8916-rproc + soc-samsung-msm8916-modem-workaround +" makedepends="devicepkg-dev" +provides=" + device-samsung-a3lte=$pkgver-r$pkgrel + device-samsung-a3ulte=$pkgver-r$pkgrel +" +replaces=" + $pkgname-kernel-mainline + $pkgname-kernel-mainline-modem + device-samsung-a3lte + device-samsung-a3lte-kernel-mainline + device-samsung-a3lte-kernel-modem + device-samsung-a3lte-nonfree-firmware + device-samsung-a3ulte + device-samsung-a3ulte-kernel-mainline + device-samsung-a3ulte-kernel-modem + device-samsung-a3ulte-nonfree-firmware +" source=" deviceinfo kernel-cmdline.conf modules-initfs " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" - -# Backwards compatibility for old device package names + kernel variants -_substitutes="device-samsung-a3lte device-samsung-a3ulte" -replaces="$_substitutes $pkgname-kernel-mainline $pkgname-kernel-mainline-modem" -for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline $pkg-kernel-mainline-modem"; done -for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done -for pkg in $pkgname $_substitutes; do provides="$provides $pkg-phosh=$pkgver-r$pkgrel"; done build() { devicepkg_build $startdir $pkgname @@ -36,15 +51,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a3-wcnss-nv" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-nonfree-firmware"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - mkdir "$subpkgdir" -} - sha512sums=" 2d03ab0acfbae029fe9354ae843f7494471e4ec4f98a0de388dfa4273b4f973623efa6574405b59858b691f7a13a11c8d3c10178731396081d2b28215ddfe815 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-a5/APKBUILD b/device/testing/device-samsung-a5/APKBUILD index d9d279d06..f66effa5e 100644 --- a/device/testing/device-samsung-a5/APKBUILD +++ b/device/testing/device-samsung-a5/APKBUILD @@ -2,25 +2,43 @@ maintainer="Alexey Minnekhanov " pkgname=device-samsung-a5 pkgdesc="Samsung Galaxy A5 (2015)" -pkgver=15 +pkgver=16 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround" +depends=" + firmware-qcom-adreno-a300 + firmware-samsung-a5-wcnss-nv + linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base + soc-qcom-msm8916 + soc-qcom-msm8916-rproc + soc-samsung-msm8916-modem-workaround + " makedepends="devicepkg-dev" -source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" - # Backwards compatibility for old device package names + kernel variants -_substitutes="device-samsung-a5lte device-samsung-a5ulte" -replaces="$_substitutes $pkgname-kernel-mainline $pkgname-kernel-mainline-modem" -for pkg in $_substitutes; do replaces="$replaces $pkg-kernel-mainline $pkg-kernel-mainline-modem"; done -for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done +provides=" + device-samsung-a5lte=$pkgver-r$pkgrel + device-samsung-a5ulte=$pkgver-r$pkgrel + " +replaces=" + $pkgname-kernel-mainline + $pkgname-kernel-mainline-modem + device-samsung-a5lte + device-samsung-a5lte-kernel-mainline + device-samsung-a5lte-kernel-modem + device-samsung-a5lte-nonfree-firmware + device-samsung-a5ulte + device-samsung-a5ulte-kernel-mainline + device-samsung-a5ulte-kernel-modem + device-samsung-a5ulte-nonfree-firmware + " +source="deviceinfo kernel-cmdline.conf modules-initfs" + build() { devicepkg_build $startdir $pkgname @@ -30,15 +48,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-a5-wcnss-nv" - replaces="" - for pkg in $_substitutes; do replaces="$replaces $pkg-nonfree-firmware"; done - for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done - mkdir "$subpkgdir" -} - sha512sums=" 76cb5b07dfb402df759d5275d9e66b2f26bea392e5cc2ff0605fbf8d0c337c9484f9d004ec115afe6b6c94fd3ad971f06a31d2d0437e1f690637b24e1cc23e6c deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-codina/APKBUILD b/device/testing/device-samsung-codina/APKBUILD index 6f90ef4ca..261aabd10 100644 --- a/device/testing/device-samsung-codina/APKBUILD +++ b/device/testing/device-samsung-codina/APKBUILD @@ -2,17 +2,19 @@ maintainer="Linus Walleij " pkgname=device-samsung-codina pkgdesc="Samsung Galaxy Ace 2" -pkgver=4 -pkgrel=1 +pkgver=5 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" -depends="mkbootimg postmarketos-base linux-postmarketos-stericsson" -makedepends="devicepkg-dev" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware +depends=" + firmware-samsung-u8500 + linux-postmarketos-stericsson + mkbootimg + postmarketos-base " +makedepends="devicepkg-dev" source=" deviceinfo kernel-cmdline.conf @@ -26,13 +28,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="firmware-samsung-u8500" - mkdir "$subpkgdir" -} - - sha512sums=" 3bf2ac6837879a006bf1379696d0804fe6d8c02e4ec67d5576a3902fb448dc73d9cd343f5d3ba270fe0bca9e2e901361a89fc8e1a3b7543dfa46fa6224823ce6 deviceinfo 447fd07a0896a72af0cf69708be98f92311ac9b5c1c75ae8a131bf55be3f2d6a82bedc9b2373bc2589a09b1049ad22f8eff7d6cb012e1759df11e83fada01eb2 kernel-cmdline.conf diff --git a/device/testing/device-samsung-e7/APKBUILD b/device/testing/device-samsung-e7/APKBUILD index e70634fc2..05045bc6b 100644 --- a/device/testing/device-samsung-e7/APKBUILD +++ b/device/testing/device-samsung-e7/APKBUILD @@ -2,24 +2,24 @@ maintainer="Raymond Hackley " pkgname=device-samsung-e7 pkgdesc="Samsung Galaxy E7" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg + firmware-qcom-adreno-a300 + firmware-samsung-e7-wcnss-nv linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc " 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="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-e7-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" f33c2f7305f11be04e156b5e665b13a6a45a803463fb79c253c4c5a8fe6af28da5f36ea685073615471facbf10fafa855b14113c7db8fc14791b505f882c4e73 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-fortuna/APKBUILD b/device/testing/device-samsung-fortuna/APKBUILD index 6132aa1d0..cff5c8237 100644 --- a/device/testing/device-samsung-fortuna/APKBUILD +++ b/device/testing/device-samsung-fortuna/APKBUILD @@ -2,39 +2,27 @@ maintainer="Raymond Hackley " pkgname=device-samsung-fortuna pkgdesc="Samsung Galaxy Grand Prime" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-qcom-adreno-a300 mkbootimg + msm-firmware-loader postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc " makedepends="devicepkg-dev" -source="deviceinfo kernel-cmdline.conf modules-initfs" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-fortuna3g:kernel_fortuna3g $pkgname-kernel-gprimeltecan:kernel_fortuna3g $pkgname-kernel-grandprimelte:kernel_grandprimelte " -_variants=" - fortuna3g - gprimeltecan - grandprimelte -" - -for _variant in $_variants; do - subpackages=" - $subpackages - ${pkgname%-fortuna}-$_variant-nonfree-firmware:nonfree_firmware_$_variant - " -done - +source="deviceinfo kernel-cmdline.conf modules-initfs" build() { devicepkg_build $startdir $pkgname @@ -46,7 +34,11 @@ package() { kernel_fortuna3g() { pkgdesc="$pkgdesc (SM-G530H)" - depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916" + depends=" + $pkgname=$pkgver-r$pkgrel + firmware-samsung-fortuna3g-wcnss-nv + linux-postmarketos-qcom-msm8916 + " # Backwards compatibility for old device package name local _old_pkgname="device-samsung-fortuna3g" @@ -58,7 +50,11 @@ kernel_fortuna3g() { kernel_gprimeltecan() { pkgdesc="$pkgdesc (SM-G530W)" - depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916" + depends=" + $pkgname=$pkgver-r$pkgrel + firmware-samsung-gprimeltecan-wcnss-nv + linux-postmarketos-qcom-msm8916 + " # Backwards compatibility for old device package name local _old_pkgname="device-samsung-gprimeltecan" @@ -70,7 +66,11 @@ kernel_gprimeltecan() { kernel_grandprimelte() { pkgdesc="$pkgdesc (SM-G530FZ)" - depends="$pkgname=$pkgver-r$pkgrel linux-postmarketos-qcom-msm8916" + depends=" + $pkgname=$pkgver-r$pkgrel + firmware-samsung-grandprimelte-wcnss-nv + linux-postmarketos-qcom-msm8916 + " # Backwards compatibility for old device package name local _old_pkgname="device-samsung-gprimeltexx" @@ -80,53 +80,6 @@ kernel_grandprimelte() { devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader" - - mkdir "$subpkgdir" -} - -nonfree_firmware_fortuna3g() { - local _variant="fortuna3g" - pkgdesc="WiFi/BT firmware configuration (SM-G530H)" - depends="firmware-samsung-$_variant-wcnss-nv" - install_if=" - $pkgname-kernel-$_variant=$pkgver-r$pkgrel - $pkgname-nonfree-firmware=$pkgver-r$pkgrel - " - - mkdir "$subpkgdir" -} - -nonfree_firmware_gprimeltecan() { - local _variant="gprimeltecan" - pkgdesc="WiFi/BT firmware configuration (SM-G530W)" - depends="firmware-samsung-$_variant-wcnss-nv" - install_if=" - $pkgname-kernel-$_variant=$pkgver-r$pkgrel - $pkgname-nonfree-firmware=$pkgver-r$pkgrel - " - - mkdir "$subpkgdir" -} - -nonfree_firmware_grandprimelte() { - local _variant="grandprimelte" - pkgdesc="WiFi/BT firmware configuration (SM-G530FZ)" - depends="firmware-samsung-$_variant-wcnss-nv" - install_if=" - $pkgname-kernel-$_variant=$pkgver-r$pkgrel - $pkgname-nonfree-firmware=$pkgver-r$pkgrel - " - - # Backwards compatibility for old device package name - local _old_pkgname="device-samsung-gprimeltexx-nonfree-firmware" - provides="$_old_pkgname=$pkgver-r$pkgrel" - - mkdir "$subpkgdir" -} - sha512sums=" 3ebc5acc8d86c6e29df634243e6df06884e48f8e9ad3f5c60be00ab89228897d38a2f448f4a8367fb5175c04c6496a0dc9068a8f0b4ff223b09b6fdeb3192b2d deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-fortunaltezt/APKBUILD b/device/testing/device-samsung-fortunaltezt/APKBUILD index f82339164..b42ecccd4 100644 --- a/device/testing/device-samsung-fortunaltezt/APKBUILD +++ b/device/testing/device-samsung-fortunaltezt/APKBUILD @@ -2,16 +2,19 @@ maintainer="Lin, Meng-Bo " pkgname=device-samsung-fortunaltezt pkgdesc="Samsung Galaxy Grand Prime (SM-G530Y)" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg + firmware-qcom-adreno-a300 + firmware-samsung-fortunaltezt-wcnss-nv linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc " @@ -21,7 +24,6 @@ source=" kernel-cmdline.conf modules-initfs " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -31,12 +33,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-fortunaltezt-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" 8f37b22163f6732f04e7a46dc819153a127b79288090c184b2e6d2cd27d54324a1672eba00aee2055945fc33e92175c6f3a32c70ff0ec9702e34904e611f5ff8 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-grandmax/APKBUILD b/device/testing/device-samsung-grandmax/APKBUILD index 0f67ee629..f91ec749e 100644 --- a/device/testing/device-samsung-grandmax/APKBUILD +++ b/device/testing/device-samsung-grandmax/APKBUILD @@ -2,25 +2,25 @@ maintainer="Raymond Hackley " pkgname=device-samsung-grandmax pkgdesc="Samsung Galaxy Grand Max" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg + firmware-qcom-adreno-a300 + firmware-samsung-grandmax-wcnss-nv linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" build() { devicepkg_build $startdir $pkgname @@ -30,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-grandmax-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" 8baf5465e1132a39b99cbcc941e8f0dcb4e373b9744201940c4d94c80a240090fbaabc0807ffda1e3673c66bf6b2bf5e52ef4b3cc4f2d648786d33cfe47f8ab9 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-j3ltetw/APKBUILD b/device/testing/device-samsung-j3ltetw/APKBUILD index a0741f881..7fbac472d 100644 --- a/device/testing/device-samsung-j3ltetw/APKBUILD +++ b/device/testing/device-samsung-j3ltetw/APKBUILD @@ -2,22 +2,24 @@ maintainer="Lin, Meng-Bo " pkgname=device-samsung-j3ltetw pkgdesc="Samsung Galaxy J3 2016 (SM-J320YZ)" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg + firmware-qcom-adreno-a300 + firmware-samsung-j3ltetw-wcnss-nv linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -27,12 +29,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-j3ltetw-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" 0b6f64d4659c2e7d59e42ea0600e49dd5f0d180a0260248a86dd91dc59d60375581df2525cf9988e99a20a21409199346326621fbdb97d00a9636448dd1fb212 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-j5/APKBUILD b/device/testing/device-samsung-j5/APKBUILD index e2f89292e..4635b127e 100644 --- a/device/testing/device-samsung-j5/APKBUILD +++ b/device/testing/device-samsung-j5/APKBUILD @@ -2,15 +2,18 @@ maintainer="Raymond Hackley " pkgname=device-samsung-j5 pkgdesc="Samsung Galaxy J5 (2015)" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-qcom-adreno-a300 + firmware-samsung-j5-wcnss-nv linux-postmarketos-qcom-msm8916 mkbootimg + msm-firmware-loader postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc @@ -18,7 +21,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -28,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-j5-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" b9517cdb2972dbeecafb13576fcdf8982e098ad80a175b9dad68757860a2713f289258a7f8226e69eaeb530f21d1e06648ad5629566b1cefcd3de8c82bbf806b deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-j5x/APKBUILD b/device/testing/device-samsung-j5x/APKBUILD index 3b7385029..570766a2a 100644 --- a/device/testing/device-samsung-j5x/APKBUILD +++ b/device/testing/device-samsung-j5x/APKBUILD @@ -2,15 +2,18 @@ maintainer="Raymond Hackley " pkgname=device-samsung-j5x pkgdesc="Samsung Galaxy J5 (2016)" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-qcom-adreno-a300 + firmware-samsung-j5x-wcnss-nv linux-postmarketos-qcom-msm8916 mkbootimg + msm-firmware-loader postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc @@ -18,7 +21,6 @@ depends=" " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -28,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-j5x-wcnss-nv" - mkdir "$subpkgdir" -} - sha512sums=" c9da043b329bcf30184039381bd165be2a7ec3d83302756ff16b4992e7969ff13f52233ee6916724bc811cf8f7cf8b8eb02fb811d08dbe70e4240e13192dd15a deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-lt01/APKBUILD b/device/testing/device-samsung-lt01/APKBUILD index 5b864b40a..8a4feace0 100644 --- a/device/testing/device-samsung-lt01/APKBUILD +++ b/device/testing/device-samsung-lt01/APKBUILD @@ -2,7 +2,7 @@ maintainer="knuxify " pkgname=device-samsung-lt01 pkgdesc="Samsung Galaxy Tab 3 8.0" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,13 +10,14 @@ arch="armv7" options="!check !archcheck" depends=" alsa-ucm-conf + firmware-samsung-lt01-bluetooth + firmware-samsung-lt01-wifi + linux-firmware-s5p-mfc mkbootimg postmarketos-base " -_pmb_recommends="$pkgname-nonfree-firmware" makedepends="devicepkg-dev" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-wifi:kernel_wifi $pkgname-kernel-3g:kernel_3g $pkgname-kernel-lte:kernel_lte @@ -43,16 +44,6 @@ package() { -t "$_tab3_audio_dir" } -nonfree_firmware() { - pkgdesc="WiFi, Bluetooth, MFC firmware" - depends=" - firmware-samsung-lt01-bluetooth - firmware-samsung-lt01-wifi - linux-firmware-s5p-mfc - " - mkdir "$subpkgdir" -} - kernel_wifi() { pkgdesc="WiFi variant (SM-T310)" depends="linux-postmarketos-exynos4" diff --git a/device/testing/device-samsung-m3/APKBUILD b/device/testing/device-samsung-m3/APKBUILD index 4b6a12aaf..a63475f12 100644 --- a/device/testing/device-samsung-m3/APKBUILD +++ b/device/testing/device-samsung-m3/APKBUILD @@ -2,7 +2,7 @@ maintainer="Henrik Grimler " pkgname=device-samsung-m3 pkgdesc="Samsung Galaxy S III LTE" -pkgver=13 +pkgver=14 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=" d3d17ab91f593477116455917fac9dbcc99f3e09d54c72bad5ce5694395ea5f28d40a8495cc84b8bf1d21377497f4a85b057c6f7e7fa26d05ee8704d13861d67 deviceinfo caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc Midas.conf diff --git a/device/testing/device-samsung-p4note/APKBUILD b/device/testing/device-samsung-p4note/APKBUILD index f42a4d795..52a1f4933 100644 --- a/device/testing/device-samsung-p4note/APKBUILD +++ b/device/testing/device-samsung-p4note/APKBUILD @@ -2,23 +2,23 @@ maintainer="Martin Jücker " pkgname=device-samsung-p4note pkgdesc="Samsung Galaxy Note 10.1" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" 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 - alsa-ucm-conf postmarketos-base " makedepends="devicepkg-dev" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-udev -" +subpackages="$pkgname-udev" source=" deviceinfo audio/HiFi.conf @@ -41,16 +41,6 @@ package() { -t "$pkgdir"/usr/lib/udev/hwdb.d } -nonfree_firmware() { - pkgdesc="WiFi, Bluetooth, MFC firmware" - depends=" - firmware-samsung-midas-bluetooth - firmware-samsung-midas-wifi - linux-firmware-s5p-mfc - " - mkdir "$subpkgdir" -} - sha512sums=" 5b85b5393e5596a1ef741080836fd3fef551659af4d70131be5c187d60fec5469594704b57a92b0c40e40b9159e7cd15cccc231c4c6da52c01e057f79ff5935f deviceinfo f34cf57490e98acfb4ffec21c5a48c8c724b511e99dae421f3161c52f81c02cbd0cf7e7862188abb3bfdfc2ee58e36378f694bbef6d862307b2ed1b5e4b43949 HiFi.conf diff --git a/device/testing/device-samsung-rossa/APKBUILD b/device/testing/device-samsung-rossa/APKBUILD index 02a05f8fa..a91271e1d 100644 --- a/device/testing/device-samsung-rossa/APKBUILD +++ b/device/testing/device-samsung-rossa/APKBUILD @@ -2,16 +2,19 @@ maintainer="Raymond Hackley " pkgname=device-samsung-rossa pkgdesc="Samsung Galaxy Core Prime LTE" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" - postmarketos-base - mkbootimg + firmware-qcom-adreno-a300 + firmware-samsung-rossa-wcnss-nv linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround @@ -22,7 +25,6 @@ source=" kernel-cmdline.conf modules-initfs " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" # Backwards compatibility for old device package name _old_pkgname="device-samsung-cprime" @@ -37,14 +39,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-rossa-wcnss-nv" - provides="$_old_pkgname-nonfree-firmware=$pkgver-r$pkgrel" - - mkdir "$subpkgdir" -} - sha512sums=" ef398dee1e31ddf65e6714c8c19f0ff3ba1fe234b6cb479412b7aa96614f8edf0e8285d401cce398304435d961b4770f3d5fae4e337455d2301fb8ed1e91a987 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-samsung-skomer/APKBUILD b/device/testing/device-samsung-skomer/APKBUILD index d97781785..8c4176542 100644 --- a/device/testing/device-samsung-skomer/APKBUILD +++ b/device/testing/device-samsung-skomer/APKBUILD @@ -2,18 +2,20 @@ maintainer="Linus Walleij " pkgname=device-samsung-skomer pkgdesc="Samsung Galaxy Xcover 2" -pkgver=8 -pkgrel=1 +pkgver=9 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-stericsson" -makedepends="devicepkg-dev" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-kwin +depends=" + firmware-samsung-u8500 + linux-postmarketos-stericsson + mkbootimg + postmarketos-base " +makedepends="devicepkg-dev" +subpackages="$pkgname-kwin" source=" deviceinfo kernel-cmdline.conf @@ -28,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT firmware" - depends="firmware-samsung-u8500" - mkdir "$subpkgdir" -} - kwin() { install_if="$pkgname kwin" install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh diff --git a/device/testing/device-sony-tulip/APKBUILD b/device/testing/device-sony-tulip/APKBUILD index 02d8d1c6d..4139c5373 100644 --- a/device/testing/device-sony-tulip/APKBUILD +++ b/device/testing/device-sony-tulip/APKBUILD @@ -2,14 +2,16 @@ maintainer="TuxMan " pkgname=device-sony-tulip pkgdesc="Sony Xperia M4 Aqua" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" - device-qcom-msm8916-nonfree-firmware + firmware-qcom-adreno-a300 + firmware-qcom-adreno-a420 + firmware-qcom-db410c-wcnss-nv linux-postmarketos-qcom-msm8916 mkbootimg postmarketos-base @@ -25,6 +27,14 @@ build() { package() { devicepkg_package $startdir $pkgname + + # HACK: For devices that don't have a nv file in persist we + # temporarily link the db410c file to the expected location. + # It will be overriden if the file is in persist or when user + # installs the device-specific firmware packages. + mkdir -p "$pkgdir"/usr/lib/firmware/wlan/prima/ + ln -s /usr/lib/firmware/qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin \ + "$pkgdir"/usr/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/device-thundercomm-db845c/APKBUILD b/device/testing/device-thundercomm-db845c/APKBUILD index c77bba256..68a53d9e1 100644 --- a/device/testing/device-thundercomm-db845c/APKBUILD +++ b/device/testing/device-thundercomm-db845c/APKBUILD @@ -2,20 +2,21 @@ maintainer="Casey Connolly " pkgname=device-thundercomm-db845c pkgdesc="Thundercomm Dragonboard 845c" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + alsa-ucm-conf-sdm845 + fwupd>=1.8.6 + linux-firmware-qcom linux-postmarketos-qcom-sdm845 mkbootimg postmarketos-base - alsa-ucm-conf-sdm845 soc-qcom soc-qcom-qbootctl - fwupd>=1.8.6 " makedepends="devicepkg-dev" source=" @@ -23,9 +24,6 @@ source=" kernel-cmdline.conf modules-initfs " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" build() { devicepkg_build $startdir $pkgname @@ -35,12 +33,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Modem, GPU and WiFi Firmware" - depends="linux-firmware-qcom" - mkdir "$subpkgdir" -} - sha512sums=" bdae9cc4dc869dd0f649f857577c3c11a8cb99ffc13210d9576f4d8ee8433c30017943b1f287dd18910e0c1cade33d100c5b43fea412f533bfb319bad317194c deviceinfo 003e5228a2b2825f24cb8b4842e3c3f72b99225f0aef3cda5bb2de4e4beb5e1c84800ba48c6cf1b84fe042bd039912e67c545c00981b604db0c0f0bcb546f7c5 kernel-cmdline.conf diff --git a/device/testing/device-tolino-shine2hd/APKBUILD b/device/testing/device-tolino-shine2hd/APKBUILD index 1a985295d..4bf483d77 100644 --- a/device/testing/device-tolino-shine2hd/APKBUILD +++ b/device/testing/device-tolino-shine2hd/APKBUILD @@ -2,7 +2,7 @@ maintainer="Andreas Kemnade " pkgname=device-tolino-shine2hd pkgdesc="Tolino Shine 2 HD" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,13 +10,13 @@ arch="armv7" options="!check !archcheck" depends=" kobo-epdc-extractor + linux-firmware-brcm linux-postmarketos-imx-ereader perl postmarketos-base u-boot-tolino-shine2hd " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source=" deviceinfo @@ -32,12 +32,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Wifi firmware" - depends="linux-firmware-brcm" - mkdir "$subpkgdir" -} - sha512sums=" faab1f21dd232d8c16bf8a073c5be377145131157b3a178e92fde71e40d6179113b21f6130ef32ee9c0f58b6df820936aa3e7f10da4271b5ba75cecd62ea4c34 deviceinfo b4ab1b5ce58c0c46e655cfe898ff28897abae0e0ba2d927613f7ce2b21fb3fdb3ffaa8b5b260daa9baebef49f71e3c068932fe255ffa420d6ecc9c9e99c67aca kernel-cmdline.conf diff --git a/device/testing/device-vivo-y21l/APKBUILD b/device/testing/device-vivo-y21l/APKBUILD index ee6ffcca7..8aa9c576c 100644 --- a/device/testing/device-vivo-y21l/APKBUILD +++ b/device/testing/device-vivo-y21l/APKBUILD @@ -2,16 +2,22 @@ maintainer="Raihan Ahamed " pkgname=device-vivo-y21l pkgdesc="Vivo Y21L" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8916" +depends=" + firmware-qcom-adreno-a300 + linux-postmarketos-qcom-msm8916 + mkbootimg + msm-firmware-loader + postmarketos-base + soc-qcom-msm8916 + " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -21,12 +27,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader" - mkdir "$subpkgdir" -} - sha512sums=" 9f8f5391b09be6fccb2266a7ab9626d7a0174324f82085a3c868515634d558481eedadfe74688504ef8f866a0981cda534f6c79f3932a5a5451bb563e1d47b59 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-wileyfox-crackling/APKBUILD b/device/testing/device-wileyfox-crackling/APKBUILD index f2e032048..bc3dbd077 100644 --- a/device/testing/device-wileyfox-crackling/APKBUILD +++ b/device/testing/device-wileyfox-crackling/APKBUILD @@ -2,14 +2,19 @@ maintainer="Nikita Travkin " pkgname=device-wileyfox-crackling pkgdesc="Wileyfox Swift" -pkgver=11 +pkgver=12 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc" +depends="postmarketos-base + mkbootimg + linux-postmarketos-qcom-msm8916 + soc-qcom-msm8916 soc-qcom-msm8916-rproc + firmware-qcom-adreno-a300 msm-firmware-loader + firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus + " makedepends="devicepkg-dev" source=" deviceinfo @@ -17,10 +22,6 @@ source=" modules-initfs 10-crackling-proximity.rules " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware -" - # Backwards compatibility for old kernel variant subpackages replaces="$pkgname-kernel-mainline $pkgname-kernel-mainline-modem" for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done @@ -36,13 +37,6 @@ package() { "$pkgdir"/usr/lib/udev/rules.d/10-crackling-proximity.rules } -nonfree_firmware() { - pkgdesc="GPU/WiFi/BT/Modem/Video firmware" - depends="firmware-qcom-adreno-a300 msm-firmware-loader - firmware-wileyfox-crackling-wcnss-nv firmware-wileyfox-crackling-venus" - mkdir "$subpkgdir" -} - sha512sums=" 1b605ed2010c8b2e57e002f0fa66394414a4d4317ab6140b88362b8ce738edfbcd5b23510b541283ef79fdac92117b5b4dbdb432978d569a1b87277d67d4cd82 deviceinfo 37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67 kernel-cmdline.conf diff --git a/device/testing/device-xiaomi-elish/APKBUILD b/device/testing/device-xiaomi-elish/APKBUILD index 4ae8ea50e..e97954c0a 100644 --- a/device/testing/device-xiaomi-elish/APKBUILD +++ b/device/testing/device-xiaomi-elish/APKBUILD @@ -2,7 +2,7 @@ maintainer="Jianhua Lu " pkgname=device-xiaomi-elish pkgdesc="Xiaomi Mi Pad 5 Pro" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -10,7 +10,18 @@ arch="aarch64" options="!check !archcheck" depends=" alsa-ucm-conf + firmware-xiaomi-elish-adreno + firmware-xiaomi-elish-adsp + firmware-xiaomi-elish-cdsp + firmware-xiaomi-elish-cirrus + firmware-xiaomi-elish-hexagonfs + firmware-xiaomi-elish-initramfs + firmware-xiaomi-elish-slpi + firmware-xiaomi-elish-touchscreen + firmware-xiaomi-elish-venus hexagonrpcd>=0.3.2-r3 + linux-firmware-ath11k + linux-firmware-qca make-dynpart-mappings mkbootimg postmarketos-base @@ -32,7 +43,6 @@ source=" subpackages=" $pkgname-kernel-boe:kernel_boe $pkgname-kernel-csot:kernel_csot - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc " @@ -73,24 +83,6 @@ kernel_csot() { devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } -nonfree_firmware() { - pkgdesc="Firmware for GPU, WiFi, etc." - depends=" - firmware-xiaomi-elish-adreno - firmware-xiaomi-elish-adsp - firmware-xiaomi-elish-cdsp - firmware-xiaomi-elish-cirrus - firmware-xiaomi-elish-hexagonfs - firmware-xiaomi-elish-initramfs - firmware-xiaomi-elish-slpi - firmware-xiaomi-elish-touchscreen - firmware-xiaomi-elish-venus - linux-firmware-ath11k - linux-firmware-qca - " - mkdir "$subpkgdir" -} - openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" depends="hexagonrpcd-openrc" diff --git a/device/testing/device-xiaomi-miatoll/APKBUILD b/device/testing/device-xiaomi-miatoll/APKBUILD index 677ad33f8..c17cd94c2 100644 --- a/device/testing/device-xiaomi-miatoll/APKBUILD +++ b/device/testing/device-xiaomi-miatoll/APKBUILD @@ -2,23 +2,29 @@ maintainer="Nikroks " pkgname=device-xiaomi-miatoll pkgdesc="Xiaomi Redmi Note 9 Pro / Redmi Note 9S" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-xiaomi-miatoll + hexagonrpcd>=0.3.2-r3 + linux-postmarketos-qcom-sm7125 make-dynpart-mappings mkbootimg - linux-postmarketos-qcom-sm7125 postmarketos-base - swclock-offset soc-qcom-sm7125 soc-qcom-sm7125-ucm + swclock-offset systemd-boot " makedepends="devicepkg-dev" +subpackages=" + $pkgname-openrc + $pkgname-udev +" source=" deviceinfo kernel-cmdline.conf @@ -27,12 +33,6 @@ source=" 81-libssc-xiaomi-miatoll.rules " -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc - $pkgname-nonfree-firmware-udev:nonfree_firmware_udev -" - build() { devicepkg_build $startdir $pkgname } @@ -46,29 +46,14 @@ package() { "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf } -nonfree_firmware() { - pkgdesc="GPU, venus, modem and sensor firmware" - depends=" - firmware-xiaomi-miatoll - hexagonrpcd>=0.3.2-r3 - " - - amove usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf -} - -nonfree_firmware_openrc() { - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + default_openrc install="$subpkgname.post-install $subpkgname.post-upgrade" depends="hexagonrpcd-openrc openrc" mkdir "$subpkgdir" } -nonfree_firmware_udev() { - default_udev - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev" -} - sha512sums=" 78ba6fa05487289eaca8046992a6b4d26b29d64131e0628d01e43fb8cd9fbba5c07468e752984729cb500f24845439d28afea38db1f3360afbf1c8faae6257af deviceinfo 97e88eaa9b8e7989a20d2572479fe5d1fe0284de862da11c91b1f347099d5704673837db01a6b0c289fee0a2d7236f64fba31fd6001475f957c23203e34fd6fb kernel-cmdline.conf diff --git a/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-nonfree-firmware-openrc.post-upgrade b/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-nonfree-firmware-openrc.post-upgrade deleted file mode 120000 index 476e69810..000000000 --- a/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-nonfree-firmware-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -device-xiaomi-miatoll-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-nonfree-firmware-openrc.post-install b/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-openrc.post-install similarity index 100% rename from device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-nonfree-firmware-openrc.post-install rename to device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-openrc.post-install diff --git a/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-openrc.post-upgrade b/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-openrc.post-upgrade new file mode 120000 index 000000000..8ccacebc7 --- /dev/null +++ b/device/testing/device-xiaomi-miatoll/device-xiaomi-miatoll-openrc.post-upgrade @@ -0,0 +1 @@ +device-xiaomi-miatoll-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-xiaomi-natrium/APKBUILD b/device/testing/device-xiaomi-natrium/APKBUILD index 0d6c11123..fbe7818c3 100644 --- a/device/testing/device-xiaomi-natrium/APKBUILD +++ b/device/testing/device-xiaomi-natrium/APKBUILD @@ -2,7 +2,7 @@ maintainer="Alec Su (AlecJY) " pkgname=device-xiaomi-natrium pkgdesc="Xiaomi Mi 5s Plus" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" diff --git a/device/testing/device-xiaomi-pyxis/APKBUILD b/device/testing/device-xiaomi-pyxis/APKBUILD index 5b23d352b..280e0b863 100644 --- a/device/testing/device-xiaomi-pyxis/APKBUILD +++ b/device/testing/device-xiaomi-pyxis/APKBUILD @@ -2,7 +2,7 @@ maintainer="Alicja Michalska " pkgname=device-xiaomi-pyxis pkgdesc="Xiaomi Mi 9 Lite" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -46,7 +46,7 @@ build() { } package() { - replaces="$pkgname-nonfree-firmware" + replaces="device-xiaomi-pyxis-nonfree-firmware" devicepkg_package $startdir $pkgname # Sensors depend on ADSP firmware and the sensors registry served over FastRPC. diff --git a/device/testing/device-xiaomi-scorpio/APKBUILD b/device/testing/device-xiaomi-scorpio/APKBUILD index 59365af07..0b269a66b 100644 --- a/device/testing/device-xiaomi-scorpio/APKBUILD +++ b/device/testing/device-xiaomi-scorpio/APKBUILD @@ -2,7 +2,7 @@ maintainer="Yassine Oudjana (Tooniis) " pkgname=device-xiaomi-scorpio pkgdesc="Xiaomi Mi Note 2" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" diff --git a/device/testing/device-xunlong-orangepi3/APKBUILD b/device/testing/device-xunlong-orangepi3/APKBUILD index 68122d555..07f6a2aa0 100644 --- a/device/testing/device-xunlong-orangepi3/APKBUILD +++ b/device/testing/device-xunlong-orangepi3/APKBUILD @@ -2,19 +2,19 @@ maintainer="Maxim Karasev " pkgname=device-xunlong-orangepi3 pkgdesc="Xunlong Orange Pi 3" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-xunlong-orangepi3 linux-postmarketos-allwinner postmarketos-base>=25-r1 u-boot-sunxi " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo kernel-cmdline.conf" build() { @@ -25,12 +25,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="Wi-Fi and Bluetooth firmware" - depends="firmware-xunlong-orangepi3" - mkdir "$subpkgdir" -} - sha512sums=" 0311ab138a2909223a5b83c10e2b17ddd9a7994e76c4f9cbda1d9ddafda4d8486b3f5d8892eec391c11447565a57170e69c914491f961f1e8d9f0515ac5a3092 deviceinfo 5269b54efc5ad66dd504fbef54820c88fbbb60301c9504332881b7f40c87b182d7a271be17d7bd8e226eb6638c10acd020135d60f7dd09e511d2296a24e6a320 kernel-cmdline.conf diff --git a/device/testing/device-xunlong-orangepi5-plus/APKBUILD b/device/testing/device-xunlong-orangepi5-plus/APKBUILD index be7a0a45a..7ab71d105 100644 --- a/device/testing/device-xunlong-orangepi5-plus/APKBUILD +++ b/device/testing/device-xunlong-orangepi5-plus/APKBUILD @@ -2,20 +2,21 @@ maintainer="WeirdTreeThing " pkgname=device-xunlong-orangepi5-plus pkgdesc="Xunlong Orange Pi 5 Plus" -pkgver=7 -pkgrel=1 +pkgver=8 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-firmware-arm + linux-firmware-rtl_nic postmarketos-base systemd-boot " makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf modules-initfs" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-stable:kernel_stable $pkgname-kernel-lts:kernel_lts $pkgname-kernel-mainline:kernel_mainline @@ -29,12 +30,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="GPU/NIC firmware" - depends="linux-firmware-arm linux-firmware-rtl_nic" - mkdir "$subpkgdir" -} - kernel_stable() { pkgdesc="Stable kernel (recommended, best balance between stability and features)" depends="linux-postmarketos-stable" diff --git a/device/testing/device-zhihe-generic/APKBUILD b/device/testing/device-zhihe-generic/APKBUILD index de66ae838..d331ee555 100644 --- a/device/testing/device-zhihe-generic/APKBUILD +++ b/device/testing/device-zhihe-generic/APKBUILD @@ -4,7 +4,7 @@ maintainer="Yang Xiwen " pkgname=device-zhihe-generic pkgdesc="A generic device package for various MSM8916-based dongles(namely zhihe)" -pkgver=7 +pkgver=8 pkgrel=0 url="https://postmarketos.org" license="GPL" @@ -12,7 +12,9 @@ arch="aarch64" options="!check !archcheck" provides="device-generic-zhihe=$pkgver-r$pkgrel" depends=" + firmware-qcom-msm8916-venus mkbootimg + msm-firmware-loader postmarketos-base soc-qcom-msm8916 soc-qcom-msm8916-rproc @@ -20,7 +22,6 @@ depends=" makedepends="devicepkg-dev" source="deviceinfo kernel-cmdline.conf" subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware $pkgname-kernel-ufi001c:kernel_ufi001c $pkgname-kernel-uf896:kernel_uf896 $pkgname-kernel-uz801:kernel_uz801 @@ -34,13 +35,6 @@ package() { devicepkg_package $startdir $pkgname } -nonfree_firmware() { - pkgdesc="WiFi/BT/Modem/Video firmware" - depends="msm-firmware-loader - firmware-qcom-msm8916-venus" - mkdir "$subpkgdir" -} - kernel_ufi001c() { pkgdesc="UFI103S / UFI-001C(B) / UFI003" depends="linux-postmarketos-qcom-msm8916"