diff options
Diffstat (limited to 'recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch')
| -rw-r--r-- | recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index c855d7b5..9e5a8313 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch @@ -4,6 +4,8 @@ Date: Tue, 24 Aug 2021 11:38:23 -0400 Subject: [PATCH] Makefile: respect GOBUILDFLAGS for runc and remove recvtty from static +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [bva: refreshed for release 1.0.2] Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> @@ -11,27 +13,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/src/import/Makefile b/src/import/Makefile -index efbddf0d..4b174c80 100644 ---- a/src/import/Makefile -+++ b/src/import/Makefile -@@ -24,7 +24,7 @@ ifeq ($(shell $(GO) env GOOS),linux) - endif +Index: git/src/import/Makefile +=================================================================== +--- git.orig/src/import/Makefile ++++ git/src/import/Makefile +@@ -24,7 +24,7 @@ + GO_BUILDMODE := "-buildmode=pie" endif endif --GO_BUILD := $(GO) build -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ -+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ - -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)" - GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \ - -ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)" -@@ -41,7 +41,6 @@ recvtty: - - static: - $(GO_BUILD_STATIC) -o runc . -- $(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty +-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \ ++GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \ + $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ + -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)" - release: - script/release.sh -r release/$(VERSION) -v $(VERSION) --- -2.19.1 - |