From 2d43699f912bf0e23ee6f0a046cd0ac765ef97d4 Mon Sep 17 00:00:00 2001
From: FuchtelJockel <3322658-FuchtelJockel@users.noreply.gitlab.com>
Date: Thu, 9 Mar 2023 14:56:52 +0100
Subject: [PATCH] device-lg-h815: add support to build mainline (MR 4344)

---
 device/testing/device-lg-h815/APKBUILD   | 31 ++++++++++++++++++++----
 device/testing/device-lg-h815/deviceinfo | 10 +++++---
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-lg-h815/APKBUILD b/device/testing/device-lg-h815/APKBUILD
index 1e14b2de9..5ba1f9777 100644
--- a/device/testing/device-lg-h815/APKBUILD
+++ b/device/testing/device-lg-h815/APKBUILD
@@ -1,24 +1,45 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-h815
 pkgdesc="LG G4 (h815)"
-pkgver=0.1
-pkgrel=15
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
-options="!check !archcheck"
-depends="postmarketos-base linux-lg-h815 mkbootimg msm-fb-refresher"
+depends="
+	mkbootimg
+	postmarketos-base
+	postmarketos-update-kernel
+	postmarketos-config-nftables-openusb
+"
 makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+"
 source="deviceinfo"
+options="!check !archcheck"
 
 build() {
 	devicepkg_build $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-lg-h815 msm-fb-refresher"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="mainline kernel"
+	depends="linux-postmarketos-qcom-msm8994"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 package() {
 	devicepkg_package $startdir $pkgname
 }
 
 sha512sums="
-4d2044476de04696d44ea7034bae1b007dbaafb5ce70cdd282316411867a16e49bdd522d99ee3b9b6eb964a51a833a5d8b95aeae08d21152bb61ee20c541a3ec  deviceinfo
+d6a58332001e4825c81c474efc813ea50491ece45332caf4ae8687e95f3824f16aa0b841845390ed69ea9511c5a035798dd86dd0297e0f782d85744025aaffa0  deviceinfo
 "
diff --git a/device/testing/device-lg-h815/deviceinfo b/device/testing/device-lg-h815/deviceinfo
index 14eebd526..2c89bbd76 100644
--- a/device/testing/device-lg-h815/deviceinfo
+++ b/device/testing/device-lg-h815/deviceinfo
@@ -2,10 +2,12 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="LG G4 (h815)"
+deviceinfo_name="LG G4"
 deviceinfo_manufacturer="LG"
 deviceinfo_codename="lg-h815"
 deviceinfo_year="2015"
+deviceinfo_dtb_mainline="qcom/msm8992-lg-h815"
+deviceinfo_append_dtb_mainline="true"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -17,13 +19,13 @@ deviceinfo_screen_height="2560"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x37 boot_cpus=0-5 buildvariant=userdebug"
+deviceinfo_kernel_cmdline_downstream="androidboot.selinux=permissive androidboot.init_fatal_reboot_target=recovery androidboot.hardware=qcom androidboot.wificountrycode=us ehci-hcd.park=3 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x37 boot_cpus=0-5 lge_monitor_thermal.enable=1 fakebattery=enable user_debug=31 buildvariant=userdebug"
+deviceinfo_kernel_cmdline_mainline="earlycon=tty0 console=tty0 debug ignore_loglevel PMOS_NOSPLASH"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
-
+deviceinfo_flash_fastboot_partition_system="system"