sony-nicki: split downstream into separate package (MR 6491)

device/archived/device-sony-nicki-downstream/APKBUILD

@@ -0,0 +1,51 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-sony-nicki-downstream
+pkgdesc="Sony Xperia M (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-sony-nicki-downstream
+	mdss-fb-init-hack
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
+	postmarketos-base-downstream-disable-udev-v4l
+	"
+makedepends="devicepkg-dev"
+source="
+	90-android-touch-dev.rules
+	deviceinfo
+	fb.modes
+	pointercal
+	screen-workaround.sh
+	"
+
+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
+	install -D -m644 "$srcdir"/screen-workaround.sh \
+		"$pkgdir"/etc/profile.d/screen-workaround.sh
+	install -D -m644 "$srcdir"/fb.modes \
+		"$pkgdir"/etc/fb.modes
+	install -D -m644 "$srcdir"/pointercal \
+		"$pkgdir"/etc/pointercal
+}
+
+sha512sums="
+a3d3a0cf43c5f216279666143d6042f2669dbe3dc5ecec2817b6118a0c122f5b927799b37432bee3167359c118d0142fd8e8e8d67374e8ab1d837673f217e1ae  90-android-touch-dev.rules
+a6e3aedfaa9a79821b05ebe98c03adf7213b190a6a45509235cf0f6231cf9366e1944cc99c1e4d4c1d66224d783e34fb61d1cc8851a0386112d4c9e4620d33ea  deviceinfo
+aac9a5d4c856b6feaf4f2961251fbc81d9173e24c3b20806e803711b40e388a173abf2651d5d828d36a504ef2de12c1c1eacea1f1b9479e31f55234012140405  fb.modes
+016111b7618e2509186fd91dd238cdfb51c37a02af98ba01d3cf27358ff901f71f7ff5e798752334e720bf8108b907a31e9242085c8c915748f2d9391f86dfc4  pointercal
+336b6ac90946ec4b4626e9dcb8f1cce503d0ad6fc164177e53502b580aa509dc31ae2ef4fcb9fb04906576cdd6590f625f127e2c29ec61493e30cb6508fdb68d  screen-workaround.sh
+"

device/archived/device-sony-nicki-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="Sony Xperia M"
+deviceinfo_manufacturer="Sony"
+deviceinfo_codename="sony-nicki-downstream"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="480"
+deviceinfo_screen_height="854"
+deviceinfo_dev_touchscreen="/dev/input/event1"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="panic=3 console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_offset_base="0x80200000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"

device/archived/linux-sony-nicki-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_nicki_defconfig
 
-pkgname=linux-sony-nicki
+pkgname=linux-sony-nicki-downstream
 pkgver=3.4.0
-pkgrel=7
+pkgrel=0
 pkgdesc="Sony Xperia M kernel fork"
 arch="armv7"
 _carch="arm"
@@ -48,7 +49,7 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="cb1132c1add4c87490889ca20924f92bc89d646b2efefe023802c22e0167a2cfd39fdcbf7316f957ba4c93fe7318079df8dea5657aac92710ddcd45bfa7977f8  linux-sony-nicki-627687e4625d208248fe5fa40dcaaeb3363dfce7.tar.gz
+sha512sums="cb1132c1add4c87490889ca20924f92bc89d646b2efefe023802c22e0167a2cfd39fdcbf7316f957ba4c93fe7318079df8dea5657aac92710ddcd45bfa7977f8  linux-sony-nicki-downstream-627687e4625d208248fe5fa40dcaaeb3363dfce7.tar.gz
 ce8abe52e69eeb36f4755f0944cd20cf27f90dc83cf32a425d0d6d7fc4f2f2fa7c5f73bc2fb57a8f7373a4bb67ae1780919c44cef33cc2f83bc03c530571151b  config-sony-nicki.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd  01_fix_video_argb_setting.patch

device/testing/device-sony-nicki/APKBUILD

@@ -1,52 +1,28 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-nicki
 pkgdesc="Sony Xperia M"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg mdss-fb-init-hack msm-fb-refresher"
+depends="
+	linux-sony-nicki-mainline
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
-source="deviceinfo 90-android-touch-dev.rules screen-workaround.sh fb.modes pointercal"
-subpackages="
-		$pkgname-kernel-downstream:kernel_downstream
-		$pkgname-kernel-mainline:kernel_mainline
-"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="LineageOS downstream kernel (recommended)"
-	depends="linux-sony-nicki postmarketos-base-downstream-disable-udev-v4l"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline; do not use - only for development!"
-	depends="linux-sony-nicki-mainline"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-	install -D -m644 "$srcdir"/screen-workaround.sh \
-		"$pkgdir"/etc/profile.d/screen-workaround.sh
-	install -D -m644 "$srcdir"/fb.modes \
-		"$pkgdir"/etc/fb.modes
-	install -D -m644 "$srcdir"/pointercal \
-		"$pkgdir"/etc/pointercal
 }
 
 sha512sums="
-bc6ac56742c5ecbf9966667d26af95585e2be1d9ac726957a6747064988772c074e67ab23da442ab9f96cc3d56a481d5302c5c3faac30a80dea5c3175d55125b  deviceinfo
-a3d3a0cf43c5f216279666143d6042f2669dbe3dc5ecec2817b6118a0c122f5b927799b37432bee3167359c118d0142fd8e8e8d67374e8ab1d837673f217e1ae  90-android-touch-dev.rules
-336b6ac90946ec4b4626e9dcb8f1cce503d0ad6fc164177e53502b580aa509dc31ae2ef4fcb9fb04906576cdd6590f625f127e2c29ec61493e30cb6508fdb68d  screen-workaround.sh
-aac9a5d4c856b6feaf4f2961251fbc81d9173e24c3b20806e803711b40e388a173abf2651d5d828d36a504ef2de12c1c1eacea1f1b9479e31f55234012140405  fb.modes
-016111b7618e2509186fd91dd238cdfb51c37a02af98ba01d3cf27358ff901f71f7ff5e798752334e720bf8108b907a31e9242085c8c915748f2d9391f86dfc4  pointercal
+bdb0e6aa25713a4987ea302a56b011692fc58165d9413471a3c0f309083f3316a1acb2293a38d898507cb64abfba040d517ed4d855bd6f288a9c7708515930d3  deviceinfo
 "

device/testing/device-sony-nicki/deviceinfo

@@ -7,11 +7,9 @@ deviceinfo_manufacturer="Sony"
 deviceinfo_codename="sony-nicki"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
-
-# Mainline kernel related
-deviceinfo_dtb_mainline="qcom-msm8627-sony-xperia-nicki"
-deviceinfo_append_dtb_mainline="true"
-deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200,n8"
+deviceinfo_dtb="qcom-msm8627-sony-xperia-nicki"
+deviceinfo_append_dtb="true"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8"
 
 # Device related
 deviceinfo_chassis="handset"
@@ -23,7 +21,6 @@ deviceinfo_dev_touchscreen="/dev/input/event1"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline_downstream="panic=3 console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x80200000"