Skip to content

Commit 4c5c36e

Browse files
committed
Merge remote-tracking branch 'origin/pr/590'
* origin/pr/590: arch: qubes-vm-* provide qubes-core-agent-* Pull request description: While package names match between Debian and Fedora (`qubes-core-agent{,-*}`), Arch packaging has its own naming (`qubes-vm-*`). This means that salt formulas that can otherwise be used seamlessly cross-dists need to be customized for Arch targets. This adds `provides` directives for Arch packages so they can be installed by referring to their Debian/Fedora names. - `qubes-core-agent` -> `qubes-vm-core` - `qubes-core-agent-networking` -> `qubes-vm-networking` - `qubes-core-agent-nautilus` -> `qubes-vm-nautilus` - `qubes-core-agent-caja` -> `qubes-vm-caja` - `qubes-core-agent-thunar` -> `qubes-vm-thunar` - `qubes-core-agent-dom0-updates` -> `qubes-vm-dom0-updates` - `qubes-core-agent-passwordless-root` -> `qubes-vm-passwordless-root` `qubes-vm-keyring` unmapped. Follow-up to #589
2 parents 83842c3 + e977e69 commit 4c5c36e

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

archlinux/PKGBUILD.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ package_qubes-vm-core() {
5454
echo 'invalid $pkgver'>&2
5555
exit 1
5656
}
57+
provides=(qubes-core-agent=@VERSION@)
5758
conflicts=('pulseaudio-qubes<4.2.0')
5859
release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]}
5960
depends=(
@@ -159,6 +160,7 @@ EOF
159160
#
160161
package_qubes-vm-networking() {
161162
pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM"
163+
provides=(qubes-core-agent-networking=@VERSION@)
162164
depends=(
163165
conntrack-tools
164166
iproute2
@@ -207,6 +209,7 @@ package_qubes-vm-keyring() {
207209

208210
package_qubes-vm-caja() {
209211
pkgdesc="Qubes OS Caja addons for inter-VM file copy/move/open"
212+
provides=(qubes-core-agent-caja=@VERSION@)
210213
conflicts=('qubes-vm-core<4.3.26')
211214
depends=(
212215
bash
@@ -227,6 +230,7 @@ package_qubes-vm-caja() {
227230

228231
package_qubes-vm-thunar() {
229232
pkgdesc="Qubes OS Thunar addons for inter-VM file copy/move/open"
233+
provides=(qubes-core-agent-thunar=@VERSION@)
230234
conflicts=('qubes-vm-core<4.3.26')
231235
depends=(
232236
bash
@@ -251,6 +255,7 @@ package_qubes-vm-thunar() {
251255

252256
package_qubes-vm-nautilus() {
253257
pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open"
258+
provides=(qubes-core-agent-nautilus=@VERSION@)
254259
conflicts=('qubes-vm-core<4.3.26')
255260
depends=(
256261
bash
@@ -273,6 +278,7 @@ package_qubes-vm-nautilus() {
273278

274279
package_qubes-vm-passwordless-root() {
275280
pkgdesc="Qubes OS Passwordless root access from normal user"
281+
provides=(qubes-core-agent-passwordless-root=@VERSION@)
276282

277283
cd "${_pkgnvr}"
278284
make -C passwordless-root install \
@@ -287,6 +293,7 @@ package_qubes-vm-passwordless-root() {
287293

288294
package_qubes-vm-dom0-updates() {
289295
pkgdesc="Qubes OS tools for fetching dom0 updates"
296+
provides=(qubes-core-agent-dom0-updates=@VERSION@)
290297
depends=(
291298
dnf5
292299
python

0 commit comments

Comments
 (0)