From bbbf3a1062737ff6a8b7ae2721c2f6f3bdff2e36 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 17:56:29 -0400 Subject: [PATCH] soc-qcom-sc7180: move openrc scripts to subpackages (MR 5688) --- device/community/soc-qcom-sc7180/APKBUILD | 24 +++++++++++++++---- ...7180-nonfree-firmware-openrc.post-install} | 0 ...c7180-nonfree-firmware-openrc.post-upgrade | 1 + ...-nonfree-firmware-woa-openrc.post-install} | 0 ...0-nonfree-firmware-woa-openrc.post-upgrade | 1 + ...m-sc7180-nonfree-firmware-woa.post-upgrade | 1 - ...-qcom-sc7180-nonfree-firmware.post-upgrade | 1 - 7 files changed, 21 insertions(+), 7 deletions(-) rename device/community/soc-qcom-sc7180/{soc-qcom-sc7180-nonfree-firmware.post-install => soc-qcom-sc7180-nonfree-firmware-openrc.post-install} (100%) create mode 120000 device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade rename device/community/soc-qcom-sc7180/{soc-qcom-sc7180-nonfree-firmware-woa.post-install => soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install} (100%) create mode 120000 device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade delete mode 120000 device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa.post-upgrade delete mode 120000 device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-upgrade diff --git a/device/community/soc-qcom-sc7180/APKBUILD b/device/community/soc-qcom-sc7180/APKBUILD index 915f9c8c4..956c1c9e7 100644 --- a/device/community/soc-qcom-sc7180/APKBUILD +++ b/device/community/soc-qcom-sc7180/APKBUILD @@ -2,14 +2,16 @@ pkgname=soc-qcom-sc7180 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices" pkgver=2 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" options="!check !archcheck !tracedeps" 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-vulkan " source="00-sc7180-nonstrict-iommu.sh" @@ -23,7 +25,13 @@ package() { nonfree_firmware() { pkgdesc="Modem, WiFi firmware" - depends="rmtfs rmtfs-openrc" + depends="rmtfs" + mkdir "$subpkgdir" +} + +nonfree_firmware_openrc() { + depends="rmtfs-openrc" + install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" mkdir "$subpkgdir" } @@ -33,14 +41,20 @@ nonfree_firmware_woa() { depends=" $pkgname-nonfree-firmware pd-mapper - pd-mapper-openrc tqftpserv - tqftpserv-openrc " - install="$subpkgname.post-install $subpkgname.post-upgrade" mkdir "$subpkgdir" } +nonfree_firmware_woa_openrc() { + depends=" + pd-mapper-openrc + tqftpserv-openrc + " + install_if="$pkgname-nonfree-firmware-woa=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + mkdir "$subpkgdir" +} vulkan() { pkgdesc="Vulkan support for freedreno" diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-install b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-install similarity index 100% rename from device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-install rename to device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-install 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 new file mode 120000 index 000000000..255d8eee9 --- /dev/null +++ b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade @@ -0,0 +1 @@ +./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.post-install b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install similarity index 100% rename from device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa.post-install rename to device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install 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 new file mode 120000 index 000000000..7e67571a0 --- /dev/null +++ b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade @@ -0,0 +1 @@ +./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-woa.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa.post-upgrade deleted file mode 120000 index beac84aae..000000000 --- a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -soc-qcom-sc7180-nonfree-firmware-woa.post-install \ No newline at end of file diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-upgrade b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-upgrade deleted file mode 120000 index 7b73e0abc..000000000 --- a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -soc-qcom-sc7180-nonfree-firmware.post-install \ No newline at end of file