diff --git a/docker.changes b/docker.changes index 1e620f2..c130642 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 20 08:12:01 UTC 2017 - jmassaguerpla@suse.com + +- Disable libseccomp for leap 42.1, sle12sp1 and sle12, because + docker needs a higher version. Otherwise, we get the error + "conditional filtering requires libseccomp version >= 2.2.1 + (bsc#1028639 and bsc#1028638) + ------------------------------------------------------------------- Fri Mar 17 11:08:03 UTC 2017 - asarai@suse.com diff --git a/docker.spec b/docker.spec index 9705ee9..c9dd267 100644 --- a/docker.spec +++ b/docker.spec @@ -81,7 +81,14 @@ BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 +# If not leap 42.1 (120100), not sle12sp1 (120100) and not sle12 (1315) +# enable libseccomp +%if 0%{?sle_version} != 120100 && 0%{?suse_version} != 1315 +%define with_libseccomp 1 +%endif +%if 0%{?with_libseccomp} BuildRequires: libseccomp-devel +%endif BuildRequires: libtool BuildRequires: procps BuildRequires: sqlite3-devel @@ -200,11 +207,14 @@ ln -s %{_bindir}/go-6 $tmphack/go export PATH=$tmphack:$PATH %endif +BUILDTAGS="exclude_graphdriver_aufs apparmor selinux pkcs11" +%if 0%{?with_libseccomp} +BUILDTAGS="seccomp $BUILDTAGS" +%endif # Note that these commands do not allow %%elseif. # For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not # recent enough to define dm_task_deferred_remove(). (This is not true of # SLE12_SP1 but we cannot distinguish it with this macro.) -BUILDTAGS="exclude_graphdriver_aufs apparmor seccomp selinux pkcs11" %if 0%{?suse_version} <= 1320 BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS" %endif @@ -283,7 +293,12 @@ PKG_LIST=$(go list -e \ | grep -v 'github.com/docker/docker/cmd/dockerd$' \ | grep -v 'github.com/docker/docker/builder/dockerfile/parser$' \ | grep -v 'github.com/docker/docker/man$' \ +%if 0%{?with_libseccomp} | grep -v 'github.com/docker/docker/pkg/integration$') +%else + | grep -v 'github.com/docker/docker/pkg/integration$' \ + | grep -v 'github.com/docker/docker/profiles/seccomp$') +%endif go test -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST %endif