Skip to content

Commit

Permalink
packaging: Depend on virt-install
Browse files Browse the repository at this point in the history
Our code increasingly uses `virt-xml`, which is not related to creating
new machines but administering existing ones. That is also shipped in
the `virt-install` package, so promote it from Recommends to Requires.

Leave the `virtInstallAvailable` runtime detection in place for the
beiboot case.

Side issue in https://issues.redhat.com/browse/RHEL-61727
  • Loading branch information
martinpitt authored and mvollmer committed Jan 7, 2025
1 parent dc4632b commit a4cf045
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
3 changes: 1 addition & 2 deletions packaging/arch/PKGBUILD.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ pkgdesc='Cockpit UI for virtual machines'
arch=('x86_64')
url='https://github.com/cockpit-project/cockpit-machines'
license=(LGPL)
depends=(cockpit libvirt-dbus)
optdepends=("virt-install: create new virtual machines")
source=("SOURCE")
sha256sums=('SKIP')

package() {
depends=(cockpit libvirt-dbus virt-install)
cd $pkgname
make DESTDIR="$pkgdir" install PREFIX=/usr
}
8 changes: 3 additions & 5 deletions packaging/cockpit-machines.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Requires: libvirt-daemon-driver-qemu
Requires: libvirt-daemon-driver-network
Requires: libvirt-daemon-driver-nodedev
Requires: libvirt-daemon-driver-storage-core
Requires: (libvirt-daemon-config-network if virt-install)
Requires: libvirt-daemon-config-network
Recommends: libvirt-daemon-driver-storage-disk
%if 0%{?rhel}
Requires: qemu-kvm
Expand All @@ -62,18 +62,16 @@ Requires: (qemu-audio-spice if qemu-char-spice)
%endif
Requires: libvirt-client
Requires: libvirt-dbus >= 1.2.0
Requires: virt-install >= 3.0.0
# Optional components
Recommends: virt-install >= 3.0.0
Recommends: libosinfo
Recommends: python3-gobject-base
Suggests: (qemu-virtiofsd or virtiofsd)

%{NPM_PROVIDES}

%description
Cockpit component for managing virtual machines.

If "virt-install" is installed, you can also create new virtual machines.
Cockpit component for managing libvirt virtual machines.

%prep
%setup -q -n %{name}
Expand Down
10 changes: 4 additions & 6 deletions packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ Depends: ${misc:Depends},
cockpit-bridge (>= 215),
libvirt-daemon-system,
libvirt-clients | libvirt-bin,
libvirt-dbus
Recommends: virtinst (>= 3.0.0), python3-gi, gir1.2-libosinfo-1.0, qemu-block-extra
libvirt-dbus,
virtinst (>= 3.0.0),
Recommends: python3-gi, gir1.2-libosinfo-1.0, qemu-block-extra
Description: Cockpit user interface for virtual machines
The Cockpit Web Console enables users to administer GNU/Linux servers using a
web browser.
.
This package adds an user interface for managing virtual machines.
.
If the "virtinst" package is installed, you can also create new virtual
machines.
This package adds an user interface for managing libvirt virtual machines.

0 comments on commit a4cf045

Please sign in to comment.