rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 512333 from home:jordimassaguerpla:branch:Vc:fix_seccomp_and_dm

Browse Source 
- enable deferred removal for sle12sp2 and newer (and openSUSE
  equivalent. fix bsc#1021227

- enable libseccomp on sle12sp2 and newer, 42.2 and newer
  fix bsc#1028638 - docker: conditional filtering not supported on
  libseccomp for sle12

OBS-URL: https://build.opensuse.org/request/show/512333
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=195
This commit is contained in:
Aleksa Sarai 2017-07-27 16:11:06 +00:00 committed by Git OBS Bridge
parent eee720d9e6
commit 18b17a0bdb
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jul 19 18:12:26 UTC 2017 - jmassaguerpla@suse.com
- enable deferred removal for sle12sp2 and newer (and openSUSE
equivalent. fix bsc#1021227
-------------------------------------------------------------------
Wed Jul 19 17:17:04 UTC 2017 - jmassaguerpla@suse.com
- enable libseccomp on sle12sp2 and newer, 42.2 and newer
fix bsc#1028638 - docker: conditional filtering not supported on
libseccomp for sle12
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 11 10:50:12 UTC 2017 - jmassaguerpla@suse.com Tue Jul 11 10:50:12 UTC 2017 - jmassaguerpla@suse.com

21
docker.spec
View File

@ -65,9 +65,16 @@ BuildRequires: device-mapper-devel >= 1.2.68
BuildRequires: glibc-devel-static BuildRequires: glibc-devel-static
BuildRequires: libapparmor-devel BuildRequires: libapparmor-devel
BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libbtrfs-devel >= 3.8
# If not leap 42.1 (120100), not sle12sp1 (120100) and not sle12 (1315) # enable libseccomp for sle >= sle12sp2
# enable libseccomp %if 0%{?sle_version} >= 120200
%if 0%{?sle_version} != 120100 && 0%{?suse_version} != 1315 %define with_libseccomp 1
%endif
# enable libseccomp for leap >= 42.2
%if 0%{?leap_version} >= 420200
%define with_libseccomp 1
%endif
# enable libseccomp for Factory
%if 0%{?suse_version} > 1320
%define with_libseccomp 1 %define with_libseccomp 1
%endif %endif
%if 0%{?with_libseccomp} %if 0%{?with_libseccomp}
@ -180,11 +187,9 @@ BUILDTAGS="exclude_graphdriver_aufs apparmor selinux pkcs11"
%if 0%{?with_libseccomp} %if 0%{?with_libseccomp}
BUILDTAGS="seccomp $BUILDTAGS" BUILDTAGS="seccomp $BUILDTAGS"
%endif %endif
# Note that these commands do not allow %%elseif. # For SLE12 libdevmapper.h is not recent enough to define
# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not # dm_task_deferred_remove().
# recent enough to define dm_task_deferred_remove(). (This is not true of %if 0%{?sle_version} == 120000
# SLE12_SP1 but we cannot distinguish it with this macro.)
%if 0%{?suse_version} <= 1320
BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS" BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS"
%endif %endif