forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

device-raspberry-pi3: move config.txt stuff to usercfg.txt (MR 4903)

Browse source 
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
This commit is contained in:
Henrik Grimler 2024-03-10 14:42:32 +01:00 committed by Anton Bambura
parent 48a3705dfd
commit a2fef82d62
No known key found for this signature in database
GPG key ID: 1441EAFE8D7F4C2D
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
device/testing/device-raspberry-pi3/APKBUILD
View file

@ -1,8 +1,8 @@
# Reference: <https://postmarketos.org/devicepkg> # Reference: <https://postmarketos.org/devicepkg>
pkgname=device-raspberry-pi3 pkgname=device-raspberry-pi3
pkgdesc="Raspberry Pi 3B/3B+" pkgdesc="Raspberry Pi 3B/3B+"
pkgver=0.3 pkgver=0.4
pkgrel=1 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -10,7 +10,7 @@ options="!check !archcheck"
depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi" depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
makedepends="devicepkg-dev" makedepends="devicepkg-dev"
install="$pkgname.post-install $pkgname.post-upgrade" 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() { build() {
devicepkg_build $startdir $pkgname devicepkg_build $startdir $pkgname
@ -18,7 +18,6 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname 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"/usercfg.txt "$pkgdir"/boot/usercfg.txt
install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt
install -Dm644 "$srcdir"/95-vchiq-permissions.rules \ install -Dm644 "$srcdir"/95-vchiq-permissions.rules \
@ -30,8 +29,7 @@ package() {
sha512sums=" sha512sums="
dc77ec14629e3821544fd660b4353dd0c104b7320508d71c7f87afc85263b35ae716964cfda114a3db07a9799f03443a6db874411aba1f3b06dd3eaa33d60500 deviceinfo dc77ec14629e3821544fd660b4353dd0c104b7320508d71c7f87afc85263b35ae716964cfda114a3db07a9799f03443a6db874411aba1f3b06dd3eaa33d60500 deviceinfo
e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319 modules-initfs e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319 modules-initfs
ba195d9345fa4f4aee38cbc945b02f5bf13bd7e255124de006b4d04bc78c846c8c6b85268816f8a846d09a680e27d303006be89dd34de353f8cd8384c0fdbda3 config.txt a1724e0accc2cbba4c24efb0f9bc99d480811b35cefc225c7e4a9015d0f66bb0db83ceee9948d8d96938a2fb7077ddba00abb6be943504b793abc40df6f0aecb usercfg.txt
a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548 usercfg.txt
ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2 cmdline.txt ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2 cmdline.txt
7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d 95-vchiq-permissions.rules 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d 95-vchiq-permissions.rules
0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf 0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf

8
device/testing/device-raspberry-pi3/config.txt
View file

@ -1,8 +0,0 @@
boot_delay=0
arm_control=0x200
kernel=vmlinuz-rpi
initramfs initramfs
include usercfg.txt

7
device/testing/device-raspberry-pi3/usercfg.txt
View file

@ -1,3 +1,10 @@
boot_delay=0
arm_control=0x200
kernel=vmlinuz-rpi
initramfs initramfs
gpu_mem=256 gpu_mem=256
gpu_mem_256=64 gpu_mem_256=64