Enable seccomp support

Restrict the build dep on the architectures that provide libseccomp. This is
also why we can't configure with --enable-seccomp explicitly but rely on
auto-detection.

Closes: #760299

diff --git a/debian/changelog b/debian/changelog
index ded9eaa73c7b8d554204b2decba014f1924668cb..749b70f6b0c6a86446e74a0b988c505c7c7f9a40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+systemd (220-6) UNRELEASED; urgency=medium
+
+  * Enable seccomp support on the architectures that provide libseccomp.
+    (Closes: #760299)
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 10 Jun 2015 07:54:22 +0200
+
 systemd (220-5) unstable; urgency=medium
 
   * debian/README.source: Upstream repository moved to github, adjust

diff --git a/debian/control b/debian/control
index cb31b528ac6be87a4a623fc82a2772cba495cdde..3d6db0fe40ddd2773b43e1763625a9f4458d7435 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Build-Depends: debhelper (>= 9),
                libkmod-dev (>= 15),
                libblkid-dev (>= 2.24),
                libmount-dev (>= 2.20),
+               libseccomp-dev (>= 1.0.0) [amd64 armel armhf i386 mips mipsel],
                python3-all-dev,
                python3-lxml
 

diff --git a/debian/rules b/debian/rules
index 74ec106c3ebe1179934c90d5d1c511721e71e312..f17da3a3ecef185a5c0e72ba927397cd9422fe4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ CONFFLAGS = \
        --with-telinit=/lib/sysvinit/telinit \
        --enable-split-usr \
        --disable-gudev \
-       --disable-seccomp \
        --disable-qrencode \
        --disable-microhttpd \
        --disable-chkconfig \
@@ -88,6 +87,7 @@ CONFFLAGS_udeb = \
        --disable-hwdb \
        --disable-manpages \
        --disable-efi \
+       --disable-seccomp \
        --without-python
 
 override_dh_auto_configure: