diff options
Diffstat (limited to 'recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch')
| -rw-r--r-- | recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch b/recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch index f885aaf7..faeac46f 100644 --- a/recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch +++ b/recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch | |||
| @@ -8,20 +8,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | |||
| 8 | Makefile | 3 +-- | 8 | Makefile | 3 +-- |
| 9 | 1 file changed, 1 insertion(+), 2 deletions(-) | 9 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 10 | 10 | ||
| 11 | diff --git a/src/import/Makefile b/src/import/Makefile | 11 | Index: git/src/import/Makefile |
| 12 | index c6de11d..0e9bddb 100644 | 12 | =================================================================== |
| 13 | --- a/src/import/Makefile | 13 | --- git.orig/src/import/Makefile |
| 14 | +++ b/src/import/Makefile | 14 | +++ git/src/import/Makefile |
| 15 | @@ -39,8 +39,7 @@ contrib/cmd/recvtty/recvtty: $(SOURCES) | 15 | @@ -41,7 +41,6 @@ |
| 16 | $(GO) build -buildmode=pie $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty | ||
| 17 | 16 | ||
| 18 | static: $(SOURCES) | 17 | static: $(SOURCES) |
| 19 | - CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo cgo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . | 18 | CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo cgo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . |
| 20 | - CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo cgo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty | 19 | - CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo cgo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty |
| 21 | + CGO_ENABLED=1 $(GO) build -tags "$(BUILDTAGS) netgo cgo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" $(GOBUILDFLAGS) -o runc . | ||
| 22 | 20 | ||
| 23 | release: | 21 | release: |
| 24 | script/release.sh -r release/$(VERSION) -v $(VERSION) | 22 | script/release.sh -r release/$(VERSION) -v $(VERSION) |
| 25 | -- | ||
| 26 | 2.7.4 | ||
| 27 | |||