Bump runc to version v1.1.12-14-ge8bb71e1 with the following squashed
cherry-picks from master:
4cea448064d4 runc-opencontainers: update to 1.1.12
9213f05f5591 runc-opencontainers: update to 1.1.12
e4b6616a90e0 runc-opencontainers: update to 1.1.11
62ac94c50dff runc-opencontainers: update to 1.1.10
606fe98a9811 runc-opencontainers: update to 1.9.0
ea3b6a83981a runc-opencontainers: update to 1.1.8
5dda7078ba85 runc-opencontainers: update to 1.1.7-tip
b3fd5097ab34 runc-opencontainers: update to 1.1.7
ae91a8666a73 runc-opencontainers: update to 1.1.5
969daee49f1d runc-opencontainers: update to 1.1.0-tip
f281ad2d9650 runc-opencontainers: update to 1.4.0-tip
Signed-off-by: Jonas Gorski <[email protected]>
---
...spect-GOBUILDFLAGS-for-runc-and-remove-re.patch | 14 +++++++-------
recipes-containers/runc/runc-opencontainers_git.bb | 4 ++--
2 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 4d35e58e7f76..df9e1d8e2722 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
@@ -15,12 +15,12 @@ Index: git/src/import/Makefile
===================================================================
--- git.orig/src/import/Makefile
+++ git/src/import/Makefile
-@@ -20,7 +20,7 @@
- endif
+@@ -24,7 +24,7 @@
+ GO_BUILDMODE := "-buildmode=pie"
endif
endif
--GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags
"$(BUILDTAGS)" \
-+GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE)
$(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
- -ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION)
$(EXTRA_LDFLAGS)"
- GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build -trimpath $(EXTRA_FLAGS) -tags
"$(BUILDTAGS) netgo osusergo" \
- -ldflags "-extldflags -static -X main.gitCommit=$(COMMIT) -X
main.version=$(VERSION) $(EXTRA_LDFLAGS)"
+-GO_BUILD := $(GO) build -trimpath $(GO_BUILDMODE) \
++GO_BUILD := $(GO) build $(GOBUILDFLAGS) -trimpath $(GO_BUILDMODE) \
+ $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
+ -ldflags "$(LDFLAGS_COMMON) $(EXTRA_LDFLAGS)"
+
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb
b/recipes-containers/runc/runc-opencontainers_git.bb
index 59ddca9bb59e..48a64f20d7cc 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -1,10 +1,10 @@
include runc.inc
-SRCREV = "974efd2dfca0abec041a3708a2b66bfac6bd2484"
+SRCREV = "e8bb71e147d6044f57dfb5d4da619cf27f830c48"
SRC_URI = " \
git://github.com/opencontainers/runc;branch=release-1.1;protocol=https \
file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
"
-RUNC_VERSION = "1.1.4"
+RUNC_VERSION = "1.1.12"
CVE_PRODUCT = "runc"
--
2.53.0
--
BISDN GmbH
Körnerstraße 7-10
10785 Berlin
Germany
Phone: +49 30 610 816 100
Managing Directors: Dr.-Ing. Hagen Woesner, Andreas Köpsel
Commercial
register:
Amtsgericht Berlin-Charlottenburg HRB 141569 B
VAT ID No:
DE283257294
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9678):
https://lists.yoctoproject.org/g/meta-virtualization/message/9678
Mute This Topic: https://lists.yoctoproject.org/mt/118535117/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
