jchaloup pushed to kubernetes (master). "Rename patch"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 15 15:10:13 UTC 2015


>From c5c320224ad5e6b40524730441b461bb49864425 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 15 Apr 2015 12:51:39 +0200
Subject: Rename patch


diff --git a/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch b/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
deleted file mode 100644
index 8f91c3a..0000000
--- a/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e1cf168d92f155e478cd56c3b78ac4dee155237 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup at redhat.com>
-Date: Tue, 7 Apr 2015 16:06:19 +0200
-Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not
- installed
-
----
- hack/lib/golang.sh | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index 5dc923f..588992b 100644
---- a/hack/lib/golang.sh
-+++ b/hack/lib/golang.sh
-@@ -276,7 +276,6 @@ kube::golang::build_binaries_for_platform() {
-   local -a nonstatics=()
-   for binary in "${binaries[@]}"; do
-     if kube::golang::is_statically_linked_library "${binary}"; then
--      kube::golang::exit_if_stdlib_not_installed;
-       statics+=($binary)
-     else
-       nonstatics+=($binary)
-@@ -298,7 +297,6 @@ kube::golang::build_binaries_for_platform() {
-       fi
- 
-       if kube::golang::is_statically_linked_library "${binary}"; then
--        kube::golang::exit_if_stdlib_not_installed;
-         CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \
-           "${goflags[@]:+${goflags[@]}}" \
-           -ldflags "${version_ldflags}" \
--- 
-1.9.3
-
diff --git a/No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch b/No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
new file mode 100644
index 0000000..8f91c3a
--- /dev/null
+++ b/No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
@@ -0,0 +1,33 @@
+From 9e1cf168d92f155e478cd56c3b78ac4dee155237 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Tue, 7 Apr 2015 16:06:19 +0200
+Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not
+ installed
+
+---
+ hack/lib/golang.sh | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 5dc923f..588992b 100644
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -276,7 +276,6 @@ kube::golang::build_binaries_for_platform() {
+   local -a nonstatics=()
+   for binary in "${binaries[@]}"; do
+     if kube::golang::is_statically_linked_library "${binary}"; then
+-      kube::golang::exit_if_stdlib_not_installed;
+       statics+=($binary)
+     else
+       nonstatics+=($binary)
+@@ -298,7 +297,6 @@ kube::golang::build_binaries_for_platform() {
+       fi
+ 
+       if kube::golang::is_statically_linked_library "${binary}"; then
+-        kube::golang::exit_if_stdlib_not_installed;
+         CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \
+           "${goflags[@]:+${goflags[@]}}" \
+           -ldflags "${version_ldflags}" \
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index d79e926..39c11fa 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -21,7 +21,7 @@ License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
 ExclusiveArch:	x86_64
 Source0:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-%{shortcommit}.tar.gz
-Patch0:		0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
+Patch0:		No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
 
 %if 0%{?fedora} >= 21 || 0%{?rhel}
 Requires:	docker
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=master&id=c5c320224ad5e6b40524730441b461bb49864425


More information about the scm-commits mailing list