MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

runc: refresh to tip of tree

Browse Source 
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 <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2018-11-02 21:18:15 -04:00
parent 86db36879f
commit 100fb480e7
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
recipes-containers/runc/runc-docker/0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch
View File

@ -8,20 +8,15 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Makefile | 3 +-- Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/import/Makefile b/src/import/Makefile Index: git/src/import/Makefile
index c6de11d..0e9bddb 100644 ===================================================================
--- a/src/import/Makefile --- git.orig/src/import/Makefile
+++ b/src/import/Makefile +++ git/src/import/Makefile
@@ -39,8 +39,7 @@ contrib/cmd/recvtty/recvtty: $(SOURCES) @@ -41,7 +41,6 @@
$(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
static: $(SOURCES) 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 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 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 $(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
+ 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 .
release: release:
script/release.sh -r release/$(VERSION) -v $(VERSION) script/release.sh -r release/$(VERSION) -v $(VERSION)
--
2.7.4

2
recipes-containers/runc/runc-docker_git.bb
View File

@ -2,7 +2,7 @@ include runc.inc
# Note: this rev is before the required protocol field, update when all components # Note: this rev is before the required protocol field, update when all components
# have been updated to match. # 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 \ SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \
file://0001-runc-Add-console-socket-dev-null.patch \ file://0001-runc-Add-console-socket-dev-null.patch \
file://0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch \ file://0001-build-drop-recvtty-and-use-GOBUILDFLAGS.patch \

2
recipes-containers/runc/runc-opencontainers_git.bb
View File

@ -1,6 +1,6 @@
include runc.inc include runc.inc
SRCREV = "58415b4b12650291f435db8770cea48207b78afe" SRCREV = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb"
SRC_URI = " \ SRC_URI = " \
git://github.com/opencontainers/runc;branch=master \ git://github.com/opencontainers/runc;branch=master \
" "