From 9cce6b3788a24b608f58d522b43fea5dd109f6bc Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 May 2025 08:18:07 +0200 Subject: [PATCH] google-crosshatch: split downstream into separate package (MR 6491) --- .../APKBUILD | 29 +++++++++++++++++ .../deviceinfo | 32 +++++++++++++++++++ .../APKBUILD | 7 ++-- ...64-boot-disable-building-DTBO-images.patch | 0 .../cam_sensor_io-fix-in-tree-build.patch | 0 ...add-cam_sensor_utils-to-include-path.patch | 0 .../clk-qcom-mdss-fix-in-tree-build.patch | 0 .../config-google-crosshatch.aarch64 | 0 ...disable-touchscreen-firmware-upgrade.patch | 0 .../thermal-fix-build-error.patch | 0 .../testing/device-google-crosshatch/APKBUILD | 27 +++++----------- .../device-google-crosshatch/deviceinfo | 4 +-- 12 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 device/archived/device-google-crosshatch-downstream/APKBUILD create mode 100644 device/archived/device-google-crosshatch-downstream/deviceinfo rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/APKBUILD (92%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/arm64-boot-disable-building-DTBO-images.patch (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/cam_sensor_io-fix-in-tree-build.patch (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/clk-qcom-mdss-fix-in-tree-build.patch (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/config-google-crosshatch.aarch64 (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/sec_ts-disable-touchscreen-firmware-upgrade.patch (100%) rename device/{testing/linux-google-crosshatch => archived/linux-google-crosshatch-downstream}/thermal-fix-build-error.patch (100%) diff --git a/device/archived/device-google-crosshatch-downstream/APKBUILD b/device/archived/device-google-crosshatch-downstream/APKBUILD new file mode 100644 index 000000000..8b3483951 --- /dev/null +++ b/device/archived/device-google-crosshatch-downstream/APKBUILD @@ -0,0 +1,29 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-google-crosshatch-downstream +pkgdesc="Google Pixel 3 XL (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends=" + linux-google-crosshatch-downstream + mkbootimg + postmarketos-base + " +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +3f0f9410733e7646aec1efb19afd4240139feb19091977bb80d3d98c72747e067557e82475f6697bf324cb87aba543b4a54beb1375e5899055dd1a0f9f664e3e deviceinfo +" diff --git a/device/archived/device-google-crosshatch-downstream/deviceinfo b/device/archived/device-google-crosshatch-downstream/deviceinfo new file mode 100644 index 000000000..5d5bffb5f --- /dev/null +++ b/device/archived/device-google-crosshatch-downstream/deviceinfo @@ -0,0 +1,32 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Google Pixel 3 XL" +deviceinfo_manufacturer="Google" +deviceinfo_codename="google-crosshatch-downstream" +deviceinfo_year="2018" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="false" +deviceinfo_screen_width="1440" +deviceinfo_screen_height="2960" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 printk.devkmsg=on msm_rtb.filter=0x237 ehci-hcd.park=3 service_locator.enable=1 cgroup.memory=nokmem lpm_levels.sleep_disabled=1 usbcore.autosuspend=7 buildvariant=user" +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="4096" +# Pixel 3 XL uses 4096 byte per sector UFS flash, unlike most devices. +# fdisk -l shows "Note: sector size is 4096 (not 512)" +deviceinfo_rootfs_image_sector_size="4096" +# Framebuffer doesn't work yet. For now, avoid waiting for a nonexistent framebuffer. +deviceinfo_no_framebuffer="true" diff --git a/device/testing/linux-google-crosshatch/APKBUILD b/device/archived/linux-google-crosshatch-downstream/APKBUILD similarity index 92% rename from device/testing/linux-google-crosshatch/APKBUILD rename to device/archived/linux-google-crosshatch-downstream/APKBUILD index 3a8ea78af..660872a49 100644 --- a/device/testing/linux-google-crosshatch/APKBUILD +++ b/device/archived/linux-google-crosshatch-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm64/configs/lineageos_crosshatch_defconfig -pkgname=linux-google-crosshatch +pkgname=linux-google-crosshatch-downstream pkgver=4.9.200 -pkgrel=2 +pkgrel=0 pkgdesc="Google Pixel 3 XL kernel fork" arch="aarch64" _carch="arm64" @@ -45,7 +46,7 @@ package() { KERNEL_IMAGE_NAME="Image.lz4-dtb" downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="e63d9c877182952aff07beeb2581dae15ae2316a24deb5bffdc633884a438ae30685d7cdd3302d275443a7d0bcd02b33d0d49461abe56995adf43e5a5636a81e linux-google-crosshatch-d6cae0bddcfc25ce897d43a11a4d3c5d07777831.tar.gz +sha512sums="e63d9c877182952aff07beeb2581dae15ae2316a24deb5bffdc633884a438ae30685d7cdd3302d275443a7d0bcd02b33d0d49461abe56995adf43e5a5636a81e linux-google-crosshatch-downstream-d6cae0bddcfc25ce897d43a11a4d3c5d07777831.tar.gz 169643e6373e20d41428f2e8404fb6d489d33f41a27774d5e37f3f2ee874dc99577e4880b737a8411a1bd20d556f233b3a48ac2b451277256871500fe244f977 config-google-crosshatch.aarch64 720c5856b7d1d8b3cb20f77507818b7fe1b4950d444f7ed20cb02d255987d8860d5ed293e81ea326f147af13004b524886c733123794ac62978fda13689a5189 clk-qcom-mdss-fix-in-tree-build.patch f175233f0cd4e5658937cf50c8535a2b9f1a0d9c7c3fb52aa54096f7733f292e1ab6c2cebadde8479980f27d9b8f7d03f98da3f8166858c8519d91de2a37f1ba arm64-boot-disable-building-DTBO-images.patch diff --git a/device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch b/device/archived/linux-google-crosshatch-downstream/arm64-boot-disable-building-DTBO-images.patch similarity index 100% rename from device/testing/linux-google-crosshatch/arm64-boot-disable-building-DTBO-images.patch rename to device/archived/linux-google-crosshatch-downstream/arm64-boot-disable-building-DTBO-images.patch diff --git a/device/testing/linux-google-crosshatch/cam_sensor_io-fix-in-tree-build.patch b/device/archived/linux-google-crosshatch-downstream/cam_sensor_io-fix-in-tree-build.patch similarity index 100% rename from device/testing/linux-google-crosshatch/cam_sensor_io-fix-in-tree-build.patch rename to device/archived/linux-google-crosshatch-downstream/cam_sensor_io-fix-in-tree-build.patch diff --git a/device/testing/linux-google-crosshatch/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch b/device/archived/linux-google-crosshatch-downstream/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch similarity index 100% rename from device/testing/linux-google-crosshatch/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch rename to device/archived/linux-google-crosshatch-downstream/cam_sensor_module-add-cam_sensor_utils-to-include-path.patch diff --git a/device/testing/linux-google-crosshatch/clk-qcom-mdss-fix-in-tree-build.patch b/device/archived/linux-google-crosshatch-downstream/clk-qcom-mdss-fix-in-tree-build.patch similarity index 100% rename from device/testing/linux-google-crosshatch/clk-qcom-mdss-fix-in-tree-build.patch rename to device/archived/linux-google-crosshatch-downstream/clk-qcom-mdss-fix-in-tree-build.patch diff --git a/device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 b/device/archived/linux-google-crosshatch-downstream/config-google-crosshatch.aarch64 similarity index 100% rename from device/testing/linux-google-crosshatch/config-google-crosshatch.aarch64 rename to device/archived/linux-google-crosshatch-downstream/config-google-crosshatch.aarch64 diff --git a/device/testing/linux-google-crosshatch/sec_ts-disable-touchscreen-firmware-upgrade.patch b/device/archived/linux-google-crosshatch-downstream/sec_ts-disable-touchscreen-firmware-upgrade.patch similarity index 100% rename from device/testing/linux-google-crosshatch/sec_ts-disable-touchscreen-firmware-upgrade.patch rename to device/archived/linux-google-crosshatch-downstream/sec_ts-disable-touchscreen-firmware-upgrade.patch diff --git a/device/testing/linux-google-crosshatch/thermal-fix-build-error.patch b/device/archived/linux-google-crosshatch-downstream/thermal-fix-build-error.patch similarity index 100% rename from device/testing/linux-google-crosshatch/thermal-fix-build-error.patch rename to device/archived/linux-google-crosshatch-downstream/thermal-fix-build-error.patch diff --git a/device/testing/device-google-crosshatch/APKBUILD b/device/testing/device-google-crosshatch/APKBUILD index 181eae8ce..6f5336ded 100644 --- a/device/testing/device-google-crosshatch/APKBUILD +++ b/device/testing/device-google-crosshatch/APKBUILD @@ -1,19 +1,20 @@ # Reference: pkgname=device-google-crosshatch pkgdesc="Google Pixel 3 XL" -pkgver=1 +pkgver=2 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg" +depends=" + firmware-google-crosshatch-mainline-dtbo + linux-google-crosshatch-mainline + mkbootimg + postmarketos-base +" makedepends="devicepkg-dev" source="deviceinfo" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline -" build() { devicepkg_build $startdir $pkgname @@ -23,18 +24,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="LineageOS downstream kernel (recommended)" - depends="linux-google-crosshatch" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline; DO NOT USE: doesn't work (only USB networking is supported)" - depends="linux-google-crosshatch-mainline firmware-google-crosshatch-mainline-dtbo" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - sha512sums=" -2a24ae9840959bf5fc39f15f2a4129690fd193450874193f8c312f4e26ee76b69d62baba1826824c566253288d9af91c79d6744e09f35fbc74cf6fc8bd63803f deviceinfo +1e4c036e5b6303fecfea6cd8ec05e1666c09b5beb1cadf920aae0eacf35e44b3259b78da68522a3afa6da9d56cae19aba5f8caf17107f5a3378c1ba760bab59f deviceinfo " diff --git a/device/testing/device-google-crosshatch/deviceinfo b/device/testing/device-google-crosshatch/deviceinfo index 70264e854..d02a272aa 100644 --- a/device/testing/device-google-crosshatch/deviceinfo +++ b/device/testing/device-google-crosshatch/deviceinfo @@ -6,8 +6,8 @@ deviceinfo_name="Google Pixel 3 XL" deviceinfo_manufacturer="Google" deviceinfo_codename="google-crosshatch" deviceinfo_year="2018" -deviceinfo_dtb_mainline="qcom/sdm845-crosshatch" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom/sdm845-crosshatch" +deviceinfo_append_dtb="true" deviceinfo_arch="aarch64" # Device related