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

main/postmarketos-mkinitfs: allow osk-sdl user overrides (MR 2184)

Browse source
This commit is contained in:
Martijn Braam 2021-05-21 17:29:31 +02:00 committed by Bart Ribbers
parent 36bb254fd6
commit e0136b2abc
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/postmarketos-mkinitfs/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-mkinitfs pkgname=postmarketos-mkinitfs
pkgver=0.24 pkgver=0.25
pkgrel=2 pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS" pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org" url="https://postmarketos.org"
depends=" depends="
@ -16,7 +16,7 @@ depends="
kmod kmod
lddtree lddtree
lz4 lz4
osk-sdl osk-sdl>=0.64
parted parted
xz xz
" "
@ -52,9 +52,11 @@ check() {
/bin/busybox sh ./mkinitfs_test.sh /bin/busybox sh ./mkinitfs_test.sh
} }
sha512sums="4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules sha512sums="
4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules
1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in 1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in
34d7b0b527a75213b0cbd93305cbe7307da6f447ae9066b7627aa78fb6b88a025bbf4d5d0125f9ec8f4aad3a3c7ecdedf8b05cb4b44cd7e41f5ccef6d3c77c4a init_functions.sh 6a36c2a7a3774b18557ae02c97d8e8a251dcdb0e297a2f7343baba2b475b47f369a1eaefecec221706ad2ea93e763e1c383c4b459eb9534d7f9229559027c941 init_functions.sh
4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95 mkinitfs.sh 4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95 mkinitfs.sh
93dfd3516870d388d5d124c162c43a327aa716eeabbc8cbed3378711e9347ef76919c09dac051f833230caff7607008d4c38022cc1d910c7392012e22818e890 mkinitfs_functions.sh 93dfd3516870d388d5d124c162c43a327aa716eeabbc8cbed3378711e9347ef76919c09dac051f833230caff7607008d4c38022cc1d910c7392012e22818e890 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh" c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh
"

3
main/postmarketos-mkinitfs/init_functions.sh
View file

@ -504,7 +504,8 @@ run_osk_sdl() {
;; ;;
esac esac
osk-sdl $OSK_EXTRA_ARGS -n root -d "$partition" -c /etc/osk.conf -v > /osk-sdl.log 2>&1 osk-sdl $OSK_EXTRA_ARGS -n root -d "$partition" -c /etc/osk.conf \
-o /boot/osk.conf -v > /osk-sdl.log 2>&1
} }
start_onscreen_keyboard() { start_onscreen_keyboard() {