diff options
3 files changed, 9 insertions, 9 deletions
diff --git a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch index 9e5a8313..1e0aaf7e 100644 --- a/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch +++ b/recipes-containers/runc/files/0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch | |||
@@ -17,12 +17,12 @@ Index: git/src/import/Makefile | |||
17 | =================================================================== | 17 | =================================================================== |
18 | --- git.orig/src/import/Makefile | 18 | --- git.orig/src/import/Makefile |
19 | +++ git/src/import/Makefile | 19 | +++ git/src/import/Makefile |
20 | @@ -24,7 +24,7 @@ | 20 | @@ -37,7 +37,7 @@ |
21 | GO_BUILDMODE := "-buildmode=pie" | 21 | GO_BUILDMODE := "-buildmode=pie" |
22 | endif | 22 | endif |
23 | endif | 23 | endif |
24 | -GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \ | 24 | -GO_BUILD := $(GO) build $(TRIMPATH) $(GO_BUILDMODE) \ |
25 | +GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \ | 25 | +GO_BUILD := $(GO) build $(GOBUILDFLAGS) $(TRIMPATH) $(GO_BUILDMODE) \ |
26 | $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ | 26 | $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \ |
27 | -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)" | 27 | -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)" |
28 | 28 | ||
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb index 793df145..9b4376de 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. |
5 | SRCREV_runc-docker = "a9833ff391a71b30069a6c3f816db113379a4346" | 5 | SRCREV_runc-docker = "3778ae603c706494fd1e2c2faf83b406e38d687d" |
6 | SRC_URI = "git://github.com/opencontainers/runc;branch=release-1.1;name=runc-docker;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | 6 | SRC_URI = "git://github.com/opencontainers/runc;branch=main;name=runc-docker;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
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 | ||
12 | RUNC_VERSION = "1.1.12" | 12 | RUNC_VERSION = "1.2.0-rc.2" |
13 | 13 | ||
14 | CVE_PRODUCT = "runc" | 14 | CVE_PRODUCT = "runc" |
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index 3b5a9259..69468443 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | include runc.inc | 1 | include runc.inc |
2 | 2 | ||
3 | SRCREV = "e8bb71e147d6044f57dfb5d4da619cf27f830c48" | 3 | SRCREV = "3778ae603c706494fd1e2c2faf83b406e38d687d" |
4 | SRC_URI = " \ | 4 | SRC_URI = " \ |
5 | git://github.com/opencontainers/runc;branch=release-1.1;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | 5 | git://github.com/opencontainers/runc;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
6 | file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ | 6 | file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \ |
7 | " | 7 | " |
8 | RUNC_VERSION = "1.1.12" | 8 | RUNC_VERSION = "1.2.0-rc.2" |
9 | 9 | ||
10 | CVE_PRODUCT = "runc" | 10 | CVE_PRODUCT = "runc" |
11 | 11 | ||