From 366f71d3659d38f39a51c8a537db262d14fd03d9 Mon Sep 17 00:00:00 2001
From: Stanislav Jakubek <stano.jakubek@gmail.com>
Date: Mon, 6 Jan 2025 16:03:29 +0100
Subject: [PATCH] device-motorola-falcon: add support for newer lk2nd (MR 5994)

Generate extlinux config for newer lk2nd and switch to msdos partition type,
since lk2nd doesn't support GPT yet.

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
[ci:skip-build]: already built successfully in CI
---
 device/testing/device-motorola-falcon/APKBUILD   | 6 +++---
 device/testing/device-motorola-falcon/deviceinfo | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/device/testing/device-motorola-falcon/APKBUILD b/device/testing/device-motorola-falcon/APKBUILD
index a6a424dee..a24e5233a 100644
--- a/device/testing/device-motorola-falcon/APKBUILD
+++ b/device/testing/device-motorola-falcon/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-falcon
 pkgdesc="Moto G (2013)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -47,6 +47,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-6898a4f4d08c12780ca80299f8b89067e5598504b4739fad47a6a71cbe4d7cf806cb89d538aceb8f4ed3e0a914c3006acce7b07716d776570fa63845e434f482  deviceinfo
+c7f10570f98bf9080da79c15c93a0e0a9b22895b488ae73e5a0c0e746a9ef68e15525a32cbc68acd30549f8fb9d9577e9fb4781abea4abbcc6c7db50b8538c06  deviceinfo
 35701f944fb4d1dd365fb2d3363620271ce748647c7462e9e8d6a2447df766f94cf1d07aa366c66c745fbb0fdaa6960e3f77176f9b6f4f9ca0dbc5d2f5989067  modules-initfs.mainline
 "
diff --git a/device/testing/device-motorola-falcon/deviceinfo b/device/testing/device-motorola-falcon/deviceinfo
index a81a577b5..94dc83531 100644
--- a/device/testing/device-motorola-falcon/deviceinfo
+++ b/device/testing/device-motorola-falcon/deviceinfo
@@ -23,6 +23,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags buildvariant=userdebug"
 deviceinfo_kernel_cmdline_mainline="clk_ignore_unused pd_ignore_unused"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -31,3 +32,6 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"