motorola-falcon: split downstream into separate package (MR 6491)

device/archived/device-motorola-falcon-downstream/APKBUILD

@@ -0,0 +1,33 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-motorola-falcon-downstream
+pkgdesc="Moto G (2013) (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	firmware-motorola-falcon
+	linux-motorola-falcon-downstream
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+	"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+98742dd972f815d910908ad0ede6ee3bb57357e0238328b0c69cf4fd0257cd8165abe3e0a8baf6acc1026cc8aab6b95ace85a96fae5135a418aacc73f592cd67  deviceinfo
+"

device/archived/device-motorola-falcon-downstream/deviceinfo

@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Motorola Moto G (2013)"
+deviceinfo_manufacturer="Motorola"
+deviceinfo_codename="motorola-falcon-downstream"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+deviceinfo_dev_touchscreen="/dev/input/event2"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags buildvariant=userdebug"
+deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="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="2048"
+deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"

device/archived/linux-motorola-falcon-downstream/APKBUILD

@@ -1,8 +1,9 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Kernel config based on: arch/arm/configs/falcon_defconfig
 
-pkgname=linux-motorola-falcon
+pkgname=linux-motorola-falcon-downstream
 pkgver=3.4.113
-pkgrel=10
+pkgrel=0
 pkgdesc="Moto G (2013) kernel fork"
 arch="armv7"
 _carch="arm"
@@ -58,7 +59,7 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec  linux-motorola-falcon-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz
+sha512sums="5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec  linux-motorola-falcon-downstream-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz
 b2b0384dc9402e1d53a0856a4be2b1f098d1d50ce7e5e7dc4f562db96b0f58469d4ae34db7148e7f2b7c065624ff365ec1dc100573fde873819a814a78d72007  config-motorola-falcon.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch

device/testing/device-motorola-falcon/APKBUILD

@@ -1,23 +1,23 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-falcon
 pkgdesc="Moto G (2013)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-msm8226"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-nonfree-firmware:nonfree_firmware
+depends="
+	firmware-motorola-falcon
+	linux-postmarketos-qcom-msm8226
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8226
 	"
-
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs.mainline
+	modules-initfs
 	"
 
 build() {
@@ -28,25 +28,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-motorola-falcon msm-fb-refresher"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-qcom-msm8226"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-motorola-falcon"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
-c7f10570f98bf9080da79c15c93a0e0a9b22895b488ae73e5a0c0e746a9ef68e15525a32cbc68acd30549f8fb9d9577e9fb4781abea4abbcc6c7db50b8538c06  deviceinfo
-35701f944fb4d1dd365fb2d3363620271ce748647c7462e9e8d6a2447df766f94cf1d07aa366c66c745fbb0fdaa6960e3f77176f9b6f4f9ca0dbc5d2f5989067  modules-initfs.mainline
+d65b09730b3a8e66a2df50f4f594a572bdf28ad78697100d492fdc298a4afb06b0129167e3c4a1462ec7844bff10fa3935a14edc8727b85513337ddf0a58ed6c  deviceinfo
+35701f944fb4d1dd365fb2d3363620271ce748647c7462e9e8d6a2447df766f94cf1d07aa366c66c745fbb0fdaa6960e3f77176f9b6f4f9ca0dbc5d2f5989067  modules-initfs
 "

device/testing/device-motorola-falcon/deviceinfo

@@ -6,8 +6,8 @@ deviceinfo_name="Motorola Moto G (2013)"
 deviceinfo_manufacturer="Motorola"
 deviceinfo_codename="motorola-falcon"
 deviceinfo_year="2013"
-deviceinfo_dtb_mainline="msm8226-motorola-falcon"
-deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb="msm8226-motorola-falcon"
+deviceinfo_append_dtb="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -20,11 +20,9 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
 
 # Bootloader related
 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_kernel_cmdline="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"
 deviceinfo_flash_offset_ramdisk="0x01000000"