[meta-virtualization][PATCH] container-dummy-provides: Blacklist for icecc

[meta-virtualization][PATCH] container-dummy-provides: Blacklist for icecc

[Douglas Royds]

${HOST_PREFIX} is empty, which triggers the "NULL prefix" error
from icecc.bbclass.

Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
---
 conf/layer.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/layer.conf b/conf/layer.conf
index 149b42e..84595cb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -59,3 +59,6 @@ USER_CLASSES:append = " meta-virt-k8s-cfg"
 USER_CLASSES:append = " meta-virt-xen-cfg"
 
 HOSTTOOLS_NONFATAL += "getent"
+
+# container-dummy-provides: ${HOST_PREFIX} is empty, which triggers the "NULL prefix" error
+ICECC_SYSTEM_PACKAGE_BL += "container-dummy-provides"
-- 
2.32.0

[meta-virtualization][PATCH] runtime-spec: master branch renamed as main

[Douglas Royds]

Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
---
 recipes-containers/crun/crun_git.bb                         | 2 +-
 recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb
index 68f7f43..7155494 100644
--- a/recipes-containers/crun/crun_git.bb
+++ b/recipes-containers/crun/crun_git.bb
@@ -12,7 +12,7 @@ SRCREV_yajl = "f344d21280c3e4094919fd318bc5ce75da91fc06"
 SRCREV_FORMAT = "crun_rspec"
 SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun;protocol=https \
            git://github.com/containers/libocispec.git;branch=main;name=libocispec;destsuffix=git/libocispec;protocol=https \
-           git://github.com/opencontainers/runtime-spec.git;branch=master;name=rspec;destsuffix=git/libocispec/runtime-spec;protocol=https \
+           git://github.com/opencontainers/runtime-spec.git;branch=main;name=rspec;destsuffix=git/libocispec/runtime-spec;protocol=https \
            git://github.com/opencontainers/image-spec.git;branch=main;name=ispec;destsuffix=git/libocispec/image-spec;protocol=https \
            git://github.com/containers/yajl.git;branch=main;name=yajl;destsuffix=git/libocispec/yajl;protocol=https \
           "
diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
index d30868c..5560827 100644
--- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
+++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://src/${PKG_NAME}/LICENSE;md5=b355a61a394a504dacde901c9
 SRCNAME = "runtime-spec"
 
 PKG_NAME = "github.com/opencontainers/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=master"
+SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME};branch=main"
 
 SRCREV = "ab23082b188344f6fbb63a441ea00ffc2852d06d"
 PV = "v1.0.2+git${SRCPV}"
-- 
2.32.0