From a2fef82d621dfd779455766d3feecdedb7ce7596 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 10 Mar 2024 14:42:32 +0100 Subject: [PATCH] device-raspberry-pi3: move config.txt stuff to usercfg.txt (MR 4903) Our config.txt is replaced (mv'ed to config.txt.old, maybe by alpine's initramfs-generator?) and so our configuration does not have an effect. Put our config stuff in usercfg.txt instead, which is included by config.txt. Fixes: https://gitlab.com/postmarketOS/pmaports/-/issues/2471 [ci:skip-build]: already built successfully in CI --- device/testing/device-raspberry-pi3/APKBUILD | 10 ++++------ device/testing/device-raspberry-pi3/config.txt | 8 -------- device/testing/device-raspberry-pi3/usercfg.txt | 7 +++++++ 3 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 device/testing/device-raspberry-pi3/config.txt diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD index 539da0a34..3047f8d2d 100644 --- a/device/testing/device-raspberry-pi3/APKBUILD +++ b/device/testing/device-raspberry-pi3/APKBUILD @@ -1,8 +1,8 @@ # Reference: pkgname=device-raspberry-pi3 pkgdesc="Raspberry Pi 3B/3B+" -pkgver=0.3 -pkgrel=1 +pkgver=0.4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -10,7 +10,7 @@ options="!check !archcheck" depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi" makedepends="devicepkg-dev" install="$pkgname.post-install $pkgname.post-upgrade" -source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf" +source="deviceinfo modules-initfs usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf" build() { devicepkg_build $startdir $pkgname @@ -18,7 +18,6 @@ build() { package() { devicepkg_package $startdir $pkgname - install -Dm644 "$srcdir"/config.txt "$pkgdir"/boot/config.txt install -Dm644 "$srcdir"/usercfg.txt "$pkgdir"/boot/usercfg.txt install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt install -Dm644 "$srcdir"/95-vchiq-permissions.rules \ @@ -30,8 +29,7 @@ package() { sha512sums=" dc77ec14629e3821544fd660b4353dd0c104b7320508d71c7f87afc85263b35ae716964cfda114a3db07a9799f03443a6db874411aba1f3b06dd3eaa33d60500 deviceinfo e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319 modules-initfs -ba195d9345fa4f4aee38cbc945b02f5bf13bd7e255124de006b4d04bc78c846c8c6b85268816f8a846d09a680e27d303006be89dd34de353f8cd8384c0fdbda3 config.txt -a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548 usercfg.txt +a1724e0accc2cbba4c24efb0f9bc99d480811b35cefc225c7e4a9015d0f66bb0db83ceee9948d8d96938a2fb7077ddba00abb6be943504b793abc40df6f0aecb usercfg.txt ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2 cmdline.txt 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d 95-vchiq-permissions.rules 0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf diff --git a/device/testing/device-raspberry-pi3/config.txt b/device/testing/device-raspberry-pi3/config.txt deleted file mode 100644 index 25b0936bf..000000000 --- a/device/testing/device-raspberry-pi3/config.txt +++ /dev/null @@ -1,8 +0,0 @@ -boot_delay=0 - -arm_control=0x200 - -kernel=vmlinuz-rpi -initramfs initramfs - -include usercfg.txt diff --git a/device/testing/device-raspberry-pi3/usercfg.txt b/device/testing/device-raspberry-pi3/usercfg.txt index ecc1cbeca..08d0de988 100644 --- a/device/testing/device-raspberry-pi3/usercfg.txt +++ b/device/testing/device-raspberry-pi3/usercfg.txt @@ -1,3 +1,10 @@ +boot_delay=0 + +arm_control=0x200 + +kernel=vmlinuz-rpi +initramfs initramfs + gpu_mem=256 gpu_mem_256=64