diff --git a/.gitignore b/.gitignore index fe00f45..f1e2552 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /docker-selinux-be16da7.tar.gz /docker-fb1a123.tar.gz /docker-selinux-b8aae8f.tar.gz +/docker-selinux-afc876c.tar.gz diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch deleted file mode 100644 index b7efb3e..0000000 --- a/build-with-debug-info.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cbe045cb6a8126c5be9062caf039ada20adc5480 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 7 Jan 2016 13:53:39 +0100 -Subject: [PATCH] build with debug info - ---- - hack/make/binary | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hack/make/binary b/hack/make/binary -index 5ddce8d..75447a8 100644 ---- a/hack/make/binary -+++ b/hack/make/binary -@@ -40,7 +40,7 @@ echo "Building: $DEST/$BINARY_FULLNAME" - go build \ - -o "$DEST/$BINARY_FULLNAME" \ - "${BUILDFLAGS[@]}" \ -- -ldflags " -+ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') - $LDFLAGS - $LDFLAGS_STATIC_DOCKER - " \ --- -1.9.3 - diff --git a/docker.spec b/docker.spec index 0a5582b..23557ce 100644 --- a/docker.spec +++ b/docker.spec @@ -39,7 +39,7 @@ # docker-selinux %global git2 https://github.com/projectatomic/%{repo}-selinux -%global commit2 b8aae8f17a90585d7d448f30332f3303ba270a1b +%global commit2 afc876c0e8828cc0b73cf76bbf550e30b5e627aa %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) # docker-utils @@ -99,7 +99,7 @@ Source10: %{repo}-network.sysconfig %if 0%{?with_debug} # Build with debug -Patch0: build-with-debug-info.patch +#Patch0: build-with-debug-info.patch %endif BuildRequires: git diff --git a/sources b/sources index b7f6580..6ea4c0f 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ b0cae53a23bdb0e7c6bdf1fdc39e859d docker-fb1a123.tar.gz 0a7e5ef66caa1dc0273c50b3216ac6ff docker-novolume-plugin-2ca381e.tar.gz -df3481222ba90f90f51d916b7b7a0e53 docker-selinux-b8aae8f.tar.gz +c2a5d34f07c9abd474dca95deab58f73 docker-selinux-afc876c.tar.gz 3cdff1d3539b5bbb8e84700a59dc26be docker-storage-setup-1c2b95b.tar.gz 41de66f15f8151b1cb81b8d88c14d0e1 docker-utils-dab51ac.tar.gz