jcapik pushed to kubernetes (f22). "Bump to upstream 5010b2dde0f9b9eb820fe047e3b34bc9fa6324de (..more)"

[notifications at fedoraproject.org]

From 45460f1ea62780be6b61a12201db96ba81c2258e Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Thu, 14 May 2015 11:26:51 +0200
Subject: Bump to upstream 5010b2dde0f9b9eb820fe047e3b34bc9fa6324de Add debug
 info - related: #1211266


diff --git a/.gitignore b/.gitignore
index 0d6b518..32d4ca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-ec19d41.tar.gz
+/kubernetes-5010b2d.tar.gz
diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch
new file mode 100644
index 0000000..37a3b54
--- /dev/null
+++ b/build-with-debug-info.patch
@@ -0,0 +1,31 @@
+From bec14dfead2251b6f89c6bc5a3a8d53e4acdde17 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Thu, 14 May 2015 11:08:56 +0200
+Subject: [PATCH] build with debug info
+
+---
+ hack/lib/golang.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 9bd64c9..127bf8b 100644
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -324,12 +324,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}" \
+           "${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}" \
+           "${goflags[@]:+${goflags[@]}}" \
+-          -ldflags "${version_ldflags}" \
++          -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') ${version_ldflags}" \
+           "${binary}"
+       fi
+       kube::log::progress "*"
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 2651fc0..48ea929 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,12 +1,16 @@
-#debuginfo not supported with Go
-%global debug_package	%{nil}
+%if 0%{?fedora}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
 %global provider	github
 %global provider_tld	com
 %global project		GoogleCloudPlatform
 %global repo		kubernetes
 # https://github.com/GoogleCloudPlatform/kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		ec19d41b63f5fe7b2c939e7738a41c0fbe65d796
+%global commit		5010b2dde0f9b9eb820fe047e3b34bc9fa6324de
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -16,13 +20,17 @@
 
 Name:		kubernetes
 Version:	0.17.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
 ExclusiveArch:  x86_64
 Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
+%if 0%{?fedora}
+Patch0:         build-with-debug-info.patch
+%endif
+
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
 
@@ -284,7 +292,7 @@ Requires: NetworkManager
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.17.0-86-gec19d41b63f5fe
+export KUBE_GIT_VERSION=v0.17.0-170-g5010b2dde0f9b9
 
 %if 0%{?fedora}
 #export KUBE_GIT_TREE_STATE="dirty"
@@ -416,6 +424,11 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Thu May 14 2015 jchaloup <jchaloup at redhat.com> - 0.17.0-4
+- Bump to upstream 5010b2dde0f9b9eb820fe047e3b34bc9fa6324de
+- Add debug info
+  related: #1211266
+
 * Wed May 13 2015 jchaloup <jchaloup at redhat.com> - 0.17.0-3
 - Bump to upstream ec19d41b63f5fe7b2c939e7738a41c0fbe65d796
   related: #1211266
diff --git a/sources b/sources
index 1245ff9..f446b6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f01d2b4783a60996d79afc1c71010825  kubernetes-ec19d41.tar.gz
+05dcaa32e156de01773e3c18e5be0ca4  kubernetes-5010b2d.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f22&id=45460f1ea62780be6b61a12201db96ba81c2258e