From 100fb480e7fa7646682891307a9091e07e7981cd Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 2 Nov 2018 21:18:15 -0400 Subject: runc: refresh to tip of tree docker/k8s and other components have been refreshed to the 18.09 release tags. So we update runc to keep in sync. Signed-off-by: Bruce Ashfield --- ...0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch | 19 +++++++------------ recipes-containers/runc/runc-docker_git.bb | 2 +- recipes-containers/runc/runc-opencontainers_git.bb | 2 +- 3 files changed, 9 insertions(+), 14 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 Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/src/import/Makefile b/src/import/Makefile -index c6de11d..0e9bddb 100644 ---- a/src/import/Makefile -+++ b/src/import/Makefile -@@ -39,8 +39,7 @@ contrib/cmd/recvtty/recvtty: $(SOURCES) - $(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 +Index: git/src/import/Makefile +=================================================================== +--- git.orig/src/import/Makefile ++++ git/src/import/Makefile +@@ -41,7 +41,6 @@ static: $(SOURCES) -- 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 . -- 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 -+ 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 . + 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 . +- 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 release: script/release.sh -r release/$(VERSION) -v $(VERSION) --- -2.7.4 - diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index 81e5a5d4..02bda318 100644 --- a/recipes-containers/runc/runc-docker_git.bb +++ b/recipes-containers/runc/runc-docker_git.bb @@ -2,7 +2,7 @@ include runc.inc # Note: this rev is before the required protocol field, update when all components # have been updated to match. -SRCREV_runc-docker = "4fc53a81fb7c994640722ac585fa9ca548971871" +SRCREV_runc-docker = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \ file://0001-runc-Add-console-socket-dev-null.patch \ file://0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch \ diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index ed48abf6..eaee8efa 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb @@ -1,6 +1,6 @@ include runc.inc -SRCREV = "58415b4b12650291f435db8770cea48207b78afe" +SRCREV = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" SRC_URI = " \ git://github.com/opencontainers/runc;branch=master \ " -- cgit v1.2.3-54-g00ecf