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

main/postmarketos-base: adapt to new deviceinfo path (MR 4283)

Browse source 
This greatly simplifies the trigger, since now we can monitor a
directory.

In addition, depend on the latest devicepkg-utils
This commit is contained in:
Pablo Correa Gómez 2023-06-09 19:33:43 +02:00 committed by Oliver Smith
parent 0b8814d156
commit c5d147be99
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/postmarketos-base/APKBUILD
View file

@ -1,13 +1,13 @@
pkgname=postmarketos-base pkgname=postmarketos-base
pkgver=27 pkgver=28
pkgrel=1 pkgrel=0
pkgdesc="Meta package for minimal postmarketOS base" pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="noarch" arch="noarch"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
depends=" depends="
alpine-base alpine-base
devicepkg-utils devicepkg-utils>=0.2.0
eudev eudev
openssh openssh
postmarketos-bootsplash postmarketos-bootsplash
@ -18,7 +18,7 @@ depends="
zram-init zram-init
" "
install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade"
triggers="$pkgname.trigger=/etc" triggers="$pkgname.trigger=/usr/share/deviceinfo"
subpackages=" subpackages="
$pkgname-mesa $pkgname-mesa
$pkgname-nftables $pkgname-nftables

42
main/postmarketos-base/postmarketos-base.trigger
View file

@ -1,38 +1,20 @@
#!/bin/sh -e #!/bin/sh -e
# Each argument to this shell script is a path that caused the trigger to execute. deviceinfo_getty=""
# If /etc/deviceinfo was installed (which should be the case for any device) and
# deviceinfo_getty is set, then configure a getty.
deviceinfo="false" # shellcheck disable=SC1091
. /usr/share/misc/source_deviceinfo
for i in "$@"; do if [ -n "${deviceinfo_getty}" ]; then
case "$i" in port=$(echo "${deviceinfo_getty}" | cut -s -d ";" -f 1)
/etc) baudrate=$(echo "${deviceinfo_getty}" | cut -s -d ";" -f 2)
if [ -f /etc/deviceinfo ]; then
deviceinfo="true"
fi
break ;;
esac
done
if [ "$deviceinfo" = "true" ]; then if [ -n "${port}" ] && [ -n "${baudrate}" ]; then
deviceinfo_getty="" echo "Configuring a getty on port ${port} with baud rate ${baudrate}"
sed -i -e "s/#ttyS0::respawn:\/sbin\/getty -L ttyS0 115200 vt100/${port}::respawn:\/sbin\/getty -L ${port} ${baudrate} vt100/" /etc/inittab
# shellcheck disable=SC1091 else
. /usr/share/misc/source_deviceinfo echo "ERROR: Invalid value for deviceinfo_getty: ${deviceinfo_getty}"
exit 1
if [ -n "${deviceinfo_getty}" ]; then
port=$(echo "${deviceinfo_getty}" | cut -s -d ";" -f 1)
baudrate=$(echo "${deviceinfo_getty}" | cut -s -d ";" -f 2)
if [ -n "${port}" ] && [ -n "${baudrate}" ]; then
echo "Configuring a getty on port ${port} with baud rate ${baudrate}"
sed -i -e "s/#ttyS0::respawn:\/sbin\/getty -L ttyS0 115200 vt100/${port}::respawn:\/sbin\/getty -L ${port} ${baudrate} vt100/" /etc/inittab
else
echo "ERROR: Invalid value for deviceinfo_getty: ${deviceinfo_getty}"
exit 1
fi
fi fi
fi fi