jcapik pushed to kubernetes (f20). "Bump to upstream a6157994885bddc9c151747b5011dac5af3139e6 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Jun 10 14:44:35 UTC 2015
From aa91709fc3ffe8cd29b2356c61d604216d1ae165 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 20 May 2015 09:48:56 +0200
Subject: Bump to upstream a6157994885bddc9c151747b5011dac5af3139e6 - related:
#1211266
diff --git a/.gitignore b/.gitignore
index 5e4fba0..3b58b7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-10339d7.tar.gz
+/kubernetes-a76bdd9.tar.gz
diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch
index 37a3b54..5eecd4d 100644
--- a/build-with-debug-info.patch
+++ b/build-with-debug-info.patch
@@ -1,6 +1,6 @@
-From bec14dfead2251b6f89c6bc5a3a8d53e4acdde17 Mon Sep 17 00:00:00 2001
+From e8b2604bb642c39397caf91f361b3e51c8d79e5f Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
-Date: Thu, 14 May 2015 11:08:56 +0200
+Date: Wed, 20 May 2015 09:52:33 +0200
Subject: [PATCH] build with debug info
---
@@ -8,18 +8,18 @@ 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 9bd64c9..127bf8b 100644
+index 96caa0a..17f5d9f 100644
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
-@@ -324,12 +324,12 @@ kube::golang::build_binaries_for_platform() {
+@@ -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 "${output_path}/${bin}" \
+ 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 "${output_path}/${bin}" \
+ go build -o "${outfile}" \
"${goflags[@]:+${goflags[@]}}" \
- -ldflags "${version_ldflags}" \
+ -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \
diff --git a/kubernetes.spec b/kubernetes.spec
index 802dffd..ee64383 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 10339d72b66a31592f73797a9983e7c207481b22
+%global commit a76bdd97100c66a46e2b49288540dcec58a954c4
%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.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL: %{import_path}
@@ -297,7 +297,7 @@ Requires: NetworkManager
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.17.0-470-g10339d72b66a31
+export KUBE_GIT_VERSION=v0.17.0-529-ga6157994885bdd
%if 0%{?fedora}
#export KUBE_GIT_TREE_STATE="dirty"
@@ -429,6 +429,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
%systemd_postun
%changelog
+* Wed May 20 2015 jchaloup <jchaloup at redhat.com> - 0.17.0-12
+- Bump to upstream a76bdd97100c66a46e2b49288540dcec58a954c4
+ related: #1211266
+
* Tue May 19 2015 jchaloup <jchaloup at redhat.com> - 0.17.0-11
- Bump to upstream 10339d72b66a31592f73797a9983e7c207481b22
related: #1211266
diff --git a/sources b/sources
index a977a5f..0312990 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34b97066ec2559e18d14a25e5539c36f kubernetes-10339d7.tar.gz
+2a340ddecd7294ffd59e90fb2df430a5 kubernetes-a76bdd9.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f20&id=aa91709fc3ffe8cd29b2356c61d604216d1ae165
More information about the scm-commits
mailing list