From 8fed9fc30a4f5eeb6c5d75db06d77329b08c4083 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 May 2025 08:11:33 +0200 Subject: [PATCH] fairphone-fp2: split downstream into separate package (MR 6491) --- .../device-fairphone-fp2-downstream/APKBUILD | 48 ++++++++++++ .../device-fairphone-fp2-downstream}/FP2.conf | 0 .../deviceinfo | 33 ++++++++ .../device-fairphone-fp2-downstream}/hifi | 0 .../0001-fix-video-argb-setting.patch | 0 .../0003-Fix-includes.patch | 0 .../0004-msm-fix-trace.patch | 0 .../linux-fairphone-fp2-downstream}/APKBUILD | 7 +- .../config-fairphone-fp2.armv7 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 ...give-up-on-ilog2-const-optimizations.patch | 0 .../gcc8-fix-put-user.patch | 0 ...el-use-the-gnu89-standard-explicitly.patch | 0 ...ce-Sun-Solaris-style-flag-on-section.patch | 0 ...-ptrace-defect-cause-by-a-merge-fail.patch | 0 ...Fix-proc-tid-fdinfo-fd-file-handling.patch | 0 .../30-gpu-firmware.files | 2 - device/testing/device-fairphone-fp2/APKBUILD | 75 ++++--------------- .../testing/device-fairphone-fp2/deviceinfo | 13 ++-- ...modules-initfs.mainline => modules-initfs} | 0 20 files changed, 103 insertions(+), 75 deletions(-) create mode 100644 device/archived/device-fairphone-fp2-downstream/APKBUILD rename device/{testing/device-fairphone-fp2 => archived/device-fairphone-fp2-downstream}/FP2.conf (100%) create mode 100644 device/archived/device-fairphone-fp2-downstream/deviceinfo rename device/{testing/device-fairphone-fp2 => archived/device-fairphone-fp2-downstream}/hifi (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/0001-fix-video-argb-setting.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/0003-Fix-includes.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/0004-msm-fix-trace.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/APKBUILD (95%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/config-fairphone-fp2.armv7 (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/gcc7-give-up-on-ilog2-const-optimizations.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/gcc8-fix-put-user.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/kernel-use-the-gnu89-standard-explicitly.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch (100%) rename device/{testing/linux-fairphone-fp2 => archived/linux-fairphone-fp2-downstream}/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch (100%) delete mode 100644 device/testing/device-fairphone-fp2/30-gpu-firmware.files rename device/testing/device-fairphone-fp2/{modules-initfs.mainline => modules-initfs} (100%) diff --git a/device/archived/device-fairphone-fp2-downstream/APKBUILD b/device/archived/device-fairphone-fp2-downstream/APKBUILD new file mode 100644 index 000000000..dfad54139 --- /dev/null +++ b/device/archived/device-fairphone-fp2-downstream/APKBUILD @@ -0,0 +1,48 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +# Maintainer: Luca Weiss +pkgname=device-fairphone-fp2-downstream +pkgdesc="Fairphone 2 (Downstream)" +pkgver=1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="armv7" +options="!check !archcheck" +depends=" + adsp-audio + firmware-fairphone-fp2-adsp + firmware-fairphone-fp2-modem + firmware-fairphone-fp2-wcnss + linux-fairphone-fp2-downstream + lk2nd-msm8974 + mkbootimg + msm-modem-downstream + postmarketos-base + soc-qcom-msm8974 + wcnss-wlan + " +makedepends="devicepkg-dev" +source=" + deviceinfo + FP2.conf + hifi +" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname + + mkdir -p "$pkgdir"/usr/share/alsa/ucm/FP2 + install -Dm644 "$srcdir"/FP2.conf "$pkgdir"/usr/share/alsa/ucm/FP2/ + install -Dm644 "$srcdir"/hifi "$pkgdir"/usr/share/alsa/ucm/FP2/ +} + +sha512sums=" +4607ef7ae4ec302a4ac231fc13e230b976b649506d7bdfd642a5f60f6a4ee5510b7cfdacbaa1ba1c51cc0b2a272d6811e6e23e95fbc4ceba24bc1907a75f24fd deviceinfo +55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f FP2.conf +b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1 hifi +" diff --git a/device/testing/device-fairphone-fp2/FP2.conf b/device/archived/device-fairphone-fp2-downstream/FP2.conf similarity index 100% rename from device/testing/device-fairphone-fp2/FP2.conf rename to device/archived/device-fairphone-fp2-downstream/FP2.conf diff --git a/device/archived/device-fairphone-fp2-downstream/deviceinfo b/device/archived/device-fairphone-fp2-downstream/deviceinfo new file mode 100644 index 000000000..51f379367 --- /dev/null +++ b/device/archived/device-fairphone-fp2-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="Fairphone 2" +deviceinfo_manufacturer="Fairphone" +deviceinfo_codename="fairphone-fp2-downstream" +deviceinfo_year="2015" +deviceinfo_arch="armv7" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="1920" +deviceinfo_getty="ttyHSL0;115200" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1" +deviceinfo_generate_bootimg="true" +deviceinfo_generate_extlinux_config="true" +deviceinfo_bootimg_qcdt="true" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x02000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="2048" + +# lk2nd does not support GPT for subpartitions/SD cards yet +deviceinfo_partition_type="msdos" diff --git a/device/testing/device-fairphone-fp2/hifi b/device/archived/device-fairphone-fp2-downstream/hifi similarity index 100% rename from device/testing/device-fairphone-fp2/hifi rename to device/archived/device-fairphone-fp2-downstream/hifi diff --git a/device/testing/linux-fairphone-fp2/0001-fix-video-argb-setting.patch b/device/archived/linux-fairphone-fp2-downstream/0001-fix-video-argb-setting.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/0001-fix-video-argb-setting.patch rename to device/archived/linux-fairphone-fp2-downstream/0001-fix-video-argb-setting.patch diff --git a/device/testing/linux-fairphone-fp2/0003-Fix-includes.patch b/device/archived/linux-fairphone-fp2-downstream/0003-Fix-includes.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/0003-Fix-includes.patch rename to device/archived/linux-fairphone-fp2-downstream/0003-Fix-includes.patch diff --git a/device/testing/linux-fairphone-fp2/0004-msm-fix-trace.patch b/device/archived/linux-fairphone-fp2-downstream/0004-msm-fix-trace.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/0004-msm-fix-trace.patch rename to device/archived/linux-fairphone-fp2-downstream/0004-msm-fix-trace.patch diff --git a/device/testing/linux-fairphone-fp2/APKBUILD b/device/archived/linux-fairphone-fp2-downstream/APKBUILD similarity index 95% rename from device/testing/linux-fairphone-fp2/APKBUILD rename to device/archived/linux-fairphone-fp2-downstream/APKBUILD index c6bdd195b..b02ad4d90 100644 --- a/device/testing/linux-fairphone-fp2/APKBUILD +++ b/device/archived/linux-fairphone-fp2-downstream/APKBUILD @@ -1,10 +1,11 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Maintainer: Luca Weiss # Kernel config based on: arch/arm/configs/lineageos_FP2_defconfig -pkgname=linux-fairphone-fp2 +pkgname=linux-fairphone-fp2-downstream pkgver=3.4.0 -pkgrel=14 +pkgrel=0 pkgdesc="Fairphone 2 kernel fork" arch="armv7" _carch="arm" @@ -64,7 +65,7 @@ package() { } sha512sums=" -6b440c5d087b790894606d4736af815204d9e6f682b7c1ba78f5852fa7aecd74cb276f4953d270f14c96d5418f4e2a83c5179c54d50e2e5afc9084f83ab54200 linux-fairphone-fp2-284400aea4b9f8a3c97a34408f48d0971897ae02.tar.gz +6b440c5d087b790894606d4736af815204d9e6f682b7c1ba78f5852fa7aecd74cb276f4953d270f14c96d5418f4e2a83c5179c54d50e2e5afc9084f83ab54200 linux-fairphone-fp2-downstream-284400aea4b9f8a3c97a34408f48d0971897ae02.tar.gz a19a14847492ea383ddffa01f1b8344ca8084ad610b4290e24e5074619295bc5473db186f724211a35a7f0f445a2d0b35e730e7953a3b3ad2f4f70893f07139d config-fairphone-fp2.armv7 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch diff --git a/device/testing/linux-fairphone-fp2/config-fairphone-fp2.armv7 b/device/archived/linux-fairphone-fp2-downstream/config-fairphone-fp2.armv7 similarity index 100% rename from device/testing/linux-fairphone-fp2/config-fairphone-fp2.armv7 rename to device/archived/linux-fairphone-fp2-downstream/config-fairphone-fp2.armv7 diff --git a/device/testing/linux-fairphone-fp2/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-fairphone-fp2-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-fairphone-fp2-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-fairphone-fp2/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-fairphone-fp2-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/gcc7-give-up-on-ilog2-const-optimizations.patch rename to device/archived/linux-fairphone-fp2-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch diff --git a/device/testing/linux-fairphone-fp2/gcc8-fix-put-user.patch b/device/archived/linux-fairphone-fp2-downstream/gcc8-fix-put-user.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/gcc8-fix-put-user.patch rename to device/archived/linux-fairphone-fp2-downstream/gcc8-fix-put-user.patch diff --git a/device/testing/linux-fairphone-fp2/kernel-use-the-gnu89-standard-explicitly.patch b/device/archived/linux-fairphone-fp2-downstream/kernel-use-the-gnu89-standard-explicitly.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/kernel-use-the-gnu89-standard-explicitly.patch rename to device/archived/linux-fairphone-fp2-downstream/kernel-use-the-gnu89-standard-explicitly.patch diff --git a/device/testing/linux-fairphone-fp2/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-fairphone-fp2-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch rename to device/archived/linux-fairphone-fp2-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/device/testing/linux-fairphone-fp2/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch b/device/archived/linux-fairphone-fp2-downstream/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch rename to device/archived/linux-fairphone-fp2-downstream/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch diff --git a/device/testing/linux-fairphone-fp2/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch b/device/archived/linux-fairphone-fp2-downstream/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch similarity index 100% rename from device/testing/linux-fairphone-fp2/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch rename to device/archived/linux-fairphone-fp2-downstream/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch diff --git a/device/testing/device-fairphone-fp2/30-gpu-firmware.files b/device/testing/device-fairphone-fp2/30-gpu-firmware.files deleted file mode 100644 index 7c2f06dcd..000000000 --- a/device/testing/device-fairphone-fp2/30-gpu-firmware.files +++ /dev/null @@ -1,2 +0,0 @@ -/lib/firmware/qcom/a330_pfp.fw -/lib/firmware/qcom/a330_pm4.fw diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD index 39bb9b24f..808e9e00c 100644 --- a/device/testing/device-fairphone-fp2/APKBUILD +++ b/device/testing/device-fairphone-fp2/APKBUILD @@ -2,36 +2,33 @@ # Maintainer: Luca Weiss pkgname=device-fairphone-fp2 pkgdesc="Fairphone 2" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends=" + firmware-fairphone-fp2-adsp + firmware-fairphone-fp2-modem + firmware-fairphone-fp2-wcnss + firmware-qcom-adreno-a330 + linux-postmarketos-qcom-msm8974 lk2nd-msm8974 + mesa-egl mkbootimg + msm-modem + msm-modem-uim-selection postmarketos-base soc-qcom-msm8974 " makedepends="devicepkg-dev" source=" deviceinfo - modules-initfs.mainline - FP2.conf - hifi + modules-initfs phoc.ini - 30-gpu-firmware.files -" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-downstream-firmware:downstream_firmware - $pkgname-mainline-firmware:mainline_firmware - $pkgname-alsa - $pkgname-phosh " +subpackages="$pkgname-phosh" build() { devicepkg_build $startdir $pkgname @@ -41,49 +38,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Downstream kernel" - depends="linux-fairphone-fp2" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline kernel" - depends="linux-postmarketos-qcom-msm8974 mesa-egl" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="Firmware for WiFi, Audio, etc." - depends="firmware-fairphone-fp2-adsp firmware-fairphone-fp2-modem firmware-fairphone-fp2-wcnss" - mkdir "$subpkgdir" -} - -downstream_firmware() { - pkgdesc="Firmware support packages for downstream kernel" - depends="$pkgname-alsa adsp-audio msm-modem-downstream wcnss-wlan" - install_if="$pkgname-kernel-downstream $pkgname-nonfree-firmware" - mkdir "$subpkgdir" -} - -mainline_firmware() { - pkgdesc="Firmware support packages for mainline kernel" - depends="msm-modem msm-modem-uim-selection firmware-qcom-adreno-a330" - install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware" - mkdir "$subpkgdir" - - install -Dm644 "$srcdir/30-gpu-firmware.files" \ - "$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files" -} - -alsa() { - pkgdesc="Audio configuration files" - - mkdir -p "$subpkgdir"/usr/share/alsa/ucm/FP2 - install -Dm644 "$srcdir"/FP2.conf "$subpkgdir"/usr/share/alsa/ucm/FP2/ - install -Dm644 "$srcdir"/hifi "$subpkgdir"/usr/share/alsa/ucm/FP2/ -} - phosh() { install_if="$pkgname postmarketos-ui-phosh" install -Dm644 "$srcdir"/phoc.ini \ @@ -91,10 +45,7 @@ phosh() { } sha512sums=" -2fd9f84b2ac67774c276af13d47bf79ba2eed5d636742d4af030922cd02334dad96cee2ab0a8a3510176de6227b755e0893b804b8965412f7902875539782233 deviceinfo -1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910 modules-initfs.mainline -55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f FP2.conf -b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1 hifi +2301e2c8b66fda1d4262bd221dbd812112ffd92a31b7f5289292958981ae214e99dcce0d4e591fa7cb4fd0cbe7f560cf876dc49dd90346d1cc0419a96cefdbf5 deviceinfo +1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910 modules-initfs cef2fd633cddbcf4ac9b4d2fa6bf3a1e3e8d810a2ea8050767fe649d289db753662821d5e41e2c8d20fb9c765c1babcb6a4d95e4c9345f5ea32d1b1d2b1e5126 phoc.ini -bbe6d6f530a9fa1934dd065dd4f6da48450e2115e4656b219d7f3aebc8b6a2775c02a2e5ffb5790950bb8183fca4677fbeaf9d8a267089c9f0d08461fc8ed45d 30-gpu-firmware.files " diff --git a/device/testing/device-fairphone-fp2/deviceinfo b/device/testing/device-fairphone-fp2/deviceinfo index 7a943f3d0..2e83a5d72 100644 --- a/device/testing/device-fairphone-fp2/deviceinfo +++ b/device/testing/device-fairphone-fp2/deviceinfo @@ -6,8 +6,8 @@ deviceinfo_name="Fairphone 2" deviceinfo_manufacturer="Fairphone" deviceinfo_codename="fairphone-fp2" deviceinfo_year="2015" -deviceinfo_dtb_mainline="qcom-msm8974pro-fairphone-fp2" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom-msm8974pro-fairphone-fp2" +deviceinfo_append_dtb="true" deviceinfo_arch="armv7" # Device related @@ -16,18 +16,15 @@ deviceinfo_keyboard="false" deviceinfo_external_storage="true" deviceinfo_screen_width="1080" deviceinfo_screen_height="1920" -deviceinfo_getty_downstream="ttyHSL0;115200" -deviceinfo_getty_mainline="ttyMSM0;115200" -deviceinfo_mesa_driver_mainline="msm" +deviceinfo_getty="ttyMSM0;115200" +deviceinfo_mesa_driver="msm" deviceinfo_gpu_accelerated="true" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1" -deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1" +deviceinfo_kernel_cmdline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1" deviceinfo_generate_bootimg="true" deviceinfo_generate_extlinux_config="true" -deviceinfo_bootimg_qcdt_downstream="true" deviceinfo_flash_offset_base="0x00000000" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x02000000" diff --git a/device/testing/device-fairphone-fp2/modules-initfs.mainline b/device/testing/device-fairphone-fp2/modules-initfs similarity index 100% rename from device/testing/device-fairphone-fp2/modules-initfs.mainline rename to device/testing/device-fairphone-fp2/modules-initfs