From 17f0976e29edc3a64a7ed01e3355a3f6fbc2779c Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Mon, 6 Jan 2025 20:07:56 +0100
Subject: [PATCH] device/*: replace deprecated mtk_mkimage="true" values (MR
 5995)

Replace this deprecated variable with the new equivalent.

[ci:ignore-count]
[ci:skip-build]: armv7 fails in CI (qemu instabilities w/ our runner),
Clayton verified checksums for armv7 stuff manually
---
 device/testing/device-bq-vegetahd/APKBUILD     | 4 ++--
 device/testing/device-bq-vegetahd/deviceinfo   | 3 ++-
 device/testing/device-fairphone-fp1/APKBUILD   | 4 ++--
 device/testing/device-fairphone-fp1/deviceinfo | 3 ++-
 device/testing/device-fly-iq4404/APKBUILD      | 4 ++--
 device/testing/device-fly-iq4404/deviceinfo    | 3 ++-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-bq-vegetahd/APKBUILD b/device/testing/device-bq-vegetahd/APKBUILD
index 97c30a72ecf..981f89e6ca3 100644
--- a/device/testing/device-bq-vegetahd/APKBUILD
+++ b/device/testing/device-bq-vegetahd/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-vegetahd
 pkgdesc="BQ Aquaris E5 HD"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,5 +29,5 @@ package() {
 }
 
 sha512sums="
-575bca5e9012f045096a99e0c1ef617dde0002201856cecf37ebb222acfdd5b7d912e42b115e6ff80dfdeac7ad9d3e6d24a91d0c780cc8e5cd9a7c4a458a4dea  deviceinfo
+c746b4547c89e1359c5c4da933db049e9ec766081f08b73f6ef4b1942ae670ee4ae8abf38c15756ade22602575543a73738a780fcfb0e178cf7dba5ba4e08896  deviceinfo
 "
diff --git a/device/testing/device-bq-vegetahd/deviceinfo b/device/testing/device-bq-vegetahd/deviceinfo
index 7955d89d35b..8111acf04f4 100644
--- a/device/testing/device-bq-vegetahd/deviceinfo
+++ b/device/testing/device-bq-vegetahd/deviceinfo
@@ -20,7 +20,8 @@ deviceinfo_screen_height="720"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="true"
+deviceinfo_bootimg_mtk_label_kernel="KERNEL"
+deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_header_version="0"
diff --git a/device/testing/device-fairphone-fp1/APKBUILD b/device/testing/device-fairphone-fp1/APKBUILD
index c8ec25b06b3..15612ba7083 100644
--- a/device/testing/device-fairphone-fp1/APKBUILD
+++ b/device/testing/device-fairphone-fp1/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp1
 pkgdesc="Fairphone 1"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-01d34ac04c3f461a98fd7562119dae59a5228d70e8ce1694a56faf1e91881c5de716dff15ffae6a4e6c34b85f8ebf1f2a8dee4aab2be7afab40fa2bbac0b7c85  deviceinfo
+642eb26651708945d5cf14e1823f664cf43d6c066bd18cd766bd8c363cc4d9764dccb19ed3e7c4d34236e9832214ac8abfcbea04b31adeb020654aef641080ed  deviceinfo
 "
diff --git a/device/testing/device-fairphone-fp1/deviceinfo b/device/testing/device-fairphone-fp1/deviceinfo
index fff36e92206..85154f1f170 100644
--- a/device/testing/device-fairphone-fp1/deviceinfo
+++ b/device/testing/device-fairphone-fp1/deviceinfo
@@ -21,7 +21,8 @@ deviceinfo_screen_height="960"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="true"
+deviceinfo_bootimg_mtk_label_kernel="KERNEL"
+deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
diff --git a/device/testing/device-fly-iq4404/APKBUILD b/device/testing/device-fly-iq4404/APKBUILD
index 90dbe2b4023..f66c713e07e 100644
--- a/device/testing/device-fly-iq4404/APKBUILD
+++ b/device/testing/device-fly-iq4404/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fly-iq4404
 pkgdesc="Fly Spark"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,5 +21,5 @@ package() {
 
 
 sha512sums="
-ca6e7d9b3e234007b7a7fbfd2cfcfd2a796d89619735dda8db87377c9c098e3931cdb35004f87f2391d8f275f6bcfdae58db2f45cb39366e40a5503af0732967  deviceinfo
+58cf8cdbfc8aa5cb6420d19247b1c9e4edbebc585974bffbf5f7146c9eb315c1960d4fdc1db42bfd8b4eea0e8a82a686cfd1257fdde27f2414f8b3fb833355ae  deviceinfo
 "
diff --git a/device/testing/device-fly-iq4404/deviceinfo b/device/testing/device-fly-iq4404/deviceinfo
index 8990d1a3362..334c691109b 100644
--- a/device/testing/device-fly-iq4404/deviceinfo
+++ b/device/testing/device-fly-iq4404/deviceinfo
@@ -20,7 +20,8 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
-deviceinfo_bootimg_mtk_mkimage="true"
+deviceinfo_bootimg_mtk_label_kernel="KERNEL"
+deviceinfo_bootimg_mtk_label_ramdisk="ROOTFS"
 deviceinfo_flash_offset_base="0x80100000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x04000000"
-- 
GitLab