From 813bd716031ac331de4f4e5f7607f9c6f09d7fde Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Apr 20 2017 14:15:35 +0000 Subject: c-s-s untars to different dir names on fedora and centos Signed-off-by: Lokesh Mandvekar --- diff --git a/docker-latest.spec b/docker-latest.spec index c24ec0c..8df28bd 100644 --- a/docker-latest.spec +++ b/docker-latest.spec @@ -440,7 +440,11 @@ cp %{SOURCE9} . # untar d-s-s tar zxf %{SOURCE1} +%if 0%{?fedora} pushd container-storage-setup-%{commit_dss} +%else +pushd %{repo}-storage-setup-%{commit_dss} +%endif sed -i 's/%{repo}/%{name}/g' %{repo}-storage-setup* mv %{repo}-storage-setup.sh %{name}-storage-setup.sh mv %{repo}-storage-setup-override.conf %{name}-storage-setup-override.conf @@ -642,7 +646,11 @@ install -dp %{buildroot}%{_sysconfdir}/%{name} install -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/%{name}/seccomp.json # install d-s-s +%if 0%{?fedora} pushd container-storage-setup-%{commit_dss} +%else +pushd %{repo}-storage-setup-%{commit_dss} +%endif make install DESTDIR=%{buildroot} DOCKER=%{name} DSSLIBDIR=%{buildroot}%{dss_libdir} popd