Skip to content
Snippets Groups Projects
Commit 0b165927 authored by Andrea Bolognani's avatar Andrea Bolognani
Browse files

control: Introduce ARCHES_WIRESHARK

Wireshark hasn't been built successfully on either m68k or
x32 since 2023, and that in turn prevents libvirt from being
built on those architectures.

Since the Wireshark dissector is an optional feature, we can
simply disable it. This should make libvirt buildable on both
m68k and x32.

If the situation with Wireshark changes in the future,
enabling the feature again on those architectures once again
will be easy enough.
parent 71503b4f
No related branches found
No related tags found
1 merge request!261control: Introduce ARCHES_WIRESHARK
Pipeline #854244 passed
......@@ -4,6 +4,7 @@ ARCHES_QEMU = amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64
ARCHES_XEN = amd64 arm64
ARCHES_VBOX = amd64 i386
ARCHES_DMIDECODE = amd64 arm64 armhf i386 riscv64 loong64 x32
ARCHES_WIRESHARK = alpha amd64 arm64 armel armhf hppa i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64
# Keep this list empty until we have AppArmor support
ARCHES_NBDKIT =
......@@ -44,7 +44,7 @@ Build-Depends:
libtasn1-6-dev,
libtirpc-dev,
libudev-dev [linux-any],
libwireshark-dev [linux-any],
libwireshark-dev [alpha amd64 arm64 armel armhf hppa i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64],
libxen-dev [amd64 arm64],
libxml2-dev,
libxml2-utils,
......@@ -1033,7 +1033,7 @@ Homepage: https://libvirt.org/ssh-proxy.html
Package: libvirt-wireshark
Section: admin
Architecture: linux-any
Architecture: alpha amd64 arm64 armel armhf hppa i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64
Multi-Arch: same
Depends:
libvirt-common (= ${binary:Version}),
......
......@@ -44,7 +44,7 @@ Build-Depends:
libtasn1-6-dev,
libtirpc-dev,
libudev-dev [linux-any],
libwireshark-dev [linux-any],
libwireshark-dev [${ARCHES_WIRESHARK}],
libxen-dev [${ARCHES_XEN}],
libxml2-dev,
libxml2-utils,
......@@ -885,7 +885,7 @@ Homepage: https://libvirt.org/ssh-proxy.html
Package: libvirt-wireshark
Section: admin
Architecture: linux-any
Architecture: ${ARCHES_WIRESHARK}
Multi-Arch: same
Depends:
libvirt-common (= ${binary:Version}),
......
......@@ -54,7 +54,6 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
WITH_DTRACE = -Ddtrace=enabled
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
......@@ -93,7 +92,6 @@ else
WITH_DTRACE = -Ddtrace=disabled
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
......@@ -123,6 +121,11 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_VBOX)))
else
WITH_VBOX = -Ddriver_vbox=disabled
endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_WIRESHARK)))
WITH_WIRESHARK = -Dwireshark_dissector=enabled
else
WITH_WIRESHARK = -Dwireshark_dissector=disabled
endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_NBDKIT)))
WITH_NBDKIT = -Dnbdkit=enabled -Dnbdkit_config_default=enabled
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment