main/postmarketos-base-ui: configure openrc-settingsd for chronyd (MR 3953)

We need to tell openrc-settingsd which ntp service to use, otherwise
it'll default to busybox ntpd which we don't want.

Additionally make sure openrc-settingsd service gets launched at boot
with the post-install/post-upgrade script.
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Luca Weiss 2023-03-14 20:49:31 +01:00 committed by Pablo Correa Gómez
parent 048a18ad71
commit 99553042ad
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
4 changed files with 20 additions and 2 deletions

View file

@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-base-ui
pkgver=6
pkgrel=3
pkgver=7
pkgrel=0
pkgdesc="Meta package for minimal postmarketOS UI base"
url="https://postmarketos.org"
arch="noarch"
@ -21,6 +21,7 @@ depends="
"
subpackages="
$pkgname-elogind
$pkgname-openrc-settingsd:_openrc_settingsd
$pkgname-tinydm
$pkgname-x11
$pkgname-pulseaudio
@ -39,6 +40,7 @@ replaces_priority=100 # leave plenty for alpine
_source644="
etc/NetworkManager/conf.d/hostname-mode.conf
etc/chrony/chrony.conf
etc/conf.d/openrc-settingsd
etc/conf.d/tinydm
etc/conf.d/wpa_supplicant
etc/elogind/logind.conf
@ -95,6 +97,13 @@ elogind() {
amove etc/sleep-inhibitor.conf
}
_openrc_settingsd() {
install_if="$pkgname=$pkgver-r$pkgrel openrc-settingsd-openrc"
install="$subpkgname.post-install $subpkgname.post-upgrade"
replaces="openrc-settingsd-openrc"
amove etc/conf.d/openrc-settingsd
}
tinydm() {
install_if="$pkgname=$pkgver-r$pkgrel tinydm-openrc"
replaces="tinydm-openrc"
@ -139,6 +148,7 @@ _default_camera() {
sha512sums="
3c9ae7415f4891bee8595166ed6a42cb577a837f741c6b5409d193558626348b41516888a01d0c4895282c5f4e9a1ff838c19712888750b2ef68429bb4b42ee3 rootfs-etc-NetworkManager-conf.d-hostname-mode.conf
e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6 rootfs-etc-chrony-chrony.conf
49fb494b659fe0149a93eafe109609acce6a470bb8acea160638d07e0e4b11af2544f34549d5ef2deb2914a7ef13d0d470b04ad62981f14f96999af02a5f24cf rootfs-etc-conf.d-openrc-settingsd
44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0 rootfs-etc-conf.d-tinydm
fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16 rootfs-etc-conf.d-wpa_supplicant
8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4 rootfs-etc-elogind-logind.conf

View file

@ -0,0 +1,3 @@
#!/bin/sh -e
rc-update -q add openrc-settingsd default

View file

@ -0,0 +1 @@
postmarketos-base-ui-openrc-settingsd.post-install

View file

@ -0,0 +1,4 @@
#
# Extra options you want to pass to openrc-settingsd
#
OPENRC_SETTINGSD_OPTS="--ntp-service=chronyd"