main/postmarketos-base: adapt to new deviceinfo path (MR 4283)
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:
parent
0b8814d156
commit
c5d147be99
@ -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
|
||||||
|
@ -1,22 +1,5 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
|
|
||||||
# Each argument to this shell script is a path that caused the trigger to execute.
|
|
||||||
# If /etc/deviceinfo was installed (which should be the case for any device) and
|
|
||||||
# deviceinfo_getty is set, then configure a getty.
|
|
||||||
|
|
||||||
deviceinfo="false"
|
|
||||||
|
|
||||||
for i in "$@"; do
|
|
||||||
case "$i" in
|
|
||||||
/etc)
|
|
||||||
if [ -f /etc/deviceinfo ]; then
|
|
||||||
deviceinfo="true"
|
|
||||||
fi
|
|
||||||
break ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "$deviceinfo" = "true" ]; then
|
|
||||||
deviceinfo_getty=""
|
deviceinfo_getty=""
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
@ -34,7 +17,6 @@ if [ "$deviceinfo" = "true" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
sync
|
sync
|
||||||
exit 0
|
exit 0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user