lg-h815: split downstream into separate package (MR 6491)

device/archived/device-lg-h815-downstream/APKBUILD

@@ -0,0 +1,30 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-lg-h815-downstream
+pkgdesc="LG G4 (h815) (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+depends="
+	linux-lg-h815-downstream
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+options="!check !archcheck"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+1128fd9903a1e450686b091dce1df58694eb9f8ae54aaa725ee290c45a20464f5e8d0cbdbf9601fc6f3818e9675b6d70cf65eee3db0eec2c44c2fab92fb4104d  deviceinfo
+"

device/archived/device-lg-h815-downstream/deviceinfo

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="LG G4"
+deviceinfo_manufacturer="LG"
+deviceinfo_codename="lg-h815-downstream"
+deviceinfo_year="2015"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1440"
+deviceinfo_screen_height="2560"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="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_generate_bootimg="true"
+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_rootfs="system"

device/archived/linux-lg-h815-downstream/APKBUILD

@@ -1,8 +1,9 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Kernel config based on: arch/arm64/configs/lineageos_h815_defconfig
 
-pkgname=linux-lg-h815
+pkgname=linux-lg-h815-downstream
 pkgver=3.10.84
-pkgrel=6
+pkgrel=0
 pkgdesc="LG G4 (h815) kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -48,7 +49,7 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="48a3345de582a6e4ba7fc2f87ffd423750bb8a1878ce386b8504306a49294e01e6c4c7511d2c178d8c9fb228c288782fe64f606df381843f144986d1cd467ad7  linux-lg-h815-aad745da91abbdf8bacda189aebf22db048604f5.tar.gz
+sha512sums="48a3345de582a6e4ba7fc2f87ffd423750bb8a1878ce386b8504306a49294e01e6c4c7511d2c178d8c9fb228c288782fe64f606df381843f144986d1cd467ad7  linux-lg-h815-downstream-aad745da91abbdf8bacda189aebf22db048604f5.tar.gz
 2d75e94dfb31541487ad0977b8b491e60a314110360ff421df5a6ecd204f9f4c804aafed022703eb1c4efc25a1a730cea66089a5ecd59935861c17eb06052a59  config-lg-h815.aarch64
 337fe3e03580bbe73e5c20420981c11bf7c71e67270a828df309e6f08a573c3ce0d5cdd68efe5552abb4635d4ba1788df80e81745204955fedaf5731144ea994  fix-powerlevel.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"

device/testing/device-lg-h815/APKBUILD

@@ -1,21 +1,17 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-h815
 pkgdesc="LG G4 (h815)"
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 depends="
+	linux-postmarketos-qcom-msm8994
 	mkbootimg
 	postmarketos-base
-	postmarketos-config-nftables-openusb
 "
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-"
 source="deviceinfo"
 options="!check !archcheck"
 
@@ -23,22 +19,10 @@ 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="
-a8a9efb69e1c1b83e40145b36744e929d1aa811f2b5240be033160f2a31fdfb9c8adccf1224f768e58b0529b0c3683346769f26d61285d09172c7a2818d5a21d  deviceinfo
+5f71633a90cf304d4e9e3f4457b656bc685d46597f26391a886c1d23b7ef3b5f5c5e7790b7d29f18465bc9ec754ffefacfc4027a9106a64fdb1786a83a87af3a  deviceinfo
 "

device/testing/device-lg-h815/deviceinfo

@@ -6,8 +6,8 @@ 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_dtb="qcom/msm8992-lg-h815"
+deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,8 +19,7 @@ deviceinfo_screen_height="2560"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-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_kernel_cmdline="earlycon=tty0 console=tty0 debug ignore_loglevel PMOS_NOSPLASH"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"