htc-m8: split downstream into separate package (MR 6491)

device/archived/device-htc-m8-downstream/APKBUILD

@@ -0,0 +1,39 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-htc-m8-downstream
+pkgdesc="HTC One M8 (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	firmware-htc-m8
+	linux-htc-m8
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	initfs-hook.sh
+	90-android-touch-dev.rules
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
+}
+
+sha512sums="
+96229ef0f9725256b2ef464fa5173fa158e8db0bd3263e42825015858f107eae9f2a3000ad281a40f4fd84340f177d6c23d355351cd36209843c66427628a9da  deviceinfo
+765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
+f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
+"

device/archived/device-htc-m8-downstream/deviceinfo

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="HTC One M8"
+deviceinfo_manufacturer="HTC"
+deviceinfo_codename="htc-m8-downstream"
+deviceinfo_year="2014"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_create_initfs_extra="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_flash_fastboot_partition_rootfs="system"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache androidboot.selinux=permissive"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="true"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x02008000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x01e00000"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"

device/archived/linux-htc-m8-downstream/APKBUILD

@@ -1,8 +1,9 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Kernel config based on: arch/arm/configs/m8_defconfig
 
-pkgname=linux-htc-m8
+pkgname=linux-htc-m8-downstream
 pkgver=3.4.113
-pkgrel=8
+pkgrel=0
 pkgdesc="HTC One M8 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -58,7 +59,7 @@ package() {
 }
 
 sha512sums="
-3f826c698af5839fd83e9204d8d4c28db35a0e8c174c0cef005acea5fa53b2463fb0d984f2d1c99e8608ecd9698fb59e954f2e7218688f75a97fee735b7b9856  linux-htc-m8-1e7a57485c90cb838cffe022831e6bec4a599548.tar.gz
+3f826c698af5839fd83e9204d8d4c28db35a0e8c174c0cef005acea5fa53b2463fb0d984f2d1c99e8608ecd9698fb59e954f2e7218688f75a97fee735b7b9856  linux-htc-m8-downstream-1e7a57485c90cb838cffe022831e6bec4a599548.tar.gz
 604982fa0431ffb62659ab6ff22efac1e167eb6830011d62e5f86a0f2d5e8f3579eb6752592b94650414f7cd3b5d0d73279a79b212846e3b10a70e48ef6e7423  config-htc-m8.armv7
 35cdbf82daef7a421a92ee3b95cc57d1c77ac62d3957bb2ea60021817381348a7c9dd4119becaae2faa8ace7e21fb40d417b9ca1c0affc46947ea52625bd9127  0001-fix-video-argb-setting.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch

device/testing/device-htc-m8/APKBUILD

@@ -1,27 +1,23 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-m8
 pkgdesc="HTC One M8"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-htc-m8
+	linux-postmarketos-qcom-msm8974
+	lk2nd-msm8974-htc-m8
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
 source="
 	deviceinfo
-	initfs-hook.sh
-	90-android-touch-dev.rules
 "
 
 build() {
@@ -30,30 +26,8 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-}
-
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-htc-m8 msm-fb-refresher"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-qcom-msm8974 lk2nd-msm8974-htc-m8"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-htc-m8"
-	mkdir "$subpkgdir"
 }
 
 sha512sums="
-e3432d0710a78e49fdb7b0bfadb4bee8dbe30f733c6c9040560c61a8f9423a48407da723a85cb5e13ea614f0038bd4ac160de4311f5faaa0e4d109b301b00504  deviceinfo
-765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
-f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
+65aeb4617cf7c0a6fd6936bfe20bb68b56dc875192c4d06c36ce6372535ea01cc848987884d8ec0c33c0666f838aef8a6f0cac6aa74a1836186cd41e0420dce2  deviceinfo
 "

device/testing/device-htc-m8/deviceinfo

@@ -7,23 +7,20 @@ deviceinfo_manufacturer="HTC"
 deviceinfo_codename="htc-m8"
 deviceinfo_year="2014"
 deviceinfo_arch="armv7"
-deviceinfo_dtb_mainline="qcom-msm8974pro-htc-m8"
-deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb="qcom-msm8974pro-htc-m8"
+deviceinfo_append_dtb="true"
 
 # Device related
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
-deviceinfo_create_initfs_extra_downstream="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_rootfs="system"
-deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache androidboot.selinux=permissive"
-deviceinfo_kernel_cmdline_mainline="console=tty0 PMOS_NOSPLASH"
+deviceinfo_kernel_cmdline="console=tty0 PMOS_NOSPLASH"
 deviceinfo_generate_bootimg="true"
-deviceinfo_generate_extlinux_config_mainline="true"
-deviceinfo_bootimg_qcdt_downstream="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02008000"
@@ -33,4 +30,4 @@ deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 
 # lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type_mainline="msdos"
+deviceinfo_partition_type="msdos"