From 4093cbd1ab3b3f38fac1d51f1244ea8d91cee3ce Mon Sep 17 00:00:00 2001 From: Andrew Zammit Date: Sun, 21 Feb 2021 19:22:45 -0700 Subject: [PATCH] fix(csi-external-resizer): make patch for v1.1.0+, partially fixes #205 In the upstream build.make, line 74 was pushed to line 79 and the FULL_LDFLAGS abstraction was introduced. See https://github.com/kubernetes-csi/external-resizer/pull/122 Signed-off-by: Andrew Zammit --- build/csi-external-resizer/build.make.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/csi-external-resizer/build.make.patch b/build/csi-external-resizer/build.make.patch index 572293ef..aaea455c 100644 --- a/build/csi-external-resizer/build.make.patch +++ b/build/csi-external-resizer/build.make.patch @@ -1,11 +1,11 @@ ---- build.make 2020-09-27 11:10:40.917111259 +0100 -+++ build.make.new 2020-09-27 11:10:47.241142618 +0100 -@@ -74,7 +74,7 @@ +--- build.make 2021-02-21 19:14:05.314519040 -0700 ++++ build.make.new 2021-02-21 19:13:52.714757257 -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; \