crun setup

eclipse-leda · Sep 12, 2023 · e88b1e4 · e88b1e4
1 parent d1a77c9
commit e88b1e4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core.bb b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-core.bb
@@ -23,12 +23,13 @@ RDEPENDS:${PN} = "\
     rauc \
     mosquitto \
     container-management \
+    crun \
+    wasmedge \
     update-manager \
     kanto-auto-deployer \
     leda-utils \
     openvpn \
     vss-releases \
-    wasmedge \
     "
 
 RDEPENDS:${PN}:append = " ${@bb.utils.contains("DISTRO_FEATURES", "airgap-containers", "airgap-container-installer", "", d)}"
diff --git a/meta-leda-distro/recipes-containers/containerd/files/config.toml b/meta-leda-distro/recipes-containers/containerd/files/config.toml
@@ -1 +1,11 @@
 root = "/data/var/containerd"
+
+# crun is ignored by ctr and nerdctl, see: https://github.com/containerd/containerd/discussions/6162#discussioncomment-1539263
+version = 2
+[plugins."io.containerd.grpc.v1.cri".containerd]
+  default_runtime_name = "crun"
+  [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
+    [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun]
+      runtime_type = "io.containerd.runc.v2"
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun.options]
+        BinaryName = "/usr/bin/crun"
diff --git a/meta-leda-distro/recipes-containers/crun/crun_%.bbappend b/meta-leda-distro/recipes-containers/crun/crun_%.bbappend
@@ -0,0 +1,9 @@
+EXTRA_OECONF += "--with-wasmedge"
+DEPENDS += "wasmedge"
+
+# for compatibility for wasmedge, compile newer revisions for mickledore
+SRCREV_crun = "d2ff390d37ca163ebff2467382b3a6d6c77c5ca6"
+SRCREV_libocispec = "23aed835eed8d81d124977583551a81abe595a0c"
+SRCREV_ispec = "4df8887994e871a59f9e30e8dd811d060f6a39ef"
+SRCREV_rspec = "494a5a6aca782455c0fbfc35af8e12f04e98a55e"
+SRCREV_yajl = "f344d21280c3e4094919fd318bc5ce75da91fc06"