summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch8
-rw-r--r--recipes-containers/runc/runc-docker_git.bb6
2 files changed, 7 insertions, 7 deletions
diff --git a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
index 98b02044..4350c40f 100644
--- a/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
+++ b/recipes-containers/runc/runc-docker/0001-runc-docker-SIGUSR1-daemonize.patch
@@ -56,11 +56,11 @@ Index: git/src/import/signals.go
56@@ -67,12 +66,61 @@ 56@@ -67,12 +66,61 @@
57 if h.notifySocket != nil { 57 if h.notifySocket != nil {
58 if detach { 58 if detach {
59 h.notifySocket.run(pid1) 59 _ = h.notifySocket.run(pid1)
60- return 0, nil 60- return 0, nil
61 } 61 }
62 h.notifySocket.run(os.Getpid()) 62 _ = h.notifySocket.run(os.Getpid())
63 go h.notifySocket.run(0) 63 go func() { _ = h.notifySocket.run(0) }()
64 } 64 }
65 65
66+ if (detach) { 66+ if (detach) {
@@ -120,7 +120,7 @@ Index: git/src/import/utils_linux.go
120=================================================================== 120===================================================================
121--- git.orig/src/import/utils_linux.go 121--- git.orig/src/import/utils_linux.go
122+++ git/src/import/utils_linux.go 122+++ git/src/import/utils_linux.go
123@@ -349,7 +349,7 @@ 123@@ -345,7 +345,7 @@
124 if err != nil { 124 if err != nil {
125 r.terminate(process) 125 r.terminate(process)
126 } 126 }
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb
index ff142d00..a6ec812d 100644
--- a/recipes-containers/runc/runc-docker_git.bb
+++ b/recipes-containers/runc/runc-docker_git.bb
@@ -2,13 +2,13 @@ include runc.inc
2 2
3# Note: this rev is before the required protocol field, update when all components 3# Note: this rev is before the required protocol field, update when all components
4# have been updated to match. 4# have been updated to match.
5SRCREV_runc-docker = "249bca0a1316129dcd5bd38b5d75572274181cb5" 5SRCREV_runc-docker = "bfcbc947d5d11327f2680047e2e6e94f4ee93d2a"
6SRC_URI = "git://github.com/opencontainers/runc;nobranch=1;name=runc-docker \ 6SRC_URI = "git://github.com/opencontainers/runc;branch=master;name=runc-docker \
7 file://0001-runc-Add-console-socket-dev-null.patch \ 7 file://0001-runc-Add-console-socket-dev-null.patch \
8 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ 8 file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
9 file://0001-runc-docker-SIGUSR1-daemonize.patch \ 9 file://0001-runc-docker-SIGUSR1-daemonize.patch \
10 " 10 "
11 11
12RUNC_VERSION = "1.0.0-rc93" 12RUNC_VERSION = "1.0.0-rc95"
13 13
14CVE_PRODUCT = "runc" 14CVE_PRODUCT = "runc"