summaryrefslogtreecommitdiffstats
path: root/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch')
-rw-r--r--recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch19
1 files changed, 8 insertions, 11 deletions
diff --git a/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch b/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch
index fa1f695b..8de1b170 100644
--- a/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch
+++ b/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch
@@ -9,18 +9,15 @@ Upstream-status: Inappropriate
9 Makefile | 1 - 9 Makefile | 1 -
10 1 file changed, 1 deletion(-) 10 1 file changed, 1 deletion(-)
11 11
12diff --git a/Makefile b/Makefile 12Index: git/src/import/Makefile
13index 0fcf508..24f47dc 100644 13===================================================================
14--- a/src/import/Makefile 14--- git.orig/src/import/Makefile
15+++ b/src/import/Makefile 15+++ git/src/import/Makefile
16@@ -38,7 +38,6 @@ contrib/cmd/recvtty/recvtty: $(SOURCES) 16@@ -40,7 +40,6 @@
17 17
18 static: $(SOURCES) 18 static: $(SOURCES)
19 CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc . 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 .
20- CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty 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
21 21
22 release: 22 release:
23 @flag_list=(seccomp selinux apparmor static); \ 23 script/release.sh -r release/$(VERSION) -v $(VERSION)
24--
252.7.4
26