main/postmarketos-base-ui: move flatpak repo config to /usr (MR 6119)
Since 1.15.11 this is supported (see https://github.com/flatpak/flatpak/pull/5688/files). According to the docs: System-wide remotes can be statically preconfigured by dropping flatpakrepo files into /usr/share/flatpak/remotes.d/ and /etc/flatpak/remotes.d/. If a file with the same name exists in both, the file under /etc will take precedence. This allows us to move the file without fear that if users disabled or modified the repo, apk will keep the file in /etc and we won't override it. This is part of a wider effort to move things out of /etc and into /usr Fixes #2596 [ci:skip-build]: already built successfully in CI
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# Maintainer: Clayton Craft <clayton@craftyguy.net>
|
||||
pkgname=postmarketos-base-ui
|
||||
pkgver=31
|
||||
pkgrel=2
|
||||
pkgver=32
|
||||
pkgrel=0
|
||||
pkgdesc="Meta package for minimal postmarketOS UI base"
|
||||
url="https://postmarketos.org"
|
||||
arch="noarch"
|
||||
@@ -58,7 +58,6 @@ _pmb_recommends="font-droid font-droid-nonlatin font-twemoji"
|
||||
_source644="
|
||||
etc/chrony/chrony.conf
|
||||
etc/elogind/logind.conf
|
||||
etc/flatpak/remotes.d/flathub.flatpakrepo
|
||||
etc/conf.d/bluetooth
|
||||
etc/conf.d/openrc-settingsd
|
||||
etc/conf.d/tinydm
|
||||
@@ -73,6 +72,7 @@ _source644="
|
||||
usr/lib/NetworkManager/conf.d/50-random-mac.conf
|
||||
usr/lib/NetworkManager/conf.d/50-tethering.conf
|
||||
usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
|
||||
usr/share/flatpak/remotes.d/flathub.flatpakrepo
|
||||
usr/share/wireplumber/wireplumber.conf.d/50-bluetooth.conf
|
||||
usr/share/mkinitfs/files/10-wireless-regdb.files
|
||||
"
|
||||
@@ -294,13 +294,12 @@ _audio_pulseaudio() {
|
||||
flatpak() {
|
||||
install_if="$pkgname=$pkgver-r$pkgrel flatpak"
|
||||
|
||||
amove etc/flatpak/remotes.d/flathub.flatpakrepo
|
||||
amove usr/share/flatpak/remotes.d/flathub.flatpakrepo
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
187baa4a2b77e1e97a13536553ef2e1f64c3968f07ab2a372b550e4eee10a801a3b9797766d0d9f566148230335f3d4d150cd335bc40050322313a195874d608 rootfs-etc-chrony-chrony.conf
|
||||
8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4 rootfs-etc-elogind-logind.conf
|
||||
54620e508a5070ec8819e3661e592acfcfd26c52170b0ecc4dbbc1c61998963ce20bf9d9b051a608b76d6fc17e61c65decc16602b7d58061b9149667a968d258 rootfs-etc-flatpak-remotes.d-flathub.flatpakrepo
|
||||
b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 rootfs-etc-conf.d-bluetooth
|
||||
49fb494b659fe0149a93eafe109609acce6a470bb8acea160638d07e0e4b11af2544f34549d5ef2deb2914a7ef13d0d470b04ad62981f14f96999af02a5f24cf rootfs-etc-conf.d-openrc-settingsd
|
||||
44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0 rootfs-etc-conf.d-tinydm
|
||||
@@ -315,6 +314,7 @@ cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b
|
||||
d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc843519f628695e4df7602bfdcd3d79f2c2cd6e8256535c33b038 rootfs-usr-lib-NetworkManager-conf.d-50-random-mac.conf
|
||||
6507eb31cdd694a7db0280246433118a650bf5d99fbe639f967ae2d95945429a7e03ca6feb5bb6e7b9fb14fcec21e13e51209a79edd0041e77b5bf76b129ed6f rootfs-usr-lib-NetworkManager-conf.d-50-tethering.conf
|
||||
900554534191fa0797064d35350934cdd8af59f30f0ae7d8ec63c2e11c44a16c643d3024b6543940488cd590fec1d392548bcaacc3be88cddff90f69b17ece07 rootfs-usr-lib-NetworkManager-conf.d-50-use-dnsmasq.conf
|
||||
54620e508a5070ec8819e3661e592acfcfd26c52170b0ecc4dbbc1c61998963ce20bf9d9b051a608b76d6fc17e61c65decc16602b7d58061b9149667a968d258 rootfs-usr-share-flatpak-remotes.d-flathub.flatpakrepo
|
||||
92930f027626825b027f585a9be180f8a6ebae6dc44d2cf8f9d43cce00db8cbb43c33fc341fe382abacb832ea1b6414dc4c8129d265b0258d096599b2e206a93 rootfs-usr-share-wireplumber-wireplumber.conf.d-50-bluetooth.conf
|
||||
66a7a72746e822676d0ec76160e39b65c711e574a6334f3aad38c563d3104b33d0619d50b92c9201546fd81bfd10cfe0e4a59278cbcbddf20a238f6ad71c050c rootfs-usr-share-mkinitfs-files-10-wireless-regdb.files
|
||||
824dd5cdd1353b0d4c43f6580572c804eaf8f165c3cc737901abdf1303412f68ac0192044e8d50773bdb3873e687d0ccddd433080f5f108ca5837db76f164dab rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf
|
||||
|
||||
Reference in New Issue
Block a user