From c22939b9a8c1e9c06d83e23125037cfc8caf07a0 Mon Sep 17 00:00:00 2001 From: 3np <3np@example.com> Date: Sat, 28 Jun 2025 23:02:15 +0000 Subject: [PATCH 1/3] arch: qubes-vm-* provide qubes-core-agent-* match debian/fedora package names to allow uniform install scripts. --- archlinux/PKGBUILD.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index d67eca358..1aac6678a 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -54,6 +54,7 @@ package_qubes-vm-core() { echo 'invalid $pkgver'>&2 exit 1 } + provides=(qubes-core-agent) conflicts=('pulseaudio-qubes<4.2.0') release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]} depends=( @@ -159,6 +160,7 @@ EOF # package_qubes-vm-networking() { pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM" + provides=(qubes-core-agent-networking) depends=( conntrack-tools iproute2 @@ -207,6 +209,7 @@ package_qubes-vm-keyring() { package_qubes-vm-caja() { pkgdesc="Qubes OS Caja addons for inter-VM file copy/move/open" + provides=(qubes-core-agent-caja) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -227,6 +230,7 @@ package_qubes-vm-caja() { package_qubes-vm-thunar() { pkgdesc="Qubes OS Thunar addons for inter-VM file copy/move/open" + provides=(qubes-core-agent-thunar) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -251,6 +255,7 @@ package_qubes-vm-thunar() { package_qubes-vm-nautilus() { pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open" + provides=(qubes-core-agent-nautilus) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -273,6 +278,7 @@ package_qubes-vm-nautilus() { package_qubes-vm-passwordless-root() { pkgdesc="Qubes OS Passwordless root access from normal user" + provides=(qubes-core-agent-passwordless-root) cd "${_pkgnvr}" make -C passwordless-root install \ @@ -287,6 +293,7 @@ package_qubes-vm-passwordless-root() { package_qubes-vm-dom0-updates() { pkgdesc="Qubes OS tools for fetching dom0 updates" + provides=(qubes-core-agent-dom0-updates) depends=( dnf5 python From ec02877ca21fb725a4329813ddf99f15df51440b Mon Sep 17 00:00:00 2001 From: 3np <3np@example.com> Date: Thu, 3 Jul 2025 19:32:20 +0000 Subject: [PATCH 2/3] arch: add version to provides --- archlinux/PKGBUILD.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index 1aac6678a..d8b2f94b8 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -54,7 +54,7 @@ package_qubes-vm-core() { echo 'invalid $pkgver'>&2 exit 1 } - provides=(qubes-core-agent) + provides=(qubes-core-agent=@VERSION@) conflicts=('pulseaudio-qubes<4.2.0') release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]} depends=( @@ -160,7 +160,7 @@ EOF # package_qubes-vm-networking() { pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM" - provides=(qubes-core-agent-networking) + provides=(qubes-core-agent-networking=@VERSION@) depends=( conntrack-tools iproute2 @@ -209,7 +209,7 @@ package_qubes-vm-keyring() { package_qubes-vm-caja() { pkgdesc="Qubes OS Caja addons for inter-VM file copy/move/open" - provides=(qubes-core-agent-caja) + provides=(qubes-core-agent-caja=@VERSION@) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -230,7 +230,7 @@ package_qubes-vm-caja() { package_qubes-vm-thunar() { pkgdesc="Qubes OS Thunar addons for inter-VM file copy/move/open" - provides=(qubes-core-agent-thunar) + provides=(qubes-core-agent-thunar=@VERSION@) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -255,7 +255,7 @@ package_qubes-vm-thunar() { package_qubes-vm-nautilus() { pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open" - provides=(qubes-core-agent-nautilus) + provides=(qubes-core-agent-nautilus=@VERSION@) conflicts=('qubes-vm-core<4.3.26') depends=( bash @@ -278,7 +278,7 @@ package_qubes-vm-nautilus() { package_qubes-vm-passwordless-root() { pkgdesc="Qubes OS Passwordless root access from normal user" - provides=(qubes-core-agent-passwordless-root) + provides=(qubes-core-agent-passwordless-root=@VERSION@) cd "${_pkgnvr}" make -C passwordless-root install \ @@ -293,7 +293,7 @@ package_qubes-vm-passwordless-root() { package_qubes-vm-dom0-updates() { pkgdesc="Qubes OS tools for fetching dom0 updates" - provides=(qubes-core-agent-dom0-updates) + provides=(qubes-core-agent-dom0-updates=@VERSION@) depends=( dnf5 python From a7b42d7c36c371a8c3da3e8163177ebe57b4c756 Mon Sep 17 00:00:00 2001 From: 3np <3np@example.com> Date: Thu, 3 Jul 2025 19:40:44 +0000 Subject: [PATCH 3/3] arch: adjust conflicts for caja/thunar/nautilus CI prevented putting conflicts on current version and `main` currently has last released version configured. now that 4.3.27 has been releases these can be corrected so that incompatible installation is not supported. --- archlinux/PKGBUILD.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index d8b2f94b8..9bd85c666 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -210,7 +210,7 @@ package_qubes-vm-keyring() { package_qubes-vm-caja() { pkgdesc="Qubes OS Caja addons for inter-VM file copy/move/open" provides=(qubes-core-agent-caja=@VERSION@) - conflicts=('qubes-vm-core<4.3.26') + conflicts=('qubes-vm-core<4.3.27') depends=( bash python-caja @@ -231,7 +231,7 @@ package_qubes-vm-caja() { package_qubes-vm-thunar() { pkgdesc="Qubes OS Thunar addons for inter-VM file copy/move/open" provides=(qubes-core-agent-thunar=@VERSION@) - conflicts=('qubes-vm-core<4.3.26') + conflicts=('qubes-vm-core<4.3.27') depends=( bash qubes-vm-qrexec @@ -256,7 +256,7 @@ package_qubes-vm-thunar() { package_qubes-vm-nautilus() { pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open" provides=(qubes-core-agent-nautilus=@VERSION@) - conflicts=('qubes-vm-core<4.3.26') + conflicts=('qubes-vm-core<4.3.27') depends=( bash python-gobject