From 7b9af8330d48e71e7dff4abba2d26ae488098c19 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 13 May 2025 17:38:10 +0100 Subject: [PATCH] oneplus-kebab: split downstream into separate package (MR 6491) --- .../device-oneplus-kebab-downstream/APKBUILD | 33 ++++++++++++++++ .../deviceinfo | 39 +++++++++++++++++++ .../linux-oneplus-kebab-downstream}/APKBUILD | 7 ++-- .../Fix-dangerous-relocation.patch | 0 .../Fix-touchscreen-driver.patch | 0 .../Remove-dangerous-flags.patch | 0 .../Remove-gcc-python-wrapper.patch | 0 ...emove-inline-from-external-functions.patch | 0 ...s-error-about-static-buffer-overflow.patch | 0 .../config-oneplus-kebab.aarch64 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 device/testing/device-oneplus-kebab/APKBUILD | 28 ++++--------- .../testing/device-oneplus-kebab/deviceinfo | 6 +-- 13 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 device/archived/device-oneplus-kebab-downstream/APKBUILD create mode 100644 device/archived/device-oneplus-kebab-downstream/deviceinfo rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/APKBUILD (95%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Fix-dangerous-relocation.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Fix-touchscreen-driver.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Remove-dangerous-flags.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Remove-gcc-python-wrapper.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Remove-inline-from-external-functions.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/Suppress-error-about-static-buffer-overflow.patch (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/config-oneplus-kebab.aarch64 (100%) rename device/{testing/linux-oneplus-kebab => archived/linux-oneplus-kebab-downstream}/linux4.17-gcc10-extern_YYLOC_global_declaration.patch (100%) diff --git a/device/archived/device-oneplus-kebab-downstream/APKBUILD b/device/archived/device-oneplus-kebab-downstream/APKBUILD new file mode 100644 index 000000000..d2de371ab --- /dev/null +++ b/device/archived/device-oneplus-kebab-downstream/APKBUILD @@ -0,0 +1,33 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-oneplus-kebab-downstream +pkgdesc="OnePlus 8T (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends=" + firmware-oneplus-instantnoodlep + linux-oneplus-kebab-downstream + mkbootimg + postmarketos-base +" +makedepends=" + devicepkg-dev + dtc +" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +cccedb0afe624eb7017bee81728b36d9ce48dde98366c9fcad806cb6e9004934c0f406fbad11b8b8c0daf93079977d3c5bb9c11b120a092d44bed5465e8ca638 deviceinfo +" diff --git a/device/archived/device-oneplus-kebab-downstream/deviceinfo b/device/archived/device-oneplus-kebab-downstream/deviceinfo new file mode 100644 index 000000000..8c8396538 --- /dev/null +++ b/device/archived/device-oneplus-kebab-downstream/deviceinfo @@ -0,0 +1,39 @@ +# Reference: +# Please use double quotes only. You can source this file in shell +# scripts. + +deviceinfo_format_version="0" +deviceinfo_name="OnePlus 8T" +deviceinfo_manufacturer="OnePlus" +deviceinfo_codename="oneplus-kebab-downstream" +deviceinfo_year="2020" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="false" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="2400" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="androidboot.console=ttyMSM0 androidboot.hardware=qcom androidboot.memcg=1 androidboot.usbcontroller=a600000.dwc3 cgroup.memory=nokmem,nosocket loop.max_part=7 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x237 reboot=panic_warm service_locator.enable=1 swiotlb=2048 buildvariant=userdebug printk.devkmsg=on" +deviceinfo_header_version="0" +deviceinfo_append_dtb="false" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_pagesize="4096" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_dtb="0x01f00000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00000000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_fastboot_partition_rootfs="super" +deviceinfo_flash_fastboot_partition_dtbo="dtbo" + +deviceinfo_super_partitions="/dev/sda14 /dev/sda14" +deviceinfo_rootfs_image_sector_size="4096" +deviceinfo_flash_sparse="true" diff --git a/device/testing/linux-oneplus-kebab/APKBUILD b/device/archived/linux-oneplus-kebab-downstream/APKBUILD similarity index 95% rename from device/testing/linux-oneplus-kebab/APKBUILD rename to device/archived/linux-oneplus-kebab-downstream/APKBUILD index 7f2244626..24330b4e9 100644 --- a/device/testing/linux-oneplus-kebab/APKBUILD +++ b/device/archived/linux-oneplus-kebab-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: extracted from LineageOS. a similar (working) config can be found at arch/arm64/configs/vendor/kona-perf_defconfig -pkgname=linux-oneplus-kebab +pkgname=linux-oneplus-kebab-downstream pkgver=4.19.110 -pkgrel=5 +pkgrel=0 pkgdesc="OnePlus 8T kernel fork" arch="aarch64" _carch="arm64" @@ -85,7 +86,7 @@ package() { } sha512sums=" -146dc2c324e3985a3347419e624db61aec26e121729c768fbabea56852153cf9d81eb4f070524631e78ea5f8987cd52fd9f356e777f3a557bc91008cab11013c linux-oneplus-kebab-0c1bed1067131a0bd3e56c1cbdd3473606c5a48a.tar.gz +146dc2c324e3985a3347419e624db61aec26e121729c768fbabea56852153cf9d81eb4f070524631e78ea5f8987cd52fd9f356e777f3a557bc91008cab11013c linux-oneplus-kebab-downstream-0c1bed1067131a0bd3e56c1cbdd3473606c5a48a.tar.gz 762886bef26e96de73e4a2287d4085006b79ef1dbc930107b8444f49ad0b6a91d6a380c9e002606cfe9b42d26f4244c31904e61ec4e7498d6619ac06481f80cc config-oneplus-kebab.aarch64 27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf linux4.17-gcc10-extern_YYLOC_global_declaration.patch 359f619b7aac5bab061311f0806018ed04ce96a2233584a507b14c50ce616dfbc1681dd465ca3f0182165a6fc6c7b87435615bd1bd93efe174b95deba071f5fc Remove-gcc-python-wrapper.patch diff --git a/device/testing/linux-oneplus-kebab/Fix-dangerous-relocation.patch b/device/archived/linux-oneplus-kebab-downstream/Fix-dangerous-relocation.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Fix-dangerous-relocation.patch rename to device/archived/linux-oneplus-kebab-downstream/Fix-dangerous-relocation.patch diff --git a/device/testing/linux-oneplus-kebab/Fix-touchscreen-driver.patch b/device/archived/linux-oneplus-kebab-downstream/Fix-touchscreen-driver.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Fix-touchscreen-driver.patch rename to device/archived/linux-oneplus-kebab-downstream/Fix-touchscreen-driver.patch diff --git a/device/testing/linux-oneplus-kebab/Remove-dangerous-flags.patch b/device/archived/linux-oneplus-kebab-downstream/Remove-dangerous-flags.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Remove-dangerous-flags.patch rename to device/archived/linux-oneplus-kebab-downstream/Remove-dangerous-flags.patch diff --git a/device/testing/linux-oneplus-kebab/Remove-gcc-python-wrapper.patch b/device/archived/linux-oneplus-kebab-downstream/Remove-gcc-python-wrapper.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Remove-gcc-python-wrapper.patch rename to device/archived/linux-oneplus-kebab-downstream/Remove-gcc-python-wrapper.patch diff --git a/device/testing/linux-oneplus-kebab/Remove-inline-from-external-functions.patch b/device/archived/linux-oneplus-kebab-downstream/Remove-inline-from-external-functions.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Remove-inline-from-external-functions.patch rename to device/archived/linux-oneplus-kebab-downstream/Remove-inline-from-external-functions.patch diff --git a/device/testing/linux-oneplus-kebab/Suppress-error-about-static-buffer-overflow.patch b/device/archived/linux-oneplus-kebab-downstream/Suppress-error-about-static-buffer-overflow.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/Suppress-error-about-static-buffer-overflow.patch rename to device/archived/linux-oneplus-kebab-downstream/Suppress-error-about-static-buffer-overflow.patch diff --git a/device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 b/device/archived/linux-oneplus-kebab-downstream/config-oneplus-kebab.aarch64 similarity index 100% rename from device/testing/linux-oneplus-kebab/config-oneplus-kebab.aarch64 rename to device/archived/linux-oneplus-kebab-downstream/config-oneplus-kebab.aarch64 diff --git a/device/testing/linux-oneplus-kebab/linux4.17-gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-oneplus-kebab-downstream/linux4.17-gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-oneplus-kebab/linux4.17-gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-oneplus-kebab-downstream/linux4.17-gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/device-oneplus-kebab/APKBUILD b/device/testing/device-oneplus-kebab/APKBUILD index eb3992692..184085f4c 100644 --- a/device/testing/device-oneplus-kebab/APKBUILD +++ b/device/testing/device-oneplus-kebab/APKBUILD @@ -1,25 +1,22 @@ # Reference: pkgname=device-oneplus-kebab pkgdesc="OnePlus 8T" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + firmware-oneplus-instantnoodlep + linux-postmarketos-qcom-sm8250 mkbootimg postmarketos-base - firmware-oneplus-instantnoodlep " makedepends=" devicepkg-dev dtc " -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline -" source=" deviceinfo sm8250-oneplus-kebab-empty.dts @@ -27,28 +24,17 @@ source=" build() { devicepkg_build $startdir $pkgname + + dtc -O dtb -o "$srcdir/dtbo.img" -I dts "$srcdir/sm8250-oneplus-kebab-empty.dts" } package() { devicepkg_package $startdir $pkgname -} -kernel_downstream() { - pkgdesc="Downstream kernel (not recommended, for debugging purposes)" - depends="linux-oneplus-kebab" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Mainline kernel (recommended)" - depends="linux-postmarketos-qcom-sm8250" - - dtc -O dtb -o "$srcdir/dtbo.img" -I dts "$srcdir/sm8250-oneplus-kebab-empty.dts" - install -Dm644 "$srcdir/dtbo.img" "$subpkgdir/boot/dtbo.img" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname + install -Dm644 "$srcdir/dtbo.img" "$pkgdir/boot/dtbo.img" } sha512sums=" -91ae30a82942c0e73ba19b90f27cb8dc95eb3f6b6c79f8314ded9e1ba5d4b10a2c6c3b63cba3fd5a0da518fb9a536fca1650eb0bba5f6c2e7f80136abad8de76 deviceinfo +a7faf9a2e7865515833fdcadc21d0e19d1d67273e9692509434b55b9dbd49e315eb967e872911d7d64c11aadb8134df3b6c7fe962352c3c5f76e1f618339299c deviceinfo fa4866865dd9e6388b7ee2319954d2317245c5618a0ebd9250abae7d58e08aa4a248a6dd9a87a820b30615b8f9f6e5f66b6883a47f7f0d3d69bfffe3440f33b2 sm8250-oneplus-kebab-empty.dts " diff --git a/device/testing/device-oneplus-kebab/deviceinfo b/device/testing/device-oneplus-kebab/deviceinfo index fdd5cc5c8..79f5fb1ce 100644 --- a/device/testing/device-oneplus-kebab/deviceinfo +++ b/device/testing/device-oneplus-kebab/deviceinfo @@ -18,11 +18,9 @@ deviceinfo_screen_height="2400" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="androidboot.console=ttyMSM0 androidboot.hardware=qcom androidboot.memcg=1 androidboot.usbcontroller=a600000.dwc3 cgroup.memory=nokmem,nosocket loop.max_part=7 lpm_levels.sleep_disabled=1 msm_rtb.filter=0x237 reboot=panic_warm service_locator.enable=1 swiotlb=2048 buildvariant=userdebug printk.devkmsg=on" -deviceinfo_header_version_downstream="0" -deviceinfo_header_version_mainline="2" +deviceinfo_header_version="2" deviceinfo_append_dtb="false" -deviceinfo_dtb_mainline="qcom/sm8250-oneplus-kebab" +deviceinfo_dtb="qcom/sm8250-oneplus-kebab" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false"