From 2c64f4d602ad46def0f04a841f7db58d244d71a5 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 12 May 2025 15:24:33 +0200 Subject: [PATCH] sony-amami: split downstream into separate package (MR 6491) --- .../90-android-touch-dev.rules | 0 .../device-sony-amami-downstream/APKBUILD | 42 +++++++++++++++++ .../device-sony-amami-downstream/deviceinfo | 28 ++++++++++++ .../device-sony-amami-downstream}/fb.modes | 0 .../linux-sony-amami-downstream}/APKBUILD | 7 +-- .../config-sony-amami.armv7 | 0 .../downstream-backport-getrandom.patch | 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-amami/APKBUILD | 45 +++++-------------- device/testing/device-sony-amami/deviceinfo | 6 +-- ...modules-initfs.mainline => modules-initfs} | 0 13 files changed, 87 insertions(+), 41 deletions(-) rename device/{testing/device-sony-amami => archived/device-sony-amami-downstream}/90-android-touch-dev.rules (100%) create mode 100644 device/archived/device-sony-amami-downstream/APKBUILD create mode 100644 device/archived/device-sony-amami-downstream/deviceinfo rename device/{testing/device-sony-amami => archived/device-sony-amami-downstream}/fb.modes (100%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/APKBUILD (91%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/config-sony-amami.armv7 (100%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/downstream-backport-getrandom.patch (100%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{testing/linux-sony-amami => archived/linux-sony-amami-downstream}/gcc8-fix-put-user.patch (100%) rename device/testing/device-sony-amami/{modules-initfs.mainline => modules-initfs} (100%) diff --git a/device/testing/device-sony-amami/90-android-touch-dev.rules b/device/archived/device-sony-amami-downstream/90-android-touch-dev.rules similarity index 100% rename from device/testing/device-sony-amami/90-android-touch-dev.rules rename to device/archived/device-sony-amami-downstream/90-android-touch-dev.rules diff --git a/device/archived/device-sony-amami-downstream/APKBUILD b/device/archived/device-sony-amami-downstream/APKBUILD new file mode 100644 index 000000000..6d1db54c3 --- /dev/null +++ b/device/archived/device-sony-amami-downstream/APKBUILD @@ -0,0 +1,42 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-sony-amami-downstream +pkgver=1 +pkgrel=0 +pkgdesc="Sony Xperia Z1 Compact (Downstream)" +url="https://postmarketos.org" +arch="armv7" +license="MIT" +depends=" + firmware-sony-rhine + linux-sony-amami-downstream + mdss-fb-init-hack + mkbootimg + postmarketos-base +" +makedepends="devicepkg-dev" +source=" + 90-android-touch-dev.rules + deviceinfo + fb.modes + " +options="!check !archcheck" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname + + install -D -m644 "$srcdir"/90-android-touch-dev.rules \ + "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules + install -D -m644 "$srcdir"/fb.modes \ + "$pkgdir"/etc/fb.modes +} + +sha512sums=" +8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e 90-android-touch-dev.rules +1549de4fecd69b2135038301aee469e6263d0497e8b4499d217a825d3d68686742b68f6e1b2c475a75dc711b8a2917e5e5c924ee00aea9950427eec2956422bc deviceinfo +4dc5b6a2d9de6b97e4033b14771b8a6afe922afcd0bc4c97481cfad775726109dd0570058b94b2cd805691343076e7d4d886218787ba883cc31dd1e6e3abb0af fb.modes +" diff --git a/device/archived/device-sony-amami-downstream/deviceinfo b/device/archived/device-sony-amami-downstream/deviceinfo new file mode 100644 index 000000000..8e72892d7 --- /dev/null +++ b/device/archived/device-sony-amami-downstream/deviceinfo @@ -0,0 +1,28 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Sony Xperia Z1 Compact" +deviceinfo_manufacturer="Sony" +deviceinfo_codename="sony-amami-downstream" +deviceinfo_year="2014" +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_dtb_mainline="qcom-msm8974-sony-xperia-rhine-amami" +deviceinfo_append_dtb_mainline="true" +deviceinfo_external_storage="true" +deviceinfo_flash_method="fastboot" +deviceinfo_arch="armv7" +deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1" +deviceinfo_generate_bootimg="true" + +# Splash screen +deviceinfo_screen_width="720" +deviceinfo_screen_height="1280" + +# Fastboot related +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x02000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x01e00000" +deviceinfo_flash_pagesize="2048" diff --git a/device/testing/device-sony-amami/fb.modes b/device/archived/device-sony-amami-downstream/fb.modes similarity index 100% rename from device/testing/device-sony-amami/fb.modes rename to device/archived/device-sony-amami-downstream/fb.modes diff --git a/device/testing/linux-sony-amami/APKBUILD b/device/archived/linux-sony-amami-downstream/APKBUILD similarity index 91% rename from device/testing/linux-sony-amami/APKBUILD rename to device/archived/linux-sony-amami-downstream/APKBUILD index a67a7545f..b743ff363 100644 --- a/device/testing/linux-sony-amami/APKBUILD +++ b/device/archived/linux-sony-amami-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm/configs/aosp_rhine_amami_defconfig -pkgname=linux-sony-amami +pkgname=linux-sony-amami-downstream pkgver=3.10.84 -pkgrel=6 +pkgrel=0 pkgdesc="Sony Xperia Z1 Compact kernel fork" arch="armv7" _carch="arm" @@ -43,7 +44,7 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="fae2299d9d36956be71f40ae724ac0a5069b53d440c114184f82495550c76743e9275e37ad00f6d4a012d32e91a580f424cdb1a1222647c5f2fd678a405a225f linux-sony-amami-2134cafba220b32c43701368413ee333b41b7fe0.tar.gz +sha512sums="fae2299d9d36956be71f40ae724ac0a5069b53d440c114184f82495550c76743e9275e37ad00f6d4a012d32e91a580f424cdb1a1222647c5f2fd678a405a225f linux-sony-amami-downstream-2134cafba220b32c43701368413ee333b41b7fe0.tar.gz 0896618a3bb536dc5f8d9932fe704e8f279000207054039bf8df25e89fb9b2d7d70175cbc4af2ee42982ff7af39fd98c41ec5d79d517a36d9ac3fad5344ce615 config-sony-amami.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch diff --git a/device/testing/linux-sony-amami/config-sony-amami.armv7 b/device/archived/linux-sony-amami-downstream/config-sony-amami.armv7 similarity index 100% rename from device/testing/linux-sony-amami/config-sony-amami.armv7 rename to device/archived/linux-sony-amami-downstream/config-sony-amami.armv7 diff --git a/device/testing/linux-sony-amami/downstream-backport-getrandom.patch b/device/archived/linux-sony-amami-downstream/downstream-backport-getrandom.patch similarity index 100% rename from device/testing/linux-sony-amami/downstream-backport-getrandom.patch rename to device/archived/linux-sony-amami-downstream/downstream-backport-getrandom.patch diff --git a/device/testing/linux-sony-amami/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-sony-amami-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-sony-amami/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-sony-amami-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-sony-amami/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-sony-amami-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/testing/linux-sony-amami/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-sony-amami-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/testing/linux-sony-amami/gcc8-fix-put-user.patch b/device/archived/linux-sony-amami-downstream/gcc8-fix-put-user.patch similarity index 100% rename from device/testing/linux-sony-amami/gcc8-fix-put-user.patch rename to device/archived/linux-sony-amami-downstream/gcc8-fix-put-user.patch diff --git a/device/testing/device-sony-amami/APKBUILD b/device/testing/device-sony-amami/APKBUILD index ca2d9956d..00c5235d9 100644 --- a/device/testing/device-sony-amami/APKBUILD +++ b/device/testing/device-sony-amami/APKBUILD @@ -1,24 +1,23 @@ # Reference: pkgname=device-sony-amami -pkgver=4 -pkgrel=6 +pkgver=5 +pkgrel=0 pkgdesc="Sony Xperia Z1 Compact" url="https://postmarketos.org" arch="armv7" license="MIT" depends=" - mdss-fb-init-hack + firmware-sony-rhine + linux-postmarketos-qcom-msm8974 mkbootimg postmarketos-base soc-qcom-msm8974 " makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware -" -source="deviceinfo modules-initfs.mainline 90-android-touch-dev.rules fb.modes" +source=" + deviceinfo + modules-initfs + " options="!check !archcheck" build() { @@ -27,33 +26,9 @@ build() { package() { devicepkg_package $startdir $pkgname - install -D -m644 "$srcdir"/90-android-touch-dev.rules \ - "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules - install -D -m644 "$srcdir"/fb.modes \ - "$pkgdir"/etc/fb.modes -} - -kernel_downstream() { - pkgdesc="Display and wifi works (see device table for details)" - depends="linux-sony-amami" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline; for kernel development only (most features aren't working)" - depends="linux-postmarketos-qcom-msm8974" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Wifi firmware" - depends="firmware-sony-rhine" - mkdir "$subpkgdir" } sha512sums=" -d99d2f42de98bfde368824bbd0360690505936a2517e06111a7006af0b761bbef98bfcb83c1f849441bb99de627e6333254eb2942079f210c3cd5c4aedfdcb53 deviceinfo -760cc0e57426a534412c113addf8406c43463b3153a8517cc5d97eb9eec57d1e3a4af7f36dfcb1b5ed1d2b0be7d57af7903b5209096a902949f05df79b96dd66 modules-initfs.mainline -8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e 90-android-touch-dev.rules -4dc5b6a2d9de6b97e4033b14771b8a6afe922afcd0bc4c97481cfad775726109dd0570058b94b2cd805691343076e7d4d886218787ba883cc31dd1e6e3abb0af fb.modes +0d0ad4c47c3df4f3398ddf5abf281d50ebe61b2d54a29a6e1caa47afbca810954e32f5be8c65ce07d6c05012a9dee51d7c19148dc7787bc1869f7f153e6d963d deviceinfo +760cc0e57426a534412c113addf8406c43463b3153a8517cc5d97eb9eec57d1e3a4af7f36dfcb1b5ed1d2b0be7d57af7903b5209096a902949f05df79b96dd66 modules-initfs " diff --git a/device/testing/device-sony-amami/deviceinfo b/device/testing/device-sony-amami/deviceinfo index a7584a5b9..31f5ac4e6 100644 --- a/device/testing/device-sony-amami/deviceinfo +++ b/device/testing/device-sony-amami/deviceinfo @@ -8,12 +8,12 @@ deviceinfo_codename="sony-amami" deviceinfo_year="2014" deviceinfo_chassis="handset" deviceinfo_keyboard="false" -deviceinfo_dtb_mainline="qcom-msm8974-sony-xperia-rhine-amami" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom-msm8974-sony-xperia-rhine-amami" +deviceinfo_append_dtb="true" deviceinfo_external_storage="true" deviceinfo_flash_method="fastboot" deviceinfo_arch="armv7" -deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1" +deviceinfo_kernel_cmdline="msm.vram=192m msm.allow_vram_carveout=1" deviceinfo_generate_bootimg="true" # Splash screen diff --git a/device/testing/device-sony-amami/modules-initfs.mainline b/device/testing/device-sony-amami/modules-initfs similarity index 100% rename from device/testing/device-sony-amami/modules-initfs.mainline rename to device/testing/device-sony-amami/modules-initfs