6 files changed, 33 insertions, 92 deletions

diff --git a/recipes-core/bind/bind_virtualization.inc b/recipes-core/bind/bind_virtualization.inc
index a6e39049..bb4e22b2 100644
--- a/recipes-core/bind/bind_virtualization.inc
+++ b/recipes-core/bind/bind_virtualization.inc
@@ -1,4 +1,4 @@
 # Tell named not to bother listening on the IP address that lxc and libvirtd handles itself.
 do_install:append() {
-        sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc and libvirtd would take care of this address itself\n\tlisten-on { ! 10.0.3.1; ! 192.168.122.1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options
+        sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc and libvirtd would take care of this address itself\n\tlisten-on { ! 10.0.3.1; ! 192.168.122.1; any;};\n\tlisten-on-v6 { ! fc42:5009:ba4b:5ab0::1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options
 }
diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index 4b1ad009..f5e20344 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -11,6 +11,9 @@ PACKAGES = "\
     packagegroup-lxc \
     packagegroup-docker \
     packagegroup-oci \
+    packagegroup-cni \
+    packagegroup-netavark \
+    packagegroup-container-tools \
     ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp ipv6', \
                          'packagegroup-podman', '', d)} \
     packagegroup-containerd \
@@ -36,8 +39,28 @@ RDEPENDS:packagegroup-podman = " \
     podman \
 "
 
+RDEPENDS:packagegroup-cni = " \
+    cni \
+    iptables \
+    iproute2 \
+    ipset \
+    bridge-utils \
+"
+
+RDEPENDS:packagegroup-netavark = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'netavark aardvark-dns', '', d)} \
+"
+
+RDEPENDS:packagegroup-container-tools = " \
+    skopeo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'conmon', '', d)} \
+    umoci \
+    ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine','podman','podman-tui nerdctl podman-compose','',d)}  \
+    ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','docker docker-moby','docker-compose','',d)}  \
+"
+
 RDEPENDS:packagegroup-oci = " \
-    virtual-runc \
+    ${VIRTUAL-RUNTIME_container_runtime} \
     oci-systemd-hook \
     oci-runtime-tools \
     oci-image-tools \
@@ -45,5 +68,9 @@ RDEPENDS:packagegroup-oci = " \
 
 RDEPENDS:packagegroup-containerd = " \
     virtual-containerd \
+    packagegroup-cni \
+    containerd-cni \
+    nerdctl \
+    tini \
 "
 
diff --git a/recipes-core/packagegroups/packagegroup-kubernetes.bb b/recipes-core/packagegroups/packagegroup-kubernetes.bb
index d518fc15..e06b1cb4 100644
--- a/recipes-core/packagegroups/packagegroup-kubernetes.bb
+++ b/recipes-core/packagegroups/packagegroup-kubernetes.bb
@@ -28,6 +28,7 @@ RDEPENDS:packagegroup-kubernetes-base = " \
 RDEPENDS:packagegroup-k8s-host = " \
     packagegroup-kubernetes-base \
     kubernetes \
+    cri-tools \
 "
 
 RDEPENDS:packagegroup-k8s-node = " \
diff --git a/recipes-core/runv/runv_git.bb b/recipes-core/runv/runv_git.bb
deleted file mode 100644
index 73cd81a6..00000000
--- a/recipes-core/runv/runv_git.bb
+++ /dev/null
@@ -1,87 +0,0 @@
-HOMEPAGE = "https://github.com/hyperhq/runv"
-SUMMARY = "Hypervisor-based Runtime for OCI"
-DESCRIPTION = "Hypervisor-based Runtime for OCI"
-
-SRCREV_runv = "b360a686abc6c6e896382990ef1b93ef07c7a677"
-SRC_URI = "\
-        git://github.com/hyperhq/runv.git;nobranch=1;name=runv;protocol=https \
-        "
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4106a50540bdec3b9734f9c70882d382"
-
-GO_IMPORT = "import"
-
-PV = "0.4.0+git${SRCREV_runv}"
-
-inherit go
-inherit goarch
-inherit pkgconfig
-inherit autotools-brokensep
-
-# accord with qemu
-COMPATIBLE_HOST:mipsarchn32 = "null"
-COMPATIBLE_HOST:mipsarchn64 = "null"
-COMPATIBLE_HOST:riscv32 = "null"
-COMPATIBLE_HOST:powerpc = "null"
-
-PACKAGECONFIG[xen] = "--with-xen,--without-xen,"
-AUTOTOOLS_SCRIPT_PATH = "${S}/src/import/"
-
-RDEPENDS:${PN} += " qemu hyperstart"
-
-do_compile() {
-        export GOARCH="${TARGET_GOARCH}"
-        export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
-        export GOPATH="${S}/src/import:${S}/src/import/vendor"
-
-        # Pass the needed cflags/ldflags so that cgo
-        # can find the needed headers files and libraries
-        export CGO_ENABLED="1"
-        export CFLAGS=""
-        export LDFLAGS=""
-        export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-        export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
-        # link fixups for compilation
-        rm -f ${S}/src/import/vendor/src
-        ln -sf ./ ${S}/src/import/vendor/src
-
-        mkdir -p ${S}/src/import/vendor/github.com/hyperhq/runv
-
-        echo fff
-        pwd
-        ln -sf src/import/cli
-        ln -sf ../../../../api ${S}/src/import/vendor/github.com/hyperhq/runv/api
-        ln -sf ../../../../cli ${S}/src/import/vendor/github.com/hyperhq/runv/cli
-        ln -sf ../../../../lib ${S}/src/import/vendor/github.com/hyperhq/runv/lib
-        ln -sf ../../../../driverloader ${S}/src/import/vendor/github.com/hyperhq/runv/driverloader
-        ln -sf ../../../../factory ${S}/src/import/vendor/github.com/hyperhq/runv/factory
-        ln -sf ../../../../hyperstart ${S}/src/import/vendor/github.com/hyperhq/runv/hyperstart
-        ln -sf ../../../../hypervisor ${S}/src/import/vendor/github.com/hyperhq/runv/hypervisor
-        ln -sf ../../../../template ${S}/src/import/vendor/github.com/hyperhq/runv/template
-
-        export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
-        export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
-
-        # Pass the needed cflags/ldflags so that cgo
-        # can find the needed headers files and libraries
-        export CGO_ENABLED="1"
-        export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-        export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-
-        oe_runmake build-runv
-}
-
-do_install() {
-    localbindir="/usr/local/bin"
-
-    install -d ${D}${localbindir}
-    install -m 755 ${S}/runv ${D}/${localbindir}
-}
-
-deltask compile_ptest_base
-
-FILES:${PN} += "/usr/local/bin/*"
-
-INSANE_SKIP:${PN} += "ldflags already-stripped"
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb
index 831360ba..b3250322 100644
--- a/recipes-core/runx/runx_git.bb
+++ b/recipes-core/runx/runx_git.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "Xen Runtime for OCI"
 
 SRCREV_runx = "edc9350a79ede0365066c9743080e3dc6430d602"
 
-KERNEL_SRC_VER="linux-5.4"
-KERNEL_URL_VER="v5.x"
+KERNEL_SRC_VER = "linux-5.4"
+KERNEL_URL_VER = "v5.x"
 
 SRC_URI = "\
           git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
diff --git a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
index bf52da0e..5010dfd3 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
+++ b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
@@ -4,6 +4,6 @@ SRC_URI += "file://getty-wrapper"
 
 do_install:append() {
     install -d ${D}${base_sbindir}
-    install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
+    install -m 0755 ${UNPACKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
 }
 FILES:${PN} += "${base_sbindir}/getty-wrapper"