From ce29bce59bfd95d79d3ff2d194cb8c9a4811cbd5 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 21:09:13 -0400 Subject: [PATCH] xiaomi-natrium: move openrc scripts to subpackage (MR 5688) --- device/testing/device-xiaomi-natrium/APKBUILD | 17 +++++++++++++---- ...atrium-nonfree-firmware-openrc.post-install} | 0 2 files changed, 13 insertions(+), 4 deletions(-) rename device/testing/device-xiaomi-natrium/{device-xiaomi-natrium-nonfree-firmware.post-install => device-xiaomi-natrium-nonfree-firmware-openrc.post-install} (100%) diff --git a/device/testing/device-xiaomi-natrium/APKBUILD b/device/testing/device-xiaomi-natrium/APKBUILD index e5fe14082..05eed747a 100644 --- a/device/testing/device-xiaomi-natrium/APKBUILD +++ b/device/testing/device-xiaomi-natrium/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-xiaomi-natrium pkgdesc="Xiaomi Mi 5s Plus" pkgver=1 -pkgrel=6 +pkgrel=7 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -18,7 +18,11 @@ depends=" soc-qcom-msm8996-ucm " makedepends="devicepkg-dev" -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh" +subpackages=" + $pkgname-nonfree-firmware:nonfree_firmware + $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc + $pkgname-phosh + " source=" deviceinfo @@ -47,13 +51,18 @@ nonfree_firmware() { linux-firmware-qca soc-qcom-msm8996-nonfree-firmware " - install="$subpkgname.post-install" - mkdir "$subpkgdir" install -Dm644 "$srcdir/30-gpu-firmware.files" -t \ "$subpkgdir/usr/share/mkinitfs/files" } +nonfree_firmware_openrc() { + install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install" + + mkdir -p "$subpkgdir" +} + phosh() { install_if="$pkgname=$pkgver-r$pkgrel phosh" install -Dm644 "$srcdir"/phoc.ini \ diff --git a/device/testing/device-xiaomi-natrium/device-xiaomi-natrium-nonfree-firmware.post-install b/device/testing/device-xiaomi-natrium/device-xiaomi-natrium-nonfree-firmware-openrc.post-install similarity index 100% rename from device/testing/device-xiaomi-natrium/device-xiaomi-natrium-nonfree-firmware.post-install rename to device/testing/device-xiaomi-natrium/device-xiaomi-natrium-nonfree-firmware-openrc.post-install