samsung-v1awifi: split downstream into separate package (MR 6491)

device/archived/device-samsung-v1awifi-downstream/APKBUILD

@@ -0,0 +1,36 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Maintainer: Hendrik Noack <hendrik.noack@protonmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-v1awifi-downstream
+pkgdesc="Samsung Galaxy Note Pro 12.2 WiFi (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	firmware-samsung-v1awifi-downstream
+	linux-samsung-v1awifi-downstream
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+	postmarketos-base-downstream
+	postmarketos-base-downstream-disable-udev-v4l
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+5330e4e1df3ce08e4df5b94c9eecbae9dc7f9a517d1d9a1b36c17c93f0b82624a56495169f0f6d67e77bb6f8b88d8e5eda1cb87ba09b41a1b43fe6d3d0d4f279  deviceinfo
+"

device/archived/device-samsung-v1awifi-downstream/deviceinfo

@@ -0,0 +1,37 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Samsung Galaxy Note Pro 12.2 Wi-Fi"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-v1awifi-downstream"
+deviceinfo_year="2014"
+deviceinfo_arch="armv7"
+deviceinfo_getty="ttySAC2;115200"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_create_initfs_extra="true"
+
+# Bootloader related
+deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_append_seandroidenforce="true"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_header_version="0"
+deviceinfo_flash_offset_base="0x10000000"
+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"
+deviceinfo_flash_sparse_samsung_format="1"
+
+# Heimdall related
+deviceinfo_flash_heimdall_partition_kernel="BOOT"
+deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"

device/archived/linux-samsung-v1awifi-downstream/APKBUILD

@@ -1,9 +1,10 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/lineageos_v1awifi_defconfig
 
-pkgname=linux-samsung-v1awifi
+pkgname=linux-samsung-v1awifi-downstream
 pkgver=3.4.113
-pkgrel=1
+pkgrel=0
 pkgdesc="Samsung Galaxy Note Pro 12.2 Wi-Fi kernel fork"
 arch="armv7"
 _carch="arm"
@@ -55,7 +56,7 @@ package() {
 }
 
 sha512sums="
-807e43b896d83f0a633aa417ad7ffd0a8af3aa5da2c4b1134b604fdadb26b590f04ff24131b3ee2b60b0479ce2e6ba81e3e19e50e0e772d9785b96d60aa65c33  linux-samsung-v1awifi-875b08faaa1a395c233388b4048e4b20bf971db3.tar.gz
+807e43b896d83f0a633aa417ad7ffd0a8af3aa5da2c4b1134b604fdadb26b590f04ff24131b3ee2b60b0479ce2e6ba81e3e19e50e0e772d9785b96d60aa65c33  linux-samsung-v1awifi-downstream-875b08faaa1a395c233388b4048e4b20bf971db3.tar.gz
 028c97dba02b6ec55015e9b822ca017095a98d562e4f75124cb3317313b7062798dbc71e98223e4e1948e5d8ed17c8749313072fb7b9ff37b51d439efdc049d9  config-samsung-v1awifi.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch

device/testing/device-samsung-v1awifi/APKBUILD

@@ -2,24 +2,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-v1awifi
 pkgdesc="Samsung Galaxy Note Pro 12.2 WiFi"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-samsung-v1awifi-mainline
+	linux-firmware-brcm
+	linux-firmware-s5p-mfc
+	linux-postmarketos-exynos5
 	mkbootimg
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs.mainline
-"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
+	modules-initfs
 "
 
 build() {
@@ -30,30 +30,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="Display works, wifi is broken"
-	depends="
-		linux-samsung-v1awifi
-		msm-fb-refresher
-		postmarketos-base-downstream
-		postmarketos-base-downstream-disable-udev-v4l
-	"
-	_pmb_recommends="firmware-samsung-v1awifi-downstream>=2-r0"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Mainline WIP, touchscreen doesn't work reliably (see device table for details)"
-	depends="linux-postmarketos-exynos5"
-	_pmb_recommends="
-		firmware-samsung-v1awifi-mainline>=2-r0
-		linux-firmware-s5p-mfc
-		linux-firmware-brcm
-	"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 sha512sums="
-4a8db28fa68b94d30bb0dc57d2e382a3e272de6ffa0e453ecde2769544ec1e80c7a6c902333ca03e775fc6d5e5118d6388b1d1c6c2f4784268d4e82c287a2152  deviceinfo
-4b3cb9dca85c04f1bfc5676029a6ae225409f173c6f0fc025786c1a72326dabad4b5ad75d0dd9a41cdebe8c15db5ca9761e15f3b9f99f8bf70b19769bb116fe6  modules-initfs.mainline
+09c4bdca040cc659bac75d50c51e95b146ab9f98929799f802cfe011f9e5728fe2722b1138d5d557d143bc9051e173067e732ce9bd756960e0ea7f8f679fdac7  deviceinfo
+4b3cb9dca85c04f1bfc5676029a6ae225409f173c6f0fc025786c1a72326dabad4b5ad75d0dd9a41cdebe8c15db5ca9761e15f3b9f99f8bf70b19769bb116fe6  modules-initfs
 "

device/testing/device-samsung-v1awifi/deviceinfo

@@ -8,8 +8,8 @@ deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-v1awifi"
 deviceinfo_year="2014"
 deviceinfo_arch="armv7"
-deviceinfo_append_dtb_mainline="true"
-deviceinfo_dtb_mainline="exynos5420-v1a-wifi"
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="exynos5420-v1a-wifi"
 deviceinfo_getty="ttySAC2;115200"
 
 # Device related
@@ -17,7 +17,7 @@ deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_create_initfs_extra="true"
-deviceinfo_gpu_accelerated_mainline="true"
+deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"