oneplus-dumpling: move downstream pieces to unmaintained (MR 3336)

It can still be chosen as 'oneplus-dumpling-downstream' in
pmbootstrap init.

device/testing/device-oneplus-dumpling/APKBUILD

+# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
-
 pkgname=device-oneplus-dumpling
 pkgdesc="OnePlus 5T"
 pkgver=2
@@ -19,7 +19,6 @@ source="
 	phoc.ini
 "
 subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -33,12 +32,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-oneplus-msm8998 mesa-dri-gallium msm-fb-refresher"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 kernel_mainline() {
 	pkgdesc="Close to mainline kernel"
 	# NOTE: soc-qcom-sdm845 is also applicable to msm8998
@@ -47,7 +40,7 @@ kernel_mainline() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Firmware for GPU, Wi-Fi, Bluetooth etc. (mainline only, also needed for osk-sdl)"
+	pkgdesc="Firmware for GPU, Wi-Fi, Bluetooth etc. (also needed for full disk encryption)"
 	depends="firmware-oneplus-msm8998"
 	mkdir "$subpkgdir"
 }

device/testing/device-oneplus-dumpling/deviceinfo

@@ -29,8 +29,8 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
-# Downstream kernel options
-deviceinfo_kernel_cmdline_downstream="androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=2048 androidboot.usbconfigfs=true androidboot.usbcontroller=a800000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 ramoops.mem_address=0xac000000 ramoops.mem_size=0x200000 ramoops.console_size=0x40000"
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
 
 # Mainline kernel options
 deviceinfo_dtb_mainline="qcom/msm8998-oneplus-dumpling"
@@ -42,6 +42,3 @@ deviceinfo_flash_kernel_on_update="true"
 # Initramfs
 deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fc1 msm i2c-qup rmi_i2c qcom_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
-
-# Required for devices using UFS as storage (instead of e.g. eMMC)
-deviceinfo_rootfs_image_sector_size="4096"

device/unmaintained/device-oneplus-dumpling-downstream/APKBUILD

+# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-oneplus-dumpling-downstream
+pkgdesc="OnePlus 5T (Downstream)"
+pkgver=3
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-oneplus-msm8998-downstream
+	mesa-dri-gallium
+	msm-fb-refresher
+	mkbootimg
+	postmarketos-base
+	postmarketos-update-kernel
+"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+f323aee4811ed30073b20d06a6b917e7d227d05be746b377b78b95a92742d7d190704eb2cce95f3ff9233169895e66a45b3c91b73c15a5bf12eabaf25e2ebdf6  deviceinfo
+"

device/unmaintained/device-oneplus-dumpling-downstream/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="OnePlus 5T"
+deviceinfo_manufacturer="OnePlus"
+deviceinfo_codename="oneplus-dumpling-downstream"
+deviceinfo_year="2017"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+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="4096"
+deviceinfo_flash_sparse="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
+
+# Kernel options
+deviceinfo_kernel_cmdline="androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=2048 androidboot.usbconfigfs=true androidboot.usbcontroller=a800000.dwc3 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 ramoops.mem_address=0xac000000 ramoops.mem_size=0x200000 ramoops.console_size=0x40000"
+deviceinfo_flash_kernel_on_update="true"