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

device/archived/device-samsung-golden-downstream/APKBUILD

@@ -0,0 +1,48 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-samsung-golden-downstream
+pkgdesc="Samsung Galaxy S III mini (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	firmware-samsung-u8500
+	linux-samsung-golden-downstream
+	mkbootimg
+	postmarketos-base
+	"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	init-usb-hook.sh
+	modules-load-wifi.conf
+	module-config.conf
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	# USB
+	install -Dm644 "$srcdir"/init-usb-hook.sh \
+		"$pkgdir"/usr/share/mkinitfs/hooks/00-init_usb.sh
+
+	# WiFi kernel module configuration
+	install -Dm644 "$srcdir"/modules-load-wifi.conf \
+		"$pkgdir"/etc/modules-load.d/00-load-wifi.conf
+	install -Dm644 "$srcdir"/module-config.conf \
+		"$pkgdir"/etc/modprobe.d/00-module-config.conf
+}
+
+sha512sums="
+5225090519d21917f638ab60aecf7ab8d76189cddb8e7e4ca5c16e65e3c8418ee0c376e75e68fdbbf45385a689fad160abe49f2dccb2eae04907f9136671f30f  deviceinfo
+769f76b2b0dc5279c514181f6cc915c045562df0c1fe08c54b6588d11ff2c75441a3a4f78d6dde669c82e1c572a66bdde475da3e289d334e3255fcf15430c044  init-usb-hook.sh
+61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load-wifi.conf
+436900f627e4ec7e8359bfa6b5d0ac98c69cdd3f3b5e68d23354fa87d79beef866afd6c4cf27b97e9b608cce44fe8d116594f3b08520c9c05624bcf58b61c7f1  module-config.conf
+"

device/archived/device-samsung-golden-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="Samsung Galaxy S III mini"
+deviceinfo_manufacturer="Samsung"
+deviceinfo_codename="samsung-golden-downstream"
+deviceinfo_year="2012"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="480"
+deviceinfo_screen_height="800"
+deviceinfo_getty="ttyAMA2;115200"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+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="2048"
+deviceinfo_flash_sparse="true"

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

@@ -1,8 +1,9 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Kernel config based on: arch/arm/configs/golden_android_defconfig
 
-pkgname=linux-samsung-golden
+pkgname=linux-samsung-golden-downstream
 pkgver=3.0.31
-pkgrel=4
+pkgrel=0
 pkgdesc="Samsung Galaxy SIII mini kernel fork"
 arch="armv7"
 _carch="arm"
@@ -59,7 +60,7 @@ package() {
 		modules_install
 }
 
-sha512sums="318586c486d831719d678e7645c073146b6d2cfc60ac0b8b54ddc6e545723d207d46a7acd78d944e7a855e3a5181fa8ccf863d9dd0c10129a6814e9e7e70a2fa  linux-samsung-golden-2662dc4f65ef3ad5eeb4222d3aad5dd418a04510.tar.gz
+sha512sums="318586c486d831719d678e7645c073146b6d2cfc60ac0b8b54ddc6e545723d207d46a7acd78d944e7a855e3a5181fa8ccf863d9dd0c10129a6814e9e7e70a2fa  linux-samsung-golden-downstream-2662dc4f65ef3ad5eeb4222d3aad5dd418a04510.tar.gz
 d0843c5606a0d207e73bbe952a548f7374ca099c40448a097318d96068df7da3c4ce7f1abdb10015b6ddd5f422f202578229a44f070af5953d50d924d3f9ddce  config-samsung-golden.armv7
 1fcfb5f06a2bfdcc55d53054ca80d1b989599a39a5379d057a0724fc405187d74da4309a650e70b9c79d39444e81923cfc5c9199ed8c0a77c83dcd7998446bb7  timeconst.pl-Eliminate-Perl-warning.patch
 1b3ffbfd511af7a81590e0004bcf45b89592d6bf38cc3dd48af1e227f879426894eede34376ac708e56e84217af6ff22ee16526b3e64905ef30f0d101bbcbc29  00_fix_makefile.patch

device/testing/device-samsung-golden/APKBUILD

@@ -1,27 +1,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-golden
 pkgdesc="Samsung Galaxy S III mini"
-pkgver=1
-pkgrel=19
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg"
+depends="
+	firmware-samsung-u8500
+	linux-postmarketos-stericsson
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-kwin
-"
+	"
 source="
 	deviceinfo
 	kwin.sh
-	downstream/init-usb-hook.sh
-	downstream/modules-load-wifi.conf
-	downstream/module-config.conf
-"
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -31,43 +30,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-samsung-golden"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-
-	# USB
-	install -Dm644 "$srcdir"/init-usb-hook.sh \
-		"$subpkgdir"/usr/share/mkinitfs/hooks/00-init_usb.sh
-
-	# WiFi kernel module configuration
-	install -Dm644 "$srcdir"/modules-load-wifi.conf \
-		"$subpkgdir"/etc/modules-load.d/00-load-wifi.conf
-	install -Dm644 "$srcdir"/module-config.conf \
-		"$subpkgdir"/etc/modprobe.d/00-module-config.conf
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-stericsson"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/BT firmware"
-	depends="firmware-samsung-u8500"
-	mkdir "$subpkgdir"
-}
-
 kwin() {
-	install_if="$pkgname-kernel-mainline kwin"
+	install_if="$pkgname kwin"
 	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
 }
 
 sha512sums="
-91c4d72ec462ab6bc4bc1192bd4961a7c883ebe18a1a6ab816fa22ba8a89f565573d657e13f1d7f3e1763e87b31117e90f3f0b749a5153a2f3e4995fecf2b052  deviceinfo
+804f830dcfbaa3f08cc876b7c590ce4c2b04e1fc4396363d3bc9fc1378684962d7b0a122d7ee8acb213612603f8c99977652516e68af6f4b72f138a351383e6e  deviceinfo
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh
-769f76b2b0dc5279c514181f6cc915c045562df0c1fe08c54b6588d11ff2c75441a3a4f78d6dde669c82e1c572a66bdde475da3e289d334e3255fcf15430c044  init-usb-hook.sh
-61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load-wifi.conf
-436900f627e4ec7e8359bfa6b5d0ac98c69cdd3f3b5e68d23354fa87d79beef866afd6c4cf27b97e9b608cce44fe8d116594f3b08520c9c05624bcf58b61c7f1  module-config.conf
 "

device/testing/device-samsung-golden/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy S III mini"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-golden"
 deviceinfo_year="2012"
-deviceinfo_dtb_mainline="ste-ux500-samsung-golden"
+deviceinfo_dtb="ste-ux500-samsung-golden"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -18,12 +18,12 @@ deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_getty="ttyAMA2;115200"
 
-deviceinfo_kernel_cmdline_mainline="console=ttyAMA2,115200"
+deviceinfo_kernel_cmdline="console=ttyAMA2,115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_dtb_second_mainline="true"
+deviceinfo_bootimg_dtb_second="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"