From b5fcd384ebb75d63b6f4a0ff7b497e04079fd516 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 May 2025 17:29:01 +0200 Subject: [PATCH] huawei-sturgeon: split downstream into separate package (MR 6491) --- .../APKBUILD | 37 +++++++++++++++++++ .../deviceinfo | 32 ++++++++++++++++ .../networkmanager.conf | 0 ...-partition-for-normal-read-and-write.patch | 0 ...02-msm-mdss-fix-fb-memory-allocation.patch | 0 .../APKBUILD | 7 ++-- .../config-huawei-sturgeon.armv7 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../gcc8-fix-put-user.patch | 0 ...el-use-the-gnu89-standard-explicitly.patch | 0 .../testing/device-huawei-sturgeon/APKBUILD | 35 +++--------------- .../testing/device-huawei-sturgeon/deviceinfo | 7 ++-- 13 files changed, 81 insertions(+), 37 deletions(-) create mode 100644 device/archived/device-huawei-sturgeon-downstream/APKBUILD create mode 100644 device/archived/device-huawei-sturgeon-downstream/deviceinfo rename device/{testing/device-huawei-sturgeon => archived/device-huawei-sturgeon-downstream}/networkmanager.conf (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/0001-mmc-card-not-access-RPMB-partition-for-normal-read-and-write.patch (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/0002-msm-mdss-fix-fb-memory-allocation.patch (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/APKBUILD (93%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/config-huawei-sturgeon.armv7 (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/gcc8-fix-put-user.patch (100%) rename device/{testing/linux-huawei-sturgeon => archived/linux-huawei-sturgeon-downstream}/kernel-use-the-gnu89-standard-explicitly.patch (100%) diff --git a/device/archived/device-huawei-sturgeon-downstream/APKBUILD b/device/archived/device-huawei-sturgeon-downstream/APKBUILD new file mode 100644 index 000000000..1fc21fa98 --- /dev/null +++ b/device/archived/device-huawei-sturgeon-downstream/APKBUILD @@ -0,0 +1,37 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +# Maintainer: Luca Weiss +pkgname=device-huawei-sturgeon-downstream +pkgdesc="Huawei Watch" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="armv7" +options="!check !archcheck" +depends=" + firmware-huawei-sturgeon-adsp + firmware-huawei-sturgeon-wifi + linux-huawei-sturgeon + mkbootimg + msm-fb-refresher + postmarketos-base +" +makedepends="devicepkg-dev" +source=" + deviceinfo + networkmanager.conf +" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +36be65b715e509585a0bdbfc381cbe04a4886860b0cd2675347be4825ce6233c02d0a160bda83e26b72060bc4b538ab229275035f2004fa3fe2ecb5827ab1807 deviceinfo +a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82 networkmanager.conf +" diff --git a/device/archived/device-huawei-sturgeon-downstream/deviceinfo b/device/archived/device-huawei-sturgeon-downstream/deviceinfo new file mode 100644 index 000000000..369266eb1 --- /dev/null +++ b/device/archived/device-huawei-sturgeon-downstream/deviceinfo @@ -0,0 +1,32 @@ +# Reference: +# Please use double quotes only. You can source this file in shell +# scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Huawei Watch" +deviceinfo_manufacturer="Huawei" +deviceinfo_codename="huawei-sturgeon-downstream" +deviceinfo_year="2015" +deviceinfo_arch="armv7" + +# Device related +deviceinfo_chassis="watch" +deviceinfo_keyboard="false" +deviceinfo_external_storage="false" +deviceinfo_screen_width="400" +deviceinfo_screen_height="400" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="androidboot.hardware=sturgeon user_debug=31 maxcpus=4 msm_rtb.filter=0x3F pm_levels.sleep_disabled=1 selinux=0" +deviceinfo_generate_bootimg="true" +deviceinfo_generate_extlinux_config="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x02000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x01e00000" +deviceinfo_flash_pagesize="2048" +deviceinfo_flash_fastboot_partition_rootfs="userdata" diff --git a/device/testing/device-huawei-sturgeon/networkmanager.conf b/device/archived/device-huawei-sturgeon-downstream/networkmanager.conf similarity index 100% rename from device/testing/device-huawei-sturgeon/networkmanager.conf rename to device/archived/device-huawei-sturgeon-downstream/networkmanager.conf diff --git a/device/testing/linux-huawei-sturgeon/0001-mmc-card-not-access-RPMB-partition-for-normal-read-and-write.patch b/device/archived/linux-huawei-sturgeon-downstream/0001-mmc-card-not-access-RPMB-partition-for-normal-read-and-write.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/0001-mmc-card-not-access-RPMB-partition-for-normal-read-and-write.patch rename to device/archived/linux-huawei-sturgeon-downstream/0001-mmc-card-not-access-RPMB-partition-for-normal-read-and-write.patch diff --git a/device/testing/linux-huawei-sturgeon/0002-msm-mdss-fix-fb-memory-allocation.patch b/device/archived/linux-huawei-sturgeon-downstream/0002-msm-mdss-fix-fb-memory-allocation.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/0002-msm-mdss-fix-fb-memory-allocation.patch rename to device/archived/linux-huawei-sturgeon-downstream/0002-msm-mdss-fix-fb-memory-allocation.patch diff --git a/device/testing/linux-huawei-sturgeon/APKBUILD b/device/archived/linux-huawei-sturgeon-downstream/APKBUILD similarity index 93% rename from device/testing/linux-huawei-sturgeon/APKBUILD rename to device/archived/linux-huawei-sturgeon-downstream/APKBUILD index bc307e113..6ac8d4c48 100644 --- a/device/testing/linux-huawei-sturgeon/APKBUILD +++ b/device/archived/linux-huawei-sturgeon-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm/configs/sturgeon_defconfig -pkgname=linux-huawei-sturgeon +pkgname=linux-huawei-sturgeon-downstream pkgver=3.10.40 -pkgrel=1 +pkgrel=0 pkgdesc="Huawei Watch kernel fork" arch="armv7" _carch="arm" @@ -56,7 +57,7 @@ package() { } sha512sums=" -515ae0ddd89251b234368c1082332e216051d528ba7164267c943b5b5b077620fe50aceabc28d0c151fc31804a1c532c38c1289e67bcd87d4a07c5cd9e9729f5 linux-huawei-sturgeon-97abcf5b24684a46530ffc8a4748dd7ae6c2e65a.tar.gz +515ae0ddd89251b234368c1082332e216051d528ba7164267c943b5b5b077620fe50aceabc28d0c151fc31804a1c532c38c1289e67bcd87d4a07c5cd9e9729f5 linux-huawei-sturgeon-downstream-97abcf5b24684a46530ffc8a4748dd7ae6c2e65a.tar.gz a3847fe930298714f3eef645ec5c828842d40abf8b84ce7bc2c41bc9729c4bfe2dda3b0357fdf3b18896319b3eeee5b9e5a79dc796e331c4b81e9063b413b929 config-huawei-sturgeon.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch diff --git a/device/testing/linux-huawei-sturgeon/config-huawei-sturgeon.armv7 b/device/archived/linux-huawei-sturgeon-downstream/config-huawei-sturgeon.armv7 similarity index 100% rename from device/testing/linux-huawei-sturgeon/config-huawei-sturgeon.armv7 rename to device/archived/linux-huawei-sturgeon-downstream/config-huawei-sturgeon.armv7 diff --git a/device/testing/linux-huawei-sturgeon/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-huawei-sturgeon-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-huawei-sturgeon-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-huawei-sturgeon/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-huawei-sturgeon-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-huawei-sturgeon-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/testing/linux-huawei-sturgeon/gcc8-fix-put-user.patch b/device/archived/linux-huawei-sturgeon-downstream/gcc8-fix-put-user.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/gcc8-fix-put-user.patch rename to device/archived/linux-huawei-sturgeon-downstream/gcc8-fix-put-user.patch diff --git a/device/testing/linux-huawei-sturgeon/kernel-use-the-gnu89-standard-explicitly.patch b/device/archived/linux-huawei-sturgeon-downstream/kernel-use-the-gnu89-standard-explicitly.patch similarity index 100% rename from device/testing/linux-huawei-sturgeon/kernel-use-the-gnu89-standard-explicitly.patch rename to device/archived/linux-huawei-sturgeon-downstream/kernel-use-the-gnu89-standard-explicitly.patch diff --git a/device/testing/device-huawei-sturgeon/APKBUILD b/device/testing/device-huawei-sturgeon/APKBUILD index a6ea241b2..33cb52d9b 100644 --- a/device/testing/device-huawei-sturgeon/APKBUILD +++ b/device/testing/device-huawei-sturgeon/APKBUILD @@ -2,13 +2,16 @@ # Maintainer: Luca Weiss pkgname=device-huawei-sturgeon pkgdesc="Huawei Watch" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" + firmware-huawei-sturgeon-adsp + firmware-huawei-sturgeon-wifi + linux-postmarketos-qcom-msm8226 mkbootimg postmarketos-base soc-qcom-msm8226 @@ -16,13 +19,7 @@ depends=" makedepends="devicepkg-dev" source=" deviceinfo - networkmanager.conf " -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware - " build() { devicepkg_build $startdir $pkgname @@ -32,28 +29,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Downstream kernel" - depends="linux-huawei-sturgeon msm-fb-refresher" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname - - install -Dm644 "$srcdir"/networkmanager.conf \ - "$subpkgdir"/etc/NetworkManager/conf.d/10-sturgeon.conf -} - -kernel_mainline() { - pkgdesc="Close to mainline kernel" - depends="linux-postmarketos-qcom-msm8226" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Firmware for WiFi, ADSP, etc." - depends="firmware-huawei-sturgeon-adsp firmware-huawei-sturgeon-wifi" - mkdir "$subpkgdir" -} - sha512sums=" -a0f3452f7a0012e0f4b5eb0677f459b26813b5bac06c0cbdfb62d89d9aae8d00461829b41ce11e898f4c79a696ab4d0991e36b00b7690f4848a62d644e793282 deviceinfo -a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82 networkmanager.conf +6874e263e827aca356bb096a0164184c1ed395f28553126d0f7120bf1a749d58844cdd9cec63357671cc04d62e44a01d12a024d00d38f34abb2a02b9b0eecd14 deviceinfo " diff --git a/device/testing/device-huawei-sturgeon/deviceinfo b/device/testing/device-huawei-sturgeon/deviceinfo index 64868c8b2..0982b5e76 100644 --- a/device/testing/device-huawei-sturgeon/deviceinfo +++ b/device/testing/device-huawei-sturgeon/deviceinfo @@ -7,8 +7,8 @@ deviceinfo_name="Huawei Watch" deviceinfo_manufacturer="Huawei" deviceinfo_codename="huawei-sturgeon" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom-apq8026-huawei-sturgeon" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom-apq8026-huawei-sturgeon" +deviceinfo_append_dtb="true" deviceinfo_arch="armv7" # Device related @@ -21,8 +21,7 @@ deviceinfo_screen_height="400" # Bootloader related deviceinfo_flash_method="fastboot" # limit to single-core until we have cpufreq to avoid fast overheating -deviceinfo_kernel_cmdline_mainline="maxcpus=1" -deviceinfo_kernel_cmdline_downstream="androidboot.hardware=sturgeon user_debug=31 maxcpus=4 msm_rtb.filter=0x3F pm_levels.sleep_disabled=1 selinux=0" +deviceinfo_kernel_cmdline="maxcpus=1" deviceinfo_generate_bootimg="true" deviceinfo_generate_extlinux_config="true" deviceinfo_bootimg_qcdt="false"