[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] Unconditionally enable the LXC support/bits on any Linux architecture

[Andrea Bolognani (@abologna)]

Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
38ace202 by Pino Toscano at 2024-12-14T21:27:33+01:00
Unconditionally enable the LXC support/bits on any Linux architecture

Previously it used to be enabled on any Linux architecture excluding
ia64; since that architecture was decommissioned, then it is easier to
drop the list of architectures and simply use linux-any for the LXC
driver and the login shell.

- - - - -


4 changed files:

- debian/arches.mk
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/arches.mk
=====================================
@@ -1,7 +1,6 @@
 ARCHES_CEPH = amd64 arm64 loong64 mips64el ppc64el riscv64 s390x
 ARCHES_GLUSTER = amd64 arm64 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64
 ARCHES_QEMU = amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
-ARCHES_LXC = alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 ARCHES_XEN = amd64 arm64 armhf
 ARCHES_VBOX = amd64 i386
 ARCHES_DMIDECODE = amd64 arm64 armhf i386 riscv64 loong64 x32


=====================================
debian/control
=====================================
@@ -78,7 +78,7 @@ Depends:
 Suggests:
  libvirt-clients-qemu (= ${source:Version}) [amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
  libvirt-daemon (= ${binary:Version}) [linux-any],
- libvirt-login-shell (= ${binary:Version}) [alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32],
+ libvirt-login-shell (= ${binary:Version}) [linux-any],
 Breaks:
  libvirt-daemon (<< 6.9.0-2~),
  libvirt-daemon-driver-qemu (<< 6.9.0-2~),
@@ -115,7 +115,7 @@ Description: Programs for the libvirt library (QEMU specific)
 
 Package: libvirt-login-shell
 Section: admin
-Architecture: alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
+Architecture: linux-any
 Depends:
  libvirt-clients (= ${binary:Version}),
  libvirt-common (= ${binary:Version}),
@@ -149,7 +149,7 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  libvirt-daemon-driver-interface (= ${binary:Version}),
- libvirt-daemon-driver-lxc (= ${binary:Version}) [alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32],
+ libvirt-daemon-driver-lxc (= ${binary:Version}) [linux-any],
  libvirt-daemon-driver-network (= ${binary:Version}),
  libvirt-daemon-driver-nodedev (= ${binary:Version}),
  libvirt-daemon-driver-nwfilter (= ${binary:Version}),
@@ -312,7 +312,7 @@ Description: Virtualization daemon QEMU connection driver
 
 Package: libvirt-daemon-driver-lxc
 Section: admin
-Architecture: alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
+Architecture: linux-any
 Multi-Arch: no
 Depends:
  libvirt-common (= ${binary:Version}),
@@ -792,7 +792,7 @@ Depends:
  libvirt0 (= ${binary:Version}),
  ${misc:Depends},
 Recommends:
- libvirt-daemon-driver-lxc (= ${binary:Version}) [alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32],
+ libvirt-daemon-driver-lxc (= ${binary:Version}) [linux-any],
  libvirt-daemon-driver-xen (= ${binary:Version}) [amd64 arm64 armhf],
  libvirt-daemon-lock (= ${binary:Version}),
 Description: Virtualization daemon typical deployment


=====================================
debian/control.in
=====================================
@@ -78,7 +78,7 @@ Depends:
 Suggests:
  libvirt-clients-qemu (= ${source:Version}) [${ARCHES_QEMU}],
  libvirt-daemon (= ${binary:Version}) [linux-any],
- libvirt-login-shell (= ${binary:Version}) [${ARCHES_LXC}],
+ libvirt-login-shell (= ${binary:Version}) [linux-any],
 Breaks:
  libvirt-daemon (<< 6.9.0-2~),
  libvirt-daemon-driver-qemu (<< 6.9.0-2~),
@@ -115,7 +115,7 @@ Description: Programs for the libvirt library (QEMU specific)
 
 Package: libvirt-login-shell
 Section: admin
-Architecture: ${ARCHES_LXC}
+Architecture: linux-any
 Depends:
  libvirt-clients (= ${binary:Version}),
  libvirt-common (= ${binary:Version}),
@@ -149,7 +149,7 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  libvirt-daemon-driver-interface (= ${binary:Version}),
- libvirt-daemon-driver-lxc (= ${binary:Version}) [${ARCHES_LXC}],
+ libvirt-daemon-driver-lxc (= ${binary:Version}) [linux-any],
  libvirt-daemon-driver-network (= ${binary:Version}),
  libvirt-daemon-driver-nodedev (= ${binary:Version}),
  libvirt-daemon-driver-nwfilter (= ${binary:Version}),
@@ -312,7 +312,7 @@ Description: Virtualization daemon QEMU connection driver
 
 Package: libvirt-daemon-driver-lxc
 Section: admin
-Architecture: ${ARCHES_LXC}
+Architecture: linux-any
 Multi-Arch: no
 Depends:
  libvirt-common (= ${binary:Version}),
@@ -792,7 +792,7 @@ Depends:
  libvirt0 (= ${binary:Version}),
  ${misc:Depends},
 Recommends:
- libvirt-daemon-driver-lxc (= ${binary:Version}) [${ARCHES_LXC}],
+ libvirt-daemon-driver-lxc (= ${binary:Version}) [linux-any],
  libvirt-daemon-driver-xen (= ${binary:Version}) [${ARCHES_XEN}],
  libvirt-daemon-lock (= ${binary:Version}),
 Description: Virtualization daemon typical deployment


=====================================
debian/rules
=====================================
@@ -55,6 +55,8 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
     WITH_NUMA                 = -Dnumactl=enabled -Dnumad=enabled
     WITH_SYSCTL               = -Dsysctl_config=enabled -Duserfaultfd_sysctl=enabled
     WITH_WIRESHARK            = -Dwireshark_dissector=enabled
+    WITH_LXC                  = -Ddriver_lxc=enabled
+    WITH_LOGIN_SHELL          = -Dlogin_shell=enabled
 else
     WITH_DAEMONS              = -Ddriver_libvirtd=disabled -Dhost_validate=disabled -Dssh_proxy=disabled
     WITH_ESX                  = -Ddriver_esx=disabled -Dcurl=disabled
@@ -92,6 +94,8 @@ else
     WITH_NUMA                 = -Dnumactl=disabled -Dnumad=disabled
     WITH_SYSCTL               = -Dsysctl_config=disabled -Duserfaultfd_sysctl=disabled
     WITH_WIRESHARK            = -Dwireshark_dissector=disabled
+    WITH_LXC                  = -Ddriver_lxc=disabled
+    WITH_LOGIN_SHELL          = -Dlogin_shell=disabled
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_CEPH)))
@@ -109,13 +113,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_QEMU)))
 else
     WITH_QEMU                 = -Ddriver_qemu=disabled
 endif
-ifneq (,$(findstring $(DEB_HOST_ARCH), $(ARCHES_LXC)))
-    WITH_LXC                  = -Ddriver_lxc=enabled
-    WITH_LOGIN_SHELL          = -Dlogin_shell=enabled
-else
-    WITH_LXC                  = -Ddriver_lxc=disabled
-    WITH_LOGIN_SHELL          = -Dlogin_shell=disabled
-endif
 ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_XEN)))
     WITH_LIBXL                = -Ddriver_libxl=enabled
 else



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/38ace2022d9afad65c4193d107203a0e897064fd

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/38ace2022d9afad65c4193d107203a0e897064fd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20241215/2e6a1b4f/attachment-0001.htm>