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: update to 1.0.0-rc6

Browse Source 
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2019-02-11 01:21:53 +00:00
parent f4853222b5
commit ba2d65e6bc
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,8 +15,8 @@ Index: git/src/import/Makefile
@@ -41,7 +41,6 @@ @@ -41,7 +41,6 @@
static: $(SOURCES) static: $(SOURCES)
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 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 - CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo 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: release:
script/release.sh -r release/$(VERSION) -v $(VERSION) script/release.sh -r release/$(VERSION) -v $(VERSION)

7
recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
View File

@ -51,14 +51,13 @@ Index: git/src/import/signals.go
pid1, err := process.Pid() pid1, err := process.Pid()
if err != nil { if err != nil {
@@ -68,12 +66,61 @@ @@ -68,11 +66,60 @@
if h.notifySocket != nil { if h.notifySocket != nil {
if detach { if detach {
h.notifySocket.run(pid1) h.notifySocket.run(pid1)
- return 0, nil - return 0, nil
} else {
go h.notifySocket.run(0)
} }
go h.notifySocket.run(0)
} }
+ if (detach) { + if (detach) {
@ -118,7 +117,7 @@ Index: git/src/import/utils_linux.go
=================================================================== ===================================================================
--- git.orig/src/import/utils_linux.go --- git.orig/src/import/utils_linux.go
+++ git/src/import/utils_linux.go +++ git/src/import/utils_linux.go
@@ -338,7 +338,7 @@ @@ -347,7 +347,7 @@
if err != nil { if err != nil {
r.terminate(process) r.terminate(process)
} }

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

@ -4,11 +4,11 @@ RRECOMMENDS_${PN} = "lxc docker"
# 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 = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" SRCREV_runc-docker = "4a600c04ed480084b2351b3e32c26cb4a2d5d533"
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 \
file://0001-runc-docker-SIGUSR1-daemonize.patch \ file://0001-runc-docker-SIGUSR1-daemonize.patch \
" "
RUNC_VERSION = "1.0.0-rc5" RUNC_VERSION = "1.0.0-rc6"

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

@ -1,7 +1,7 @@
include runc.inc include runc.inc
SRCREV = "6a2c15596845f6ff5182e2022f38a65e5dfa88eb" SRCREV = "4a600c04ed480084b2351b3e32c26cb4a2d5d533"
SRC_URI = " \ SRC_URI = " \
git://github.com/opencontainers/runc;branch=master \ git://github.com/opencontainers/runc;branch=master \
" "
RUNC_VERSION = "1.0.0-rc5" RUNC_VERSION = "1.0.0-rc6"