Skip to content
Snippets Groups Projects
Verified Commit ceab4030 authored by Christian Ehrhardt's avatar Christian Ehrhardt
Browse files

d/control, d/rules: feature architecture parity


Enable systemtap, numa and numad on architecture having the build-deps
nowadays.

Ubuntu enabled these features on ppc64el and s390x that work fine there and
have no reason to be non-enabled there based on these architectures.

On review it was pointed out that the build-deps are linux-any these
days, therefore enable it less selective on linux-any.

Signed-off-by: default avatarDimitri John Ledkov <xnox@ubuntu.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarChristian Ehrhardt <christian.ehrhardt@canonical.com>
parent a7dbff15
No related branches found
No related tags found
2 merge requests!67Sync from experimental,!57Further 6.6.0 fixes for Debian
......@@ -27,7 +27,7 @@ Build-Depends:
libnetcf-dev (>= 1:0.2.3-3~) [linux-any],
libnl-3-dev [linux-any],
libnl-route-3-dev [linux-any],
libnuma-dev [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el],
libnuma-dev [linux-any],
libparted-dev (>= 2.2),
libpcap0.8-dev,
libpciaccess-dev,
......@@ -50,7 +50,7 @@ Build-Depends:
lvm2 [linux-any],
netcat-openbsd,
nfs-common,
numad [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el],
numad [linux-any],
open-iscsi [linux-any],
openssh-client,
parted (>= 2.2),
......@@ -61,7 +61,7 @@ Build-Depends:
qemu-system-common,
qemu-utils,
radvd [linux-any],
systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390],
systemtap-sdt-dev [linux-any],
uuid-dev,
xsltproc,
zfsutils [kfreebsd-amd64 kfreebsd-i386],
......
......@@ -49,16 +49,8 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
WITH_SELINUX = --with-selinux --with-secdriver-selinux --with-selinux-mount=/sys/fs/selinux
WITH_APPARMOR = --with-apparmor --with-secdriver-apparmor --with-apparmor-profiles
WITH_NSS_PLUGIN = --with-nss-plugin
ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 ia64 powerpc s390))
WITH_DTRACE = --with-dtrace
else
WITH_DTRACE = --without-dtrace
endif
ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 i386 ia64 mips mipsel powerpc ppc64el))
WITH_NUMA = --with-numactl --with-numad
else
WITH_NUMA = --without-numactl --without-numad
endif
WITH_DTRACE = --with-dtrace
WITH_NUMA = --with-numactl --with-numad
ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
WITH_LXC = --without-lxc
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