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

device/archived/device-lg-lenok-downstream/APKBUILD

@@ -0,0 +1,59 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+pkgname=device-lg-lenok-downstream
+pkgdesc="LG G Watch R (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	firmware-lg-lenok-adsp
+	firmware-lg-lenok-wifi
+	firmware-qcom-adreno-a330
+	linux-lg-lenok-downstream
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8226
+	"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-asteroid
+	"
+source="
+	90-android-touch-dev.rules
+	deviceinfo
+	fb_fix.sh
+	initfs-hook.sh
+	machine.conf
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 -t "$pkgdir"/etc/udev/rules.d \
+		"$srcdir"/90-android-touch-dev.rules
+	install -Dm644 -t "$pkgdir"/etc/profile.d \
+		"$srcdir"/fb_fix.sh
+}
+
+asteroid() {
+	install_if="$pkgname=$pkgver-r$pkgrel asteroid-launcher"
+
+	install -Dm644 -t "$subpkgdir"/etc/asteroid \
+		"$srcdir"/machine.conf
+}
+
+sha512sums="
+a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f  90-android-touch-dev.rules
+e189deb274e23b178de51bbdbd3e1136d39bfa75d8210f76725acd079794f4331ed584b7bf280a87c7a097724293ba2d2e485d5d2181034917b475ee2a622bc6  deviceinfo
+1fc5a7609d8f79f74f29d55ce492dc6b77bb247da1b79abc1361e5e9072b5283816cef02c4cc283300031d708733c5fdbed94f539ae1c16b1dca96bf4d512234  fb_fix.sh
+d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22  initfs-hook.sh
+81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d  machine.conf
+"

device/archived/device-lg-lenok-downstream/deviceinfo

@@ -0,0 +1,26 @@
+# 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 G Watch R"
+deviceinfo_manufacturer="LG"
+deviceinfo_codename="lg-lenok-downstream"
+deviceinfo_year="2015"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="watch"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="320"
+deviceinfo_screen_height="320"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_offset_kernel="0x0000000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x01e00000"

device/archived/device-lg-lenok-downstream/machine.conf

@@ -0,0 +1,5 @@
+[Display]
+ROUND = true
+
+[Capabilities]
+HAS_WLAN = true

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

@@ -1,8 +1,9 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 
-pkgname=linux-lg-lenok
+pkgname=linux-lg-lenok-downstream
 pkgver=3.10.105
-pkgrel=18
+pkgrel=0
 pkgdesc="LG G Watch R kernel fork"
 arch="armv7"
 _carch="arm"
@@ -51,7 +52,7 @@ package() {
 }
 
 sha512sums="
-ae4dbdf716cf446e9788c5e1d847ff45cca60831b6199568c9a46d6319824e57515f63eabf5250ceffee5f543c1de0813a1fb48e559c2f7d51cfc73a809ee934  linux-lg-lenok-7044f08636f6b8407bb00404a2e27ae0ce859f1e.tar.gz
+ae4dbdf716cf446e9788c5e1d847ff45cca60831b6199568c9a46d6319824e57515f63eabf5250ceffee5f543c1de0813a1fb48e559c2f7d51cfc73a809ee934  linux-lg-lenok-downstream-7044f08636f6b8407bb00404a2e27ae0ce859f1e.tar.gz
 69d66b11cb1e1fed50ecd7ebb618a487d14727d1a13702c12b73febb03d2f73207a8a0881b44c2917d749d6a817b7742e9783de98024e194af8a45d4d5c91866  config-lg-lenok.armv7
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch

device/testing/device-lg-lenok/APKBUILD

@@ -2,13 +2,17 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-lg-lenok
 pkgdesc="LG G Watch R"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-lg-lenok-adsp
+	firmware-lg-lenok-wifi
+	firmware-qcom-adreno-a330
+	linux-postmarketos-qcom-msm8226
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8226
@@ -16,17 +20,11 @@ depends="
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-asteroid
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-nonfree-firmware:nonfree_firmware
 	"
 source="
-	90-android-touch-dev.rules
 	deviceinfo
-	fb_fix.sh
-	initfs-hook.sh
 	machine.conf
-	modules-initfs.mainline
+	modules-initfs
 	"
 
 build() {
@@ -44,35 +42,8 @@ asteroid() {
 		"$srcdir"/machine.conf
 }
 
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-lg-lenok"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	amove usr/share/mkinitfs/hooks/00-$pkgname.sh
-	install -Dm644 -t "$subpkgdir"/etc/udev/rules.d \
-		"$srcdir"/90-android-touch-dev.rules
-	install -Dm644 -t "$subpkgdir"/etc/profile.d \
-		"$srcdir"/fb_fix.sh
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-qcom-msm8226"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for WiFi, ADSP, etc."
-	depends="firmware-lg-lenok-adsp firmware-lg-lenok-wifi firmware-qcom-adreno-a330"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
-a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f  90-android-touch-dev.rules
-eefa3337f1f1f1b6e2e3b22b4321f368736fc3ef4ca38729d400c84d433a5d33b091298e7ac272b9005f5b564f2123448c8b436ed37e1d4be76a3f934818cc92  deviceinfo
-1fc5a7609d8f79f74f29d55ce492dc6b77bb247da1b79abc1361e5e9072b5283816cef02c4cc283300031d708733c5fdbed94f539ae1c16b1dca96bf4d512234  fb_fix.sh
-d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22  initfs-hook.sh
+ef0b126a05b3ad7efcb9721acc9b561dbb88efe4b6b2222a24514c100eacfa77432f3b39f6b1a50f6f19019c6ebf499daf86501870d11a8616f3ae911c4b4631  deviceinfo
 81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d  machine.conf
-36b66e90934e267238384c36b4e41b6b796e9df99892fd18ba416098fd66f48911c34a7f7585b1c472b09047e7a149f4d937a732140f8292f3d043b1e4ba9c87  modules-initfs.mainline
+36b66e90934e267238384c36b4e41b6b796e9df99892fd18ba416098fd66f48911c34a7f7585b1c472b09047e7a149f4d937a732140f8292f3d043b1e4ba9c87  modules-initfs
 "

device/testing/device-lg-lenok/deviceinfo

@@ -6,8 +6,8 @@ deviceinfo_name="LG G Watch R"
 deviceinfo_manufacturer="LG"
 deviceinfo_codename="lg-lenok"
 deviceinfo_year="2015"
-deviceinfo_dtb_mainline="qcom-apq8026-lg-lenok"
-deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb="qcom-apq8026-lg-lenok"
+deviceinfo_append_dtb="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -20,7 +20,7 @@ deviceinfo_screen_height="320"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 # limit to single-core until we have cpufreq to avoid fast overheating
-deviceinfo_kernel_cmdline_mainline="maxcpus=1 msm.allow_vram_carveout=1 video=320x320,reflect_y"
+deviceinfo_kernel_cmdline="maxcpus=1 msm.allow_vram_carveout=1 video=320x320,reflect_y"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_pagesize="2048"