diff --git a/.gitignore b/.gitignore index d264adb..15f560a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kubernetes-01fcb58.tar.gz +/kubernetes-6fa2777.tar.gz diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch index 5eecd4d..7177582 100644 --- a/build-with-debug-info.patch +++ b/build-with-debug-info.patch @@ -1,6 +1,6 @@ -From e8b2604bb642c39397caf91f361b3e51c8d79e5f Mon Sep 17 00:00:00 2001 +From 039b0084d6d1db16f6ee1bc7dd25f1e9b839e19b Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Wed, 20 May 2015 09:52:33 +0200 +Date: Thu, 28 May 2015 10:45:17 +0200 Subject: [PATCH] build with debug info --- @@ -8,24 +8,27 @@ Subject: [PATCH] build with debug info 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh -index 96caa0a..17f5d9f 100644 +index 6283a55..013caa7 100644 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh -@@ -333,12 +333,12 @@ kube::golang::build_binaries_for_platform() { - if kube::golang::is_statically_linked_library "${binary}"; then - CGO_ENABLED=0 go build -o "${outfile}" \ - "${goflags[@]:+${goflags[@]}}" \ -- -ldflags "${version_ldflags}" \ -+ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \ - "${binary}" - else - go build -o "${outfile}" \ - "${goflags[@]:+${goflags[@]}}" \ -- -ldflags "${version_ldflags}" \ -+ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \ - "${binary}" - fi +@@ -333,7 +333,7 @@ kube::golang::build_binaries_for_platform() { + local outfile=$(kube::golang::output_filename_for_binary "${binary}" "${platform}") + CGO_ENABLED=0 go build -o "${outfile}" \ + "${goflags[@]:+${goflags[@]}}" \ +- -ldflags "${version_ldflags}" \ ++ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \ + "${binary}" kube::log::progress "*" + done +@@ -341,7 +341,7 @@ kube::golang::build_binaries_for_platform() { + local outfile=$(kube::golang::output_filename_for_binary "${binary}" "${platform}") + go build -o "${outfile}" \ + "${goflags[@]:+${goflags[@]}}" \ +- -ldflags "${version_ldflags}" \ ++ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \ + "${binary}" + kube::log::progress "*" + done -- 1.9.3 diff --git a/kubernetes.spec b/kubernetes.spec index 7d90743..f5d4893 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -10,7 +10,7 @@ %global repo kubernetes # https://github.com/GoogleCloudPlatform/kubernetes %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 01fcb58673001e56c69e128ab57e0c3f701aeea5 +%global commit 6fa2777e26559fc008eacac83eb165d25bd9a7de %global shortcommit %(c=%{commit}; echo ${c:0:7}) #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -20,7 +20,7 @@ Name: kubernetes Version: 0.17.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -338,7 +338,7 @@ Kubernetes services for node host %build export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} -export KUBE_GIT_VERSION=v0.17.1-748-g01fcb58673001e +export KUBE_GIT_VERSION=v0.17.1-915-g6fa2777e26559f %if 0%{?fedora} #export KUBE_GIT_TREE_STATE="dirty" @@ -505,6 +505,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Thu May 28 2015 jchaloup - 0.17.1-5 +- Bump to upstream 6fa2777e26559fc008eacac83eb165d25bd9a7de + related: #1211266 + * Tue May 26 2015 jchaloup - 0.17.1-4 - Bump to upstream 01fcb58673001e56c69e128ab57e0c3f701aeea5 related: #1211266 diff --git a/sources b/sources index 01e001e..02f8bab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97896b1315d3cd753e0fa6d2ed877ea7 kubernetes-01fcb58.tar.gz +e823af7ccdcdc3278c2afdf01c0654fd kubernetes-6fa2777.tar.gz