summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch (renamed from recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch)0
-rw-r--r--recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch (renamed from recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch)0
-rw-r--r--recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch (renamed from recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch)0
-rw-r--r--recipes-containers/containerd/containerd_git.bb (renamed from recipes-containers/containerd/containerd-opencontainers_git.bb)8
4 files changed, 5 insertions, 3 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
index 63498a86..63498a86 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch b/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch
index 74e313b5..74e313b5 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
+++ b/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
index 62580c6c..62580c6c 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
+++ b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd_git.bb
index ed73e398..4d900d01 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -21,8 +21,11 @@ CVE_VERSION = "v2.0.0-beta.0"
21 21
22# EXTRA_OEMAKE += "GODEBUG=1" 22# EXTRA_OEMAKE += "GODEBUG=1"
23 23
24PROVIDES += "virtual/containerd" 24# containerd-opencontainers is to provide compatibility with external
25RPROVIDES:${PN} = "virtual-containerd" 25# packagegroups / recipes that depend on the existing split of containerd
26# between docker and opencontainers. We can drop it in the future.
27PROVIDES += "virtual/containerd containerd-opencontainers"
28RPROVIDES:${PN} = "virtual-containerd containerd-opencontainers"
26 29
27S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2" 30S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2"
28 31
@@ -96,4 +99,3 @@ COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
96 99
97RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}" 100RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
98 101
99CVE_PRODUCT = "containerd"