From cb2d486817aeda3047edc6c460c88b11ed80afe8 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 27 Jun 2025 10:59:43 -0400
Subject: runc: start removing 'opencontainers' reference

We've only had one type of runc for a while, this is another step
in the direction of moving to just 'runc' versus the old runc-<foo>
variants

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 conf/layer.conf                                    |  2 +-
 recipes-containers/runc/runc-opencontainers_git.bb | 16 ----------------
 recipes-containers/runc/runc_git.bb                | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 recipes-containers/runc/runc-opencontainers_git.bb
 create mode 100644 recipes-containers/runc/runc_git.bb

diff --git a/conf/layer.conf b/conf/layer.conf
index d9fb11c5..9a443f9a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -39,7 +39,7 @@ LAYERRECOMMENDS_virtualization-layer = " \
 # Override security flags
 require conf/distro/include/virt_security_flags.inc
 
-PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
+PREFERRED_PROVIDER_virtual/runc ?= "runc"
 PREFERRED_PROVIDER_virtual/containerd ?= "containerd"
 PREFERRED_PROVIDER_virtual/docker ?= "docker-moby"
 
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb
deleted file mode 100644
index b84f666b..00000000
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include runc.inc
-
-SRCREV = "25d476443207db333bcc6dd076db7cd3a9eea1d7"
-SRC_URI = " \
-    git://github.com/opencontainers/runc;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
-    file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
-    "
-RUNC_VERSION = "1.2.0"
-
-# for compatibility with existing RDEPENDS that have existed since
-# runc-docker and runc-opencontainers were separate
-RPROVIDES:${PN} += "runc-docker"
-
-CVE_PRODUCT = "runc"
-
-LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}"
diff --git a/recipes-containers/runc/runc_git.bb b/recipes-containers/runc/runc_git.bb
new file mode 100644
index 00000000..10109f25
--- /dev/null
+++ b/recipes-containers/runc/runc_git.bb
@@ -0,0 +1,17 @@
+include runc.inc
+
+SRCREV = "25d476443207db333bcc6dd076db7cd3a9eea1d7"
+SRC_URI = " \
+    git://github.com/opencontainers/runc;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
+    file://0001-Makefile-respect-GOBUILDFLAGS-for-runc-and-remove-re.patch \
+    "
+RUNC_VERSION = "1.2.0"
+
+# for compatibility with existing RDEPENDS that have existed since
+# runc-docker and runc-opencontainers were separate
+RPROVIDES:${PN} += "runc-docker"
+RPROVIDES:${PN} += "runc-opencontainers"
+
+CVE_PRODUCT = "runc"
+
+LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}"
-- 
cgit v1.2.3-54-g00ecf