diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index df8c8a5c1..0eafc354d 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,6 +1,6 @@ maintainer="Clayton Craft " pkgname=postmarketos-base-ui -pkgver=49 +pkgver=50 pkgrel=0 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" @@ -32,7 +32,6 @@ subpackages=" $pkgname-bluez-obexd:obexd $pkgname-elogind $pkgname-flatpak - $pkgname-flatpak-systemd:flatpak_systemd $pkgname-networkmanager $pkgname-modemmanager $pkgname-modemmanager-systemd:modemmanager_systemd @@ -82,7 +81,6 @@ _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/systemd/system/ModemManager.service.d/quick-suspend-resume.conf usr/lib/systemd/system/iio-sensor-proxy.service.d/shutdown.conf usr/lib/udev/rules.d/50-udmabuf.rules @@ -295,12 +293,6 @@ flatpak() { amove usr/share/flatpak/remotes.d/flathub.flatpakrepo } -flatpak_systemd() { - # note: can't use default_systemd since it slurps up units from other subpkgs - install_if="$pkgname-flatpak=$pkgver-r$pkgrel systemd" - amove usr/lib/systemd/system/flatpak-system-helper.service.d/wait-for-ntp.conf -} - modemmanager() { install_if="$pkgname=$pkgver-r$pkgrel modemmanager" mkdir -p "$subpkgdir" @@ -341,7 +333,6 @@ 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 cc86775a7820eb683e67df7d23ebae9d72699a643ff1452c71daf38ac6c39a84fd1686e67351ab0a2c582f9fc0374410383e3a32bd378cf11a8fb6033fde35ac rootfs-usr-lib-systemd-system-ModemManager.service.d-quick-suspend-resume.conf 087b9e967f6ffeaeb1fd6c5860bb07d0b8c2ce2c1b636d73e989cc9f3c8c6a60dc9552ec5ff13a2bce6804c3f5e8876d4b41a07770f06f6cee0fa37a54f996b4 rootfs-usr-lib-systemd-system-iio-sensor-proxy.service.d-shutdown.conf 9431dd37801261002f2ac8a0c30483994897adaf7cb31e80fcb99b7354dbe3e10d79162a2f2baefc5d091bb192ff680f274d6481bb198958d08918529c64e26f rootfs-usr-lib-udev-rules.d-50-udmabuf.rules diff --git a/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf b/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf deleted file mode 100644 index 4ba4488e0..000000000 --- a/main/postmarketos-base-ui/rootfs-usr-lib-systemd-system-flatpak-system-helper.service.d-wait-for-ntp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -# Workaround for https://github.com/flatpak/flatpak/issues/6449 -After=time-sync.target