fix(csi-external-snapshotter): make patch for v3.0.3+ and v4.0.0+ com…

…patibility In the upstream build.make, line 74 was pushed to line 79 and the FULL_LDFLAGS abstraction was introduced. See kubernetes-csi/external-snapshotter#437 Signed-off-by: Andrew Zammit <[email protected]>
zamnuts · Feb 22, 2021 · 6201ece · 6201ece
1 parent b77e440
commit 6201ece
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/build/csi-external-snapshotter/build.make.patch b/build/csi-external-snapshotter/build.make.patch
@@ -1,11 +1,11 @@
---- build.make	2020-05-23 16:43:42.192359292 +0100
-+++ build.make.new	2020-05-23 16:43:38.816342552 +0100
-@@ -74,7 +74,7 @@
- build-%: check-go-version-go
+--- build.make	2021-02-22 01:24:26.239883449 -0700
++++ build.make.new	2021-02-22 01:24:44.259376540 -0700
+@@ -79,7 +79,7 @@
+ $(CMDS:%=build-%): build-%: check-go-version-go
  	mkdir -p bin
  	echo '$(BUILD_PLATFORMS)' | tr ';' '\n' | while read -r os arch suffix; do \
--		if ! (set -x; CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o "./bin/$*$$suffix" ./cmd/$*); then \
-+		if ! (set -x; CGO_ENABLED=0 GOOS="$$os" go build $(GOFLAGS_VENDOR) -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o "./bin/$*$$suffix" ./cmd/$*); then \
+-		if ! (set -x; CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '$(FULL_LDFLAGS)' -o "./bin/$*$$suffix" ./cmd/$*); then \
++		if ! (set -x; CGO_ENABLED=0 GOOS="$$os" go build $(GOFLAGS_VENDOR) -a -ldflags '$(FULL_LDFLAGS)' -o "./bin/$*$$suffix" ./cmd/$*); then \
  			echo "Building $* for GOOS=$$os GOARCH=$$arch failed, see error(s) above."; \
  			exit 1; \
  		fi; \