From 398cba07b7c757086ea8d3fba3aefd7bf8bf17d8 Mon Sep 17 00:00:00 2001 From: Raymond Hackley Date: Sat, 21 Oct 2023 14:03:42 +0000 Subject: [PATCH] samsung-a6plte: drop 30-gpu-firmware.files (MR 4501) msm-firmware-loader path is valid only on booted phones, which won't exist in pmbootstrap chroot, but results in no such file or directory errors. Drop 30-gpu-firmware.files to workaround temporarily. Besides it's preferred to be put in firmware packages. [ci:skip-build]: already built successfully in CI --- device/testing/device-samsung-a6plte/30-gpu-firmware.files | 4 ---- device/testing/device-samsung-a6plte/APKBUILD | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 device/testing/device-samsung-a6plte/30-gpu-firmware.files diff --git a/device/testing/device-samsung-a6plte/30-gpu-firmware.files b/device/testing/device-samsung-a6plte/30-gpu-firmware.files deleted file mode 100644 index cb237ce13..000000000 --- a/device/testing/device-samsung-a6plte/30-gpu-firmware.files +++ /dev/null @@ -1,4 +0,0 @@ -/lib/firmware/msm-firmware-loader/mnt/apnhlos/image/a506_zap.b02 -/lib/firmware/msm-firmware-loader/mnt/apnhlos/image/a506_zap.mdt -/lib/firmware/qcom/a530_pfp.fw -/lib/firmware/qcom/a530_pm4.fw diff --git a/device/testing/device-samsung-a6plte/APKBUILD b/device/testing/device-samsung-a6plte/APKBUILD index 54ca7cd89..3d4cb5864 100644 --- a/device/testing/device-samsung-a6plte/APKBUILD +++ b/device/testing/device-samsung-a6plte/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-a6plte pkgdesc="Samsung Galaxy A6+ (2018)" -pkgver=1.2 +pkgver=1.3 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -18,7 +18,6 @@ depends=" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh" source=" - 30-gpu-firmware.files deviceinfo modules-initfs gpu-nobin.sh @@ -43,9 +42,6 @@ nonfree_firmware() { linux-firmware-qcom msm-firmware-loader" mkdir "$subpkgdir" - - install -Dm644 "$srcdir/30-gpu-firmware.files" -t \ - "$subpkgdir/usr/share/mkinitfs/files" } phosh() { @@ -55,7 +51,6 @@ phosh() { } sha512sums=" -d087fb8b9c1cec66bd6f88680402afed3a642e55014e86a525a8177274cbda768622683108670476cb742cacea7a82a97df94e0469a9126e85d163685aeba421 30-gpu-firmware.files 5cf251bd1e6826235a11648cd761206ba425afb801d6ee9a4529ed519cc79494edfbadac64b81c03785c0a5c70d224c3f997e1921d9a586681834807b680867a deviceinfo 5ab0eec4dc3126b73c1b48846fd43375c22734eeef2573a08fee320f7d688eeade4c48396317d8a6f75a5f31f477ba5485800ca8af2e32571cbb3b428a6eb665 modules-initfs bea40516cf51b4ad0609cc21ca56c19eb9cb2b1be45cddf486264d9c526469f1abad313a95a4f938ccbd0c023d08884aefe8d850746a97075999de11b4a2ff4c gpu-nobin.sh