From 7dc99fff94f8100fcceb72e8d11a0e626b69e5a7 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 12 May 2025 15:31:50 +0200 Subject: [PATCH] sony-leo: split downstream into separate package (MR 6491) --- .../device-sony-leo-downstream/APKBUILD | 31 +++++++++++++ .../device-sony-leo-downstream/deviceinfo | 33 +++++++++++++ .../00_fix-video-argb-setting.patch | 0 .../linux-sony-leo-downstream}/APKBUILD | 7 +-- .../config-sony-leo.armv7 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../gcc8-fix-put-user.patch | 0 device/testing/device-sony-leo/APKBUILD | 46 +++++-------------- ...y-leo-nonfree-firmware-openrc.post-upgrade | 1 - ...ll => device-sony-leo-openrc.post-install} | 0 .../device-sony-leo-openrc.post-upgrade | 1 + device/testing/device-sony-leo/deviceinfo | 5 +- 13 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 device/archived/device-sony-leo-downstream/APKBUILD create mode 100644 device/archived/device-sony-leo-downstream/deviceinfo rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/00_fix-video-argb-setting.patch (100%) rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/APKBUILD (91%) rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/config-sony-leo.armv7 (100%) rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{testing/linux-sony-leo => archived/linux-sony-leo-downstream}/gcc8-fix-put-user.patch (100%) delete mode 120000 device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade rename device/testing/device-sony-leo/{device-sony-leo-nonfree-firmware-openrc.post-install => device-sony-leo-openrc.post-install} (100%) create mode 120000 device/testing/device-sony-leo/device-sony-leo-openrc.post-upgrade diff --git a/device/archived/device-sony-leo-downstream/APKBUILD b/device/archived/device-sony-leo-downstream/APKBUILD new file mode 100644 index 000000000..782da652b --- /dev/null +++ b/device/archived/device-sony-leo-downstream/APKBUILD @@ -0,0 +1,31 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +# Maintainer: Luca Weiss +pkgname=device-sony-leo-downstream +pkgdesc="Sony Xperia Z3 (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="armv7" +options="!check !archcheck" +depends=" + linux-sony-leo-downstream + mkbootimg + msm-fb-refresher + postmarketos-base +" +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +b3d33f364f581c8b46e55691f42409a01bae951594b21dfbe796c07fd82dff5ee0ae5f041394825a18e06310f2731a095df6a7c965edc7eb5db1971e1ce211bf deviceinfo +" diff --git a/device/archived/device-sony-leo-downstream/deviceinfo b/device/archived/device-sony-leo-downstream/deviceinfo new file mode 100644 index 000000000..0ee5dd071 --- /dev/null +++ b/device/archived/device-sony-leo-downstream/deviceinfo @@ -0,0 +1,33 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Sony Xperia Z3" +deviceinfo_manufacturer="Sony" +deviceinfo_codename="sony-leo-downstream" +deviceinfo_year="2014" +deviceinfo_arch="armv7" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="1920" + +# Bootloader related +deviceinfo_flash_method="fastboot" + +deviceinfo_generate_bootimg="true" +deviceinfo_generate_extlinux_config="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x02000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x01e00000" +deviceinfo_flash_pagesize="2048" + +# lk2nd does not support GPT for subpartitions/SD cards yet +deviceinfo_partition_type="msdos" diff --git a/device/testing/linux-sony-leo/00_fix-video-argb-setting.patch b/device/archived/linux-sony-leo-downstream/00_fix-video-argb-setting.patch similarity index 100% rename from device/testing/linux-sony-leo/00_fix-video-argb-setting.patch rename to device/archived/linux-sony-leo-downstream/00_fix-video-argb-setting.patch diff --git a/device/testing/linux-sony-leo/APKBUILD b/device/archived/linux-sony-leo-downstream/APKBUILD similarity index 91% rename from device/testing/linux-sony-leo/APKBUILD rename to device/archived/linux-sony-leo-downstream/APKBUILD index 6aef855e4..8bfff0c31 100644 --- a/device/testing/linux-sony-leo/APKBUILD +++ b/device/archived/linux-sony-leo-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Maintainer: Audun MG # Reference: # Kernel config based on: arch/arm/configs/lineageos_shinano_leo_defconfig -pkgname=linux-sony-leo +pkgname=linux-sony-leo-downstream pkgver=3.4.113 -pkgrel=4 +pkgrel=0 pkgdesc="Sony Xperia Z3 LineageOS Kernel" arch="armv7" _carch="arm" @@ -42,7 +43,7 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="baf5e90b83abd8d9630563144faae13c72df50b9d1867325061f78738e0c6a8b5cbd0086f96359cea79f1cd8cd87aab8f8a8149daca6466ae2c08881c6a57447 linux-sony-leo-bd06661fef846ee569888a27f3d12db9cf1d8741.tar.gz +sha512sums="baf5e90b83abd8d9630563144faae13c72df50b9d1867325061f78738e0c6a8b5cbd0086f96359cea79f1cd8cd87aab8f8a8149daca6466ae2c08881c6a57447 linux-sony-leo-downstream-bd06661fef846ee569888a27f3d12db9cf1d8741.tar.gz be6d687d7dcc849a9a52fe2969d9adbb0e27ac219fa2b6174f91163abb8f27de31aeab6e71ab1531e18540fc2a0621b4b6d314997eb905a332aa2a30138a5bf7 config-sony-leo.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch diff --git a/device/testing/linux-sony-leo/config-sony-leo.armv7 b/device/archived/linux-sony-leo-downstream/config-sony-leo.armv7 similarity index 100% rename from device/testing/linux-sony-leo/config-sony-leo.armv7 rename to device/archived/linux-sony-leo-downstream/config-sony-leo.armv7 diff --git a/device/testing/linux-sony-leo/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-sony-leo-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-sony-leo/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-sony-leo-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-sony-leo/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-sony-leo-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/testing/linux-sony-leo/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-sony-leo-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/testing/linux-sony-leo/gcc8-fix-put-user.patch b/device/archived/linux-sony-leo-downstream/gcc8-fix-put-user.patch similarity index 100% rename from device/testing/linux-sony-leo/gcc8-fix-put-user.patch rename to device/archived/linux-sony-leo-downstream/gcc8-fix-put-user.patch diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD index 002118657..d5b38548d 100644 --- a/device/testing/device-sony-leo/APKBUILD +++ b/device/testing/device-sony-leo/APKBUILD @@ -2,25 +2,27 @@ # Maintainer: Luca Weiss pkgname=device-sony-leo pkgdesc="Sony Xperia Z3" -pkgver=3 -pkgrel=1 +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" + firmware-sony-leo-adsp + firmware-sony-leo-modem + firmware-sony-leo-wifi + linux-postmarketos-qcom-msm8974 lk2nd-msm8974 mkbootimg - msm-fb-refresher + msm-modem postmarketos-base soc-qcom-msm8974 + ta-service " makedepends="devicepkg-dev" subpackages=" - $pkgname-kernel-mainline:kernel_mainline - $pkgname-kernel-downstream:kernel_downstream - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc + $pkgname-openrc:openrc " source="deviceinfo" @@ -32,32 +34,8 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Weston and X.Org with touch and wifi works (see device table for details)" - depends="linux-sony-leo" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Kernel close to mainline" - depends="linux-postmarketos-qcom-msm8974" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Wifi/GPU firmware" - depends=" - firmware-sony-leo-adsp - firmware-sony-leo-modem - firmware-sony-leo-wifi - msm-modem - ta-service - " - mkdir "$subpkgdir" -} - -nonfree_firmware_openrc() { - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" openrc @@ -68,5 +46,5 @@ nonfree_firmware_openrc() { } sha512sums=" -fd34804dd7e5e7228085d37e78bba0cc0dbcd7842b6ebffedbb6ae1a955652e3cfdb08665324df0b3d3650f28f3980d90981ece80d00258e53805db6ea36af11 deviceinfo +421a08a5895d7ee3eb2d76218db1672330d1a7c64e3949f1ec1631edf98aac87ffbc847be1c29064e115c0172d6a8ca651d8249a9ee9976fa56b726bf345175f deviceinfo " diff --git a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade b/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade deleted file mode 120000 index ed8988b84..000000000 --- a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -./device-sony-leo-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-install b/device/testing/device-sony-leo/device-sony-leo-openrc.post-install similarity index 100% rename from device/testing/device-sony-leo/device-sony-leo-nonfree-firmware-openrc.post-install rename to device/testing/device-sony-leo/device-sony-leo-openrc.post-install diff --git a/device/testing/device-sony-leo/device-sony-leo-openrc.post-upgrade b/device/testing/device-sony-leo/device-sony-leo-openrc.post-upgrade new file mode 120000 index 000000000..c4b1dc748 --- /dev/null +++ b/device/testing/device-sony-leo/device-sony-leo-openrc.post-upgrade @@ -0,0 +1 @@ +device-sony-leo-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-sony-leo/deviceinfo b/device/testing/device-sony-leo/deviceinfo index 917dc777e..fc83fbd2d 100644 --- a/device/testing/device-sony-leo/deviceinfo +++ b/device/testing/device-sony-leo/deviceinfo @@ -15,9 +15,8 @@ deviceinfo_external_storage="true" deviceinfo_screen_width="1080" deviceinfo_screen_height="1920" -# mainline variables -deviceinfo_dtb_mainline="qcom-msm8974pro-sony-xperia-shinano-leo" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom-msm8974pro-sony-xperia-shinano-leo" +deviceinfo_append_dtb="true" # Bootloader related deviceinfo_flash_method="fastboot"