diff --git a/device/community/device-google-trogdor/APKBUILD b/device/community/device-google-trogdor/APKBUILD index 1d12f8496..c2d16688f 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=11 +pkgver=12 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -44,7 +44,6 @@ nonfree_firmware() { linux-firmware-qca linux-firmware-ath10k firmware-google-trogdor - soc-qcom-sc7180-nonfree-firmware msm-cros-efs-loader " mkdir "$subpkgdir" diff --git a/device/community/soc-qcom-sc7180/APKBUILD b/device/community/soc-qcom-sc7180/APKBUILD index c1b9fbf2a..14af92816 100644 --- a/device/community/soc-qcom-sc7180/APKBUILD +++ b/device/community/soc-qcom-sc7180/APKBUILD @@ -3,24 +3,24 @@ maintainer="Alicja Michalska " pkgname=soc-qcom-sc7180 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices" -pkgver=2 -pkgrel=5 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" +depends="rmtfs" options="!check !archcheck !tracedeps" install=" - $pkgname-nonfree-firmware-openrc.post-install - $pkgname-nonfree-firmware-openrc.post-upgrade - $pkgname-nonfree-firmware-woa-openrc.post-install - $pkgname-nonfree-firmware-woa-openrc.post-upgrade + $pkgname-openrc.post-install + $pkgname-openrc.post-upgrade + $pkgname-woa-openrc.post-install + $pkgname-woa-openrc.post-upgrade " subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc - $pkgname-nonfree-firmware-woa:nonfree_firmware_woa - $pkgname-nonfree-firmware-woa-openrc:nonfree_firmware_woa_openrc + $pkgname-openrc $pkgname-vulkan + $pkgname-woa-openrc:woa_openrc + $pkgname-woa:woa " source="00-sc7180-nonstrict-iommu.sh" @@ -31,36 +31,29 @@ package() { -t "$pkgdir"/usr/share/mkinitfs/hooks } -nonfree_firmware() { - pkgdesc="Modem, WiFi firmware" - depends="rmtfs" - mkdir "$subpkgdir" -} - -nonfree_firmware_openrc() { - depends="openrc rmtfs-openrc" - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + depends="rmtfs-openrc" + install_if="$pkgname=$pkgver-r$pkgrel openrc" mkdir "$subpkgdir" } -nonfree_firmware_woa() { +woa() { pkgdesc="Modem, WiFi firmware" depends=" - $pkgname-nonfree-firmware pd-mapper tqftpserv " mkdir "$subpkgdir" } -nonfree_firmware_woa_openrc() { +woa_openrc() { depends=" - openrc pd-mapper-openrc tqftpserv-openrc " - install_if="$pkgname-nonfree-firmware-woa=$pkgver-r$pkgrel openrc" + install_if="$pkgname-woa=$pkgver-r$pkgrel openrc" + mkdir "$subpkgdir" } diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade deleted file mode 120000 index 255d8eee9..000000000 --- a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -./soc-qcom-sc7180-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade deleted file mode 120000 index 7e67571a0..000000000 --- a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -./soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install \ No newline at end of file diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-install b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-install similarity index 100% rename from device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-install rename to device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-install diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-upgrade new file mode 120000 index 000000000..ed7de5830 --- /dev/null +++ b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-upgrade @@ -0,0 +1 @@ +soc-qcom-sc7180-openrc.post-install \ No newline at end of file diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install similarity index 100% rename from device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install rename to device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-upgrade new file mode 120000 index 000000000..3df10b908 --- /dev/null +++ b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-upgrade @@ -0,0 +1 @@ +soc-qcom-sc7180-woa-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-acer-aspire1/APKBUILD b/device/testing/device-acer-aspire1/APKBUILD index f0789d781..56d29aeb7 100644 --- a/device/testing/device-acer-aspire1/APKBUILD +++ b/device/testing/device-acer-aspire1/APKBUILD @@ -2,7 +2,7 @@ maintainer="Nikita Travkin " pkgname=device-acer-aspire1 pkgdesc="Acer Aspire 1" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -13,6 +13,7 @@ depends=" linux-postmarketos-qcom-sc7180 postmarketos-base soc-qcom-sc7180 + soc-qcom-sc7180-woa systemd-boot " makedepends="devicepkg-dev" @@ -64,7 +65,6 @@ nonfree_firmware() { firmware-qcom-adreno-a630 linux-firmware-ath10k linux-firmware-qca - soc-qcom-sc7180-nonfree-firmware-woa " mkdir "$subpkgdir" }