From e1209e44ff334f6c9257fef569e1790fe4b98c2a Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Tue, 2 Aug 2022 23:20:43 +0300 Subject: [PATCH] oneplus-cheeseburger: move downstream pieces to unmaintained (MR 3336) It can still be chosen as 'oneplus-cheeseburger-downstream' in pmbootstrap init. --- .../device-oneplus-cheeseburger/APKBUILD | 11 ++---- .../device-oneplus-cheeseburger/deviceinfo | 7 ++-- .../APKBUILD | 32 +++++++++++++++++ .../deviceinfo | 36 +++++++++++++++++++ 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 device/unmaintained/device-oneplus-cheeseburger-downstream/APKBUILD create mode 100644 device/unmaintained/device-oneplus-cheeseburger-downstream/deviceinfo diff --git a/device/testing/device-oneplus-cheeseburger/APKBUILD b/device/testing/device-oneplus-cheeseburger/APKBUILD index 167795f20..d268c46e6 100644 --- a/device/testing/device-oneplus-cheeseburger/APKBUILD +++ b/device/testing/device-oneplus-cheeseburger/APKBUILD @@ -1,5 +1,5 @@ +# Maintainer: Jami Kettunen # Reference: - pkgname=device-oneplus-cheeseburger pkgdesc="OnePlus 5" 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" # 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" } diff --git a/device/testing/device-oneplus-cheeseburger/deviceinfo b/device/testing/device-oneplus-cheeseburger/deviceinfo index c7c7fb199..1155e7ef4 100644 --- a/device/testing/device-oneplus-cheeseburger/deviceinfo +++ b/device/testing/device-oneplus-cheeseburger/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-cheeseburger" @@ -42,6 +42,3 @@ deviceinfo_flash_kernel_on_update="true" # Initramfs deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fa5 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" diff --git a/device/unmaintained/device-oneplus-cheeseburger-downstream/APKBUILD b/device/unmaintained/device-oneplus-cheeseburger-downstream/APKBUILD new file mode 100644 index 000000000..d090a3871 --- /dev/null +++ b/device/unmaintained/device-oneplus-cheeseburger-downstream/APKBUILD @@ -0,0 +1,32 @@ +# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)! +# Reference: +pkgname=device-oneplus-cheeseburger-downstream +pkgdesc="OnePlus 5 (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=" +50702473149b77ac5a7e2c164218b2544a77814ad6faad1607c9a107bb0d92d3b78249d86cb6eff86faaba723a70553a0f1a2344a4a6645d885799f6e1759305 deviceinfo +" diff --git a/device/unmaintained/device-oneplus-cheeseburger-downstream/deviceinfo b/device/unmaintained/device-oneplus-cheeseburger-downstream/deviceinfo new file mode 100644 index 000000000..16e56950c --- /dev/null +++ b/device/unmaintained/device-oneplus-cheeseburger-downstream/deviceinfo @@ -0,0 +1,36 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="OnePlus 5" +deviceinfo_manufacturer="OnePlus" +deviceinfo_codename="oneplus-cheeseburger-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="1920" + +# 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"