diff --git a/debian/control b/debian/control index 3b8dd8e..bc36ead 100644 --- a/debian/control +++ b/debian/control @@ -34,6 +34,7 @@ libyajl-dev, libpcap0.8-dev, libnuma-dev [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el], + numad [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el], radvd [linux-any], libnetcf-dev (>= 1:0.2.3-3~) [linux-any], libsanlock-dev [linux-any], @@ -106,6 +107,7 @@ netcat-openbsd, Suggests: libvirt-daemon-system, + numad, Description: Virtualization daemon Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The library aims at providing diff --git a/debian/patches/configure-Prefer-usr-bin-over-bin-for-numad.patch b/debian/patches/configure-Prefer-usr-bin-over-bin-for-numad.patch new file mode 100644 index 0000000..59237b8 --- /dev/null +++ b/debian/patches/configure-Prefer-usr-bin-over-bin-for-numad.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= +Date: Sat, 12 Nov 2016 14:24:53 +0100 +Subject: configure: Prefer /usr/bin over /bin for numad + +This makes sure the daemon is found in /usr/bin even with usrmerge +installed during build (where /bin/ is symlinked to /usr/bin) but not on +the system that runs the binary. + +Submitted-By: Guilhem Moulin +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a17874b..565a2cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1501,7 +1501,7 @@ AC_ARG_WITH([numad], + if test "$with_numad" != "no" ; then + fail=0 + +- AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/sbin]) ++ AC_PATH_PROG([NUMAD], [numad], [], [/usr/bin:/bin:/usr/sbin]) + + if test "$with_numad" = "check"; then + test "$with_numactl" = "yes" || fail=1 diff --git a/debian/patches/series b/debian/patches/series index 651cca6..706684c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch Set-defaults-for-zfs-tools.patch Unbreak-rebuilding-docs-with-release-tarballs.patch +configure-Prefer-usr-bin-over-bin-for-numad.patch diff --git a/debian/rules b/debian/rules index ec557c4..6e0a416 100755 --- a/debian/rules +++ b/debian/rules @@ -45,9 +45,9 @@ WITH_DTRACE = --without-dtrace endif ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 i386 ia64 mips mipsel powerpc ppc64el)) - WITH_NUMA = --with-numactl - else - WITH_NUMA = --without-numactl + WITH_NUMA = --with-numactl --with-numad + else + WITH_NUMA = --without-numactl --without-numad endif ifneq (,$(findstring $(DEB_HOST_ARCH), ia64)) WITH_LXC = --without-lxc @@ -68,7 +68,7 @@ WITH_MACVTAP = --without-macvtap WITH_NETWORK = --without-network WITH_LXC = --without-lxc - WITH_NUMA = --without-numactl + WITH_NUMA = --without-numactl --without-numad WITH_NETCF = --without-netcf WITH_INIT_SCRIPT = --with-init-script=none WITH_SYSTEMD = --without-systemd-daemon