device-pine64-pinebookpro: add elogind subpackage (MR 4202)

Move the elogind configuration and post-install call of "loginctl
reload" into an extra subpackage with install_if=elogind.

Fix for:
  Executing device-pine64-pinebookpro-16-r0.post-install
   * service nvme-powersave added to runlevel boot
   * service sysfsconf added to runlevel default
  lib/apk/exec/device-pine64-pinebookpro-16-r0.post-install: line 5: loginctl: not found
  ERROR: device-pine64-pinebookpro-16-r0.post-install: script exited with error 127

Make the post-install scripts more robust while at it, by adding
"exit 0" at the end.
This commit is contained in:
Oliver Smith 2023-06-28 08:27:06 +02:00 committed by Martijn Braam
parent 97e752caaf
commit 2d5a9d7d0a
No known key found for this signature in database
GPG key ID: C4280ACB000B060F
4 changed files with 20 additions and 5 deletions

View file

@ -3,7 +3,7 @@
pkgname=device-pine64-pinebookpro
pkgdesc="PINE64 Pinebook Pro"
pkgver=16
pkgrel=0
pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
@ -18,8 +18,13 @@ depends="
iw
"
makedepends="devicepkg-dev"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
install="$pkgname.post-install $pkgname.post-upgrade"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind"
install="
$pkgname.post-install
$pkgname.post-upgrade
$pkgname-elogind.post-install
$pkgname-elogind.post-upgrade
"
source="
deviceinfo
nvme-powersave.initd
@ -39,9 +44,12 @@ package() {
install -D -m755 "$srcdir"/wlan-powersave-off.start \
"$pkgdir"/etc/local.d/wlan-powersave-off.start
}
elogind() {
install_if="$pkgname=$pkgver-r$pkgrel elogind"
install -D -m644 "$srcdir"/enable-s2idle.conf \
"$pkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
"$subpkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
}
nonfree_firmware() {

View file

@ -0,0 +1,5 @@
#!/bin/sh
loginctl reload
exit 0

View file

@ -0,0 +1 @@
device-pine64-pinebookpro-elogind.post-install

View file

@ -2,4 +2,5 @@
rc-update add nvme-powersave boot
rc-update add sysfsconf default
loginctl reload
exit 0