From d4eed0654278b35fa9ff8cd6c712971841aef690 Mon Sep 17 00:00:00 2001 From: Segfault Date: Mon, 7 Nov 2022 21:45:44 +1100 Subject: [PATCH] htc-flounder: move downstream pieces to unmaintained (MR 3623) It can still be chosen as 'htc-flounder-downstream' in pmbootstrap init. --- .../device-htc-flounder-downstream}/APKBUILD | 11 ++++++----- .../device-htc-flounder-downstream}/deviceinfo | 2 +- .../firmware-htc-flounder-downstream}/APKBUILD | 7 ++++--- .../linux-htc-flounder-downstream}/APKBUILD | 11 ++++++----- .../config-htc-flounder-downstream.aarch64} | 0 .../gcc10-extern_YYLOC_global_declaration.patch | 0 6 files changed, 17 insertions(+), 14 deletions(-) rename device/{testing/device-htc-flounder => unmaintained/device-htc-flounder-downstream}/APKBUILD (60%) rename device/{testing/device-htc-flounder => unmaintained/device-htc-flounder-downstream}/deviceinfo (95%) rename device/{testing/firmware-htc-flounder => unmaintained/firmware-htc-flounder-downstream}/APKBUILD (85%) rename device/{testing/linux-htc-flounder => unmaintained/linux-htc-flounder-downstream}/APKBUILD (85%) rename device/{testing/linux-htc-flounder/config-htc-flounder.aarch64 => unmaintained/linux-htc-flounder-downstream/config-htc-flounder-downstream.aarch64} (100%) rename device/{testing/linux-htc-flounder => unmaintained/linux-htc-flounder-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) diff --git a/device/testing/device-htc-flounder/APKBUILD b/device/unmaintained/device-htc-flounder-downstream/APKBUILD similarity index 60% rename from device/testing/device-htc-flounder/APKBUILD rename to device/unmaintained/device-htc-flounder-downstream/APKBUILD index b501d757c..9a8dbf242 100644 --- a/device/testing/device-htc-flounder/APKBUILD +++ b/device/unmaintained/device-htc-flounder-downstream/APKBUILD @@ -1,13 +1,14 @@ +# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)! # Reference: -pkgname=device-htc-flounder +pkgname=device-htc-flounder-downstream pkgdesc="Google Nexus 9" pkgver=0.1 -pkgrel=13 +pkgrel=0 url="https://postmarketos.org" license="gpl-v3" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base linux-htc-flounder mkbootimg" +depends="postmarketos-base linux-htc-flounder-downstream mkbootimg" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo" @@ -21,9 +22,9 @@ package() { } nonfree_firmware() { pkgdesc="Firmware" - depends="linux-firmware-brcm linux-firmware-cypress firmware-htc-flounder" + depends="linux-firmware-brcm linux-firmware-cypress firmware-htc-flounder-downstream" mkdir "$subpkgdir" } sha512sums=" -42fd2afbd560cc23c0b065ff046b9accdb9efa141b2452239b52a767ee5fb3b4f032dff1c276f7630348db684c2b582dbd601614c470551372bba4b9929fa35a deviceinfo +a1912ffe196fd8677366ac9e891a06dab2deb324dc33c6b588c32565e90b6463c01b021fa8de3704668860c5b2b224e00552e443becf3b8e3efda230cccc9688 deviceinfo " diff --git a/device/testing/device-htc-flounder/deviceinfo b/device/unmaintained/device-htc-flounder-downstream/deviceinfo similarity index 95% rename from device/testing/device-htc-flounder/deviceinfo rename to device/unmaintained/device-htc-flounder-downstream/deviceinfo index e46643bf4..a366bb838 100644 --- a/device/testing/device-htc-flounder/deviceinfo +++ b/device/unmaintained/device-htc-flounder-downstream/deviceinfo @@ -4,7 +4,7 @@ deviceinfo_format_version="0" deviceinfo_name="Google Nexus 9" deviceinfo_manufacturer="HTC" -deviceinfo_codename="htc-flounder" +deviceinfo_codename="htc-flounder-downstream" deviceinfo_year="2014" deviceinfo_arch="aarch64" diff --git a/device/testing/firmware-htc-flounder/APKBUILD b/device/unmaintained/firmware-htc-flounder-downstream/APKBUILD similarity index 85% rename from device/testing/firmware-htc-flounder/APKBUILD rename to device/unmaintained/firmware-htc-flounder-downstream/APKBUILD index 96441d0c0..71cad74ae 100644 --- a/device/testing/firmware-htc-flounder/APKBUILD +++ b/device/unmaintained/firmware-htc-flounder-downstream/APKBUILD @@ -1,6 +1,7 @@ -pkgname=firmware-htc-flounder +# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)! +pkgname=firmware-htc-flounder-downstream pkgver=1.0 -pkgrel=1 +pkgrel=0 _commit="27024f568d1eee70c4a12f3f46aec33f6ee2f225" pkgdesc="Firmware for the HTC Google Nexus 9" url="https://github.com/Alexandroid99/vendor_htc_flounder" @@ -30,4 +31,4 @@ package() { "$pkgdir"/lib/firmware/postmarketos/tegra13x/"$_i" done } -sha512sums="c6beb210233f938f1bbcb06ff99566a4755959c865978d4897f82ffdfc3c292a075fdb34e332a8965953a4ec7aec7e36ebd142036e3879b70e835d3b0e8a1543 firmware-htc-flounder-27024f568d1eee70c4a12f3f46aec33f6ee2f225.tar.gz" +sha512sums="c6beb210233f938f1bbcb06ff99566a4755959c865978d4897f82ffdfc3c292a075fdb34e332a8965953a4ec7aec7e36ebd142036e3879b70e835d3b0e8a1543 firmware-htc-flounder-downstream-27024f568d1eee70c4a12f3f46aec33f6ee2f225.tar.gz" diff --git a/device/testing/linux-htc-flounder/APKBUILD b/device/unmaintained/linux-htc-flounder-downstream/APKBUILD similarity index 85% rename from device/testing/linux-htc-flounder/APKBUILD rename to device/unmaintained/linux-htc-flounder-downstream/APKBUILD index 409d97df4..badb4e847 100644 --- a/device/testing/linux-htc-flounder/APKBUILD +++ b/device/unmaintained/linux-htc-flounder-downstream/APKBUILD @@ -1,12 +1,13 @@ +# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)! # Kernel config based on: arch/arm64/configs/lineage_flounder_defconfig -pkgname=linux-htc-flounder +pkgname=linux-htc-flounder-downstream pkgver=3.10.103 -pkgrel=5 +pkgrel=0 pkgdesc="Google Nexus 9 kernel fork" arch="aarch64" _carch="arm64" -_flavor="htc-flounder" +_flavor="htc-flounder-downstream" url="https://kernel.org" license="GPL2" options="!strip !check !tracedeps pmb:cross-native" @@ -47,6 +48,6 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="b9ee4b14b0466e0b19d869810ceb852dd70399a90cdb081b902177685b87d242e11284bb0f619ea103b30ef5544f06a88c0131d028024ad8aa45809697e070fa linux-htc-flounder-a8f66d78789d66906c886fd6818fb648d0a84a2a.tar.gz -1843a10732e6d21379993aa3b3ca24040d7f11de2bf9959056a39976dc5e7f4ec6a743c6a36120d72a6614a242c0159ce31efe3f1d15cc284eb355cd1c82f9ef config-htc-flounder.aarch64 +sha512sums="b9ee4b14b0466e0b19d869810ceb852dd70399a90cdb081b902177685b87d242e11284bb0f619ea103b30ef5544f06a88c0131d028024ad8aa45809697e070fa linux-htc-flounder-downstream-a8f66d78789d66906c886fd6818fb648d0a84a2a.tar.gz +1843a10732e6d21379993aa3b3ca24040d7f11de2bf9959056a39976dc5e7f4ec6a743c6a36120d72a6614a242c0159ce31efe3f1d15cc284eb355cd1c82f9ef config-htc-flounder-downstream.aarch64 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" diff --git a/device/testing/linux-htc-flounder/config-htc-flounder.aarch64 b/device/unmaintained/linux-htc-flounder-downstream/config-htc-flounder-downstream.aarch64 similarity index 100% rename from device/testing/linux-htc-flounder/config-htc-flounder.aarch64 rename to device/unmaintained/linux-htc-flounder-downstream/config-htc-flounder-downstream.aarch64 diff --git a/device/testing/linux-htc-flounder/gcc10-extern_YYLOC_global_declaration.patch b/device/unmaintained/linux-htc-flounder-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-htc-flounder/gcc10-extern_YYLOC_global_declaration.patch rename to device/unmaintained/linux-htc-flounder-downstream/gcc10-extern_YYLOC_global_declaration.patch