From eb8c07147951a4e33cb7a667520b3ad1793c2d73 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 13 May 2025 16:23:51 +0100 Subject: [PATCH] volla-mimameid: split downstream into separate package (MR 6491) --- .../device-volla-mimameid-downstream/APKBUILD | 31 +++++++++++++++ .../deviceinfo | 38 +++++++++++++++++++ .../linux-volla-mimameid-downstream}/APKBUILD | 7 ++-- .../config-volla-mimameid.aarch64 | 0 ...1965-dtc-remove-prebuilt-dtc_overlay.patch | 0 ...ining-blk_crypto_flock-and-ksm_flock.patch | 0 device/testing/device-volla-mimameid/APKBUILD | 21 ++-------- .../testing/device-volla-mimameid/deviceinfo | 12 ++---- 8 files changed, 79 insertions(+), 30 deletions(-) create mode 100644 device/archived/device-volla-mimameid-downstream/APKBUILD create mode 100644 device/archived/device-volla-mimameid-downstream/deviceinfo rename device/{testing/linux-volla-mimameid => archived/linux-volla-mimameid-downstream}/APKBUILD (91%) rename device/{testing/linux-volla-mimameid => archived/linux-volla-mimameid-downstream}/config-volla-mimameid.aarch64 (100%) rename device/{testing/linux-volla-mimameid => archived/linux-volla-mimameid-downstream}/revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch (100%) rename device/{testing/linux-volla-mimameid => archived/linux-volla-mimameid-downstream}/stop-inlining-blk_crypto_flock-and-ksm_flock.patch (100%) diff --git a/device/archived/device-volla-mimameid-downstream/APKBUILD b/device/archived/device-volla-mimameid-downstream/APKBUILD new file mode 100644 index 000000000..7c03ba683 --- /dev/null +++ b/device/archived/device-volla-mimameid-downstream/APKBUILD @@ -0,0 +1,31 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +# Maintainer: Jami Kettunen +pkgname=device-volla-mimameid-downstream +pkgdesc="Volla Phone 22 (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends=" + linux-volla-mimameid-downstream + mkbootimg + msm-fb-refresher + postmarketos-base +" +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +5cf75782f89ad6c772c080971fdef0b4dec7928b9abb7cf9d6a3eba9d523aee43db1d0e7fa68eaa0d619e228e9805bb6d39e391cbcc639d8fe2ebc3203fc4967 deviceinfo +" diff --git a/device/archived/device-volla-mimameid-downstream/deviceinfo b/device/archived/device-volla-mimameid-downstream/deviceinfo new file mode 100644 index 000000000..becddfd5e --- /dev/null +++ b/device/archived/device-volla-mimameid-downstream/deviceinfo @@ -0,0 +1,38 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. +deviceinfo_format_version="0" +deviceinfo_name="Volla Phone 22" +deviceinfo_manufacturer="Volla" +deviceinfo_codename="volla-mimameid-downstream" +deviceinfo_year="2022" +deviceinfo_arch="aarch64" +deviceinfo_dtb="mediatek/mt6768" +deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="2340" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_pagesize="2048" +deviceinfo_flash_sparse="true" +deviceinfo_flash_fastboot_partition_rootfs="super" +deviceinfo_header_version="2" +deviceinfo_append_dtb="false" +deviceinfo_flash_offset_dtb="0x0bc08000" +deviceinfo_flash_offset_base="0x40078000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x07c08000" +deviceinfo_flash_offset_second="0x00e10000" +deviceinfo_flash_offset_tags="0x0bc08000" + +# NOTE: Flashing kernel on upgrades unsupported due to "dd: error writing +# '/dev/disk/by-partlabel/boot_a': Operation not permitted" +# (the current slot's boot partition appears to be write-protected :/) diff --git a/device/testing/linux-volla-mimameid/APKBUILD b/device/archived/linux-volla-mimameid-downstream/APKBUILD similarity index 91% rename from device/testing/linux-volla-mimameid/APKBUILD rename to device/archived/linux-volla-mimameid-downstream/APKBUILD index 1b8eddf22..08b14cf80 100644 --- a/device/testing/linux-volla-mimameid/APKBUILD +++ b/device/archived/linux-volla-mimameid-downstream/APKBUILD @@ -1,10 +1,11 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm64/configs/gs5_defconfig # Maintainer: Jami Kettunen -pkgname=linux-volla-mimameid +pkgname=linux-volla-mimameid-downstream pkgver=4.14.186 -pkgrel=1 +pkgrel=0 pkgdesc="Volla Phone 22 kernel fork" arch="aarch64" _carch="arm64" @@ -61,7 +62,7 @@ package() { } sha512sums=" -b4af2b94a9f5ea6663ce0a866cb568cbb550ec88ce708ae5ede8cd3d2d8abbb64c7c6f5ebb6a0eec4a37e6d6c3d65a99c34bde07eb39dad906b31d3c4f281d41 linux-volla-mimameid-263d122c614e3c60cef7bfa3d0d2da55cb409d5d.tar.gz +b4af2b94a9f5ea6663ce0a866cb568cbb550ec88ce708ae5ede8cd3d2d8abbb64c7c6f5ebb6a0eec4a37e6d6c3d65a99c34bde07eb39dad906b31d3c4f281d41 linux-volla-mimameid-downstream-263d122c614e3c60cef7bfa3d0d2da55cb409d5d.tar.gz 6c1eac12ec0ab77a8be4de82fbca96341ca5e9c29668db04a52010cddab0807737eb9aea8bc0c3b6454ae904efb391a5cabf7330622d453bc369512027a425bf config-volla-mimameid.aarch64 d3a19d48fe1392cb7d48d5bf21073a32045a3937233435d016129f31b5e43ec220c5481c2c31c6a787efc14f934028de33d8be79bed212d288dd9a40bd6834de revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch e448a1093c09414be36333fbdb0d4a3bc5b59018d571b702c6607cb32927cf1563bf03aa1f2d502e6040490e0b26198dd8204306ebaad41be810ba2d47a2721c stop-inlining-blk_crypto_flock-and-ksm_flock.patch diff --git a/device/testing/linux-volla-mimameid/config-volla-mimameid.aarch64 b/device/archived/linux-volla-mimameid-downstream/config-volla-mimameid.aarch64 similarity index 100% rename from device/testing/linux-volla-mimameid/config-volla-mimameid.aarch64 rename to device/archived/linux-volla-mimameid-downstream/config-volla-mimameid.aarch64 diff --git a/device/testing/linux-volla-mimameid/revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch b/device/archived/linux-volla-mimameid-downstream/revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch similarity index 100% rename from device/testing/linux-volla-mimameid/revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch rename to device/archived/linux-volla-mimameid-downstream/revert-ALPS04791965-dtc-remove-prebuilt-dtc_overlay.patch diff --git a/device/testing/linux-volla-mimameid/stop-inlining-blk_crypto_flock-and-ksm_flock.patch b/device/archived/linux-volla-mimameid-downstream/stop-inlining-blk_crypto_flock-and-ksm_flock.patch similarity index 100% rename from device/testing/linux-volla-mimameid/stop-inlining-blk_crypto_flock-and-ksm_flock.patch rename to device/archived/linux-volla-mimameid-downstream/stop-inlining-blk_crypto_flock-and-ksm_flock.patch diff --git a/device/testing/device-volla-mimameid/APKBUILD b/device/testing/device-volla-mimameid/APKBUILD index 75f3d3f9b..8e4cb32db 100644 --- a/device/testing/device-volla-mimameid/APKBUILD +++ b/device/testing/device-volla-mimameid/APKBUILD @@ -2,22 +2,19 @@ # Maintainer: Jami Kettunen pkgname=device-volla-mimameid pkgdesc="Volla Phone 22" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends=" + linux-postmarketos-mediatek-mt6768 mkbootimg postmarketos-base " makedepends="devicepkg-dev" source="deviceinfo" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline -" build() { devicepkg_build $startdir $pkgname @@ -27,18 +24,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Downstream kernel" - depends="linux-volla-mimameid msm-fb-refresher" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline kernel, heavily work in progress" - depends="linux-postmarketos-mediatek-mt6768" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - sha512sums=" -78f8c0980e9fa4747668b439c75daa490a610517028c28777b421164d87e3f537a37b3545b9f27dbed94856915988ea332cd4eada6bba8127df23c5359af0939 deviceinfo +66bec2896e460bd1ba20d398879c8652af5082b1a14a7c9a03a81920530bd9a498cfa5c2454cfc6b14b4e1b25553688928196f9510518e44ad1968eac1638189 deviceinfo " diff --git a/device/testing/device-volla-mimameid/deviceinfo b/device/testing/device-volla-mimameid/deviceinfo index 5c9e29ed9..7448efa2d 100644 --- a/device/testing/device-volla-mimameid/deviceinfo +++ b/device/testing/device-volla-mimameid/deviceinfo @@ -6,6 +6,9 @@ deviceinfo_manufacturer="Volla" deviceinfo_codename="volla-mimameid" deviceinfo_year="2022" deviceinfo_arch="aarch64" +deviceinfo_dtb="mediatek/mt6769z-volla-mimameid" +deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2" +deviceinfo_flash_fastboot_partition_dtbo="dtbo" # Device related deviceinfo_chassis="handset" @@ -31,15 +34,6 @@ deviceinfo_flash_offset_ramdisk="0x07c08000" deviceinfo_flash_offset_second="0x00e10000" deviceinfo_flash_offset_tags="0x0bc08000" -# Downstream kernel related -deviceinfo_dtb_downstream="mediatek/mt6768" -deviceinfo_kernel_cmdline_downstream="bootopt=64S3,32N2,64N2" - -# Mainline kernel related -deviceinfo_dtb_mainline="mediatek/mt6769z-volla-mimameid" -deviceinfo_kernel_cmdline_mainline="bootopt=64S3,32N2,64N2" -deviceinfo_flash_fastboot_partition_dtbo_mainline="dtbo" - # NOTE: Flashing kernel on upgrades unsupported due to "dd: error writing # '/dev/disk/by-partlabel/boot_a': Operation not permitted" # (the current slot's boot partition appears to be write-protected :/)