Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

main/postmarketos-base-ui: delay starting flatpak helper

Browse source 
This is a workaround for https://github.com/flatpak/flatpak/issues/6449

By requiring that system time is sync'd with NTP before the flatpak
helper is started, we can make sure that system time is always greater
than the flathub.org repo gpg key creation time, and prevent the
helper/flatpak from creating broken repo config that requires manual
intervention to fix.

Fixes #3816

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7711>
This commit is contained in:
Clayton Craft 2026-01-09 10:49:15 -08:00 • committed by The Friendly Merge Bot
parent 5e435f9669
commit 96d714f167
No known key found for this signature in database
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main/postmarketos-base-ui/APKBUILD
View file

@ -1,6 +1,6 @@
maintainer="Clayton Craft <clayton@craftyguy.net>"
pkgname=postmarketos-base-ui
pkgver=43
pkgver=44
pkgrel=0
pkgdesc="Meta package for minimal postmarketOS UI base"
url="https://postmarketos.org"
@ -31,6 +31,7 @@ subpackages="
$pkgname-bluez-obexd:obexd
$pkgname-elogind
$pkgname-flatpak
$pkgname-flatpak-systemd
$pkgname-networkmanager
$pkgname-openrc
$pkgname-openrc-settingsd:openrc_settingsd
@ -76,6 +77,7 @@ _source644="
usr/lib/NetworkManager/conf.d/50-iwd.conf
usr/lib/NetworkManager/conf.d/50-random-mac.conf
usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
usr/lib/systemd/system/flatpak-system-helper.service.d/wait-for-ntp.conf
usr/lib/udev/rules.d/50-udmabuf.rules
usr/share/flatpak/remotes.d/flathub.flatpakrepo
usr/share/wireplumber/wireplumber.conf.d/50-bluetooth.conf
@ -284,6 +286,11 @@ flatpak() {
amove usr/share/flatpak/remotes.d/flathub.flatpakrepo
}
flatpak_systemd() {
amove usr/lib/systemd/system/flatpak-system-helper.service.d/wait-for-ntp.conf
default_systemd
}
sha512sums="
187baa4a2b77e1e97a13536553ef2e1f64c3968f07ab2a372b550e4eee10a801a3b9797766d0d9f566148230335f3d4d150cd335bc40050322313a195874d608 rootfs-etc-chrony-chrony.conf
8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4 rootfs-etc-elogind-logind.conf
@ -300,6 +307,7 @@ cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b
439615745d5be0d1ab6801cfbf960a31b12da30bf5df64ba2914ff32dae9e650595d7f96e66f5dff6308f092de1f746277ea7f4e701888a22571f7c119b7bf0d rootfs-usr-lib-NetworkManager-conf.d-50-iwd.conf
d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc843519f628695e4df7602bfdcd3d79f2c2cd6e8256535c33b038 rootfs-usr-lib-NetworkManager-conf.d-50-random-mac.conf
900554534191fa0797064d35350934cdd8af59f30f0ae7d8ec63c2e11c44a16c643d3024b6543940488cd590fec1d392548bcaacc3be88cddff90f69b17ece07 rootfs-usr-lib-NetworkManager-conf.d-50-use-dnsmasq.conf
4f1e056e3bf6dcb9918fc35a87007304dcd16f3d2e1a920840455151f4f09001dace52097d0886a12d23c28b1646ea4fe907b6e65f54cfd22276201ba2da2fb9 rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf
9431dd37801261002f2ac8a0c30483994897adaf7cb31e80fcb99b7354dbe3e10d79162a2f2baefc5d091bb192ff680f274d6481bb198958d08918529c64e26f rootfs-usr-lib-udev-rules.d-50-udmabuf.rules
54620e508a5070ec8819e3661e592acfcfd26c52170b0ecc4dbbc1c61998963ce20bf9d9b051a608b76d6fc17e61c65decc16602b7d58061b9149667a968d258 rootfs-usr-share-flatpak-remotes.d-flathub.flatpakrepo
92930f027626825b027f585a9be180f8a6ebae6dc44d2cf8f9d43cce00db8cbb43c33fc341fe382abacb832ea1b6414dc4c8129d265b0258d096599b2e206a93 rootfs-usr-share-wireplumber-wireplumber.conf.d-50-bluetooth.conf

3
main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf Normal file
View file

@ -0,0 +1,3 @@
[Unit]
# Workaround for https://github.com/flatpak/flatpak/issues/6449
After=time-sync.target