diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-05-07 02:32:05 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-01-21 18:00:26 -0500 |
| commit | 85be1b56ea154427e018ccf460d5fb9398de1cde (patch) | |
| tree | 4aea99d710c3965d9e0f67b24eb6aaf6bfe23f11 | |
| parent | f7008cd7011e314e3bd2dbe5e9e35faff7382ced (diff) | |
| download | meta-virtualization-85be1b56ea154427e018ccf460d5fb9398de1cde.tar.gz | |
WIP: not for merge. podman-native
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-containers/conmon/conmon_git.bb | 3 | ||||
| -rw-r--r-- | recipes-containers/crun/crun_git.bb | 6 | ||||
| -rw-r--r-- | recipes-containers/podman/podman_git.bb | 20 |
3 files changed, 28 insertions, 1 deletions
diff --git a/recipes-containers/conmon/conmon_git.bb b/recipes-containers/conmon/conmon_git.bb index 04f22a2e..98adfc2a 100644 --- a/recipes-containers/conmon/conmon_git.bb +++ b/recipes-containers/conmon/conmon_git.bb | |||
| @@ -28,3 +28,6 @@ PACKAGECONFIG[systemd] = ",,systemd" | |||
| 28 | do_install() { | 28 | do_install() { |
| 29 | oe_runmake 'DESTDIR=${D}' install | 29 | oe_runmake 'DESTDIR=${D}' install |
| 30 | } | 30 | } |
| 31 | |||
| 32 | BBCLASSEXTEND = "native" | ||
| 33 | REQUIRED_DISTRO_FEATURES:class-native ?= "" | ||
diff --git a/recipes-containers/crun/crun_git.bb b/recipes-containers/crun/crun_git.bb index edaf15b8..7653bf9e 100644 --- a/recipes-containers/crun/crun_git.bb +++ b/recipes-containers/crun/crun_git.bb | |||
| @@ -21,7 +21,7 @@ SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun;protocol=h | |||
| 21 | 21 | ||
| 22 | PV = "v1.24.0+git" | 22 | PV = "v1.24.0+git" |
| 23 | 23 | ||
| 24 | inherit autotools-brokensep pkgconfig | 24 | inherit autotools-brokensep pkgconfig features_check |
| 25 | 25 | ||
| 26 | # if this is true, we'll symlink crun to runc for easier integration | 26 | # if this is true, we'll symlink crun to runc for easier integration |
| 27 | # with container stacks | 27 | # with container stacks |
| @@ -56,3 +56,7 @@ do_install() { | |||
| 56 | ln -sr "${D}/${bindir}/crun" "${D}${bindir}/runc" | 56 | ln -sr "${D}/${bindir}/crun" "${D}${bindir}/runc" |
| 57 | fi | 57 | fi |
| 58 | } | 58 | } |
| 59 | |||
| 60 | REQUIRED_DISTRO_FEATURES:class-native ?= "" | ||
| 61 | DEPENDS:class-native += "yajl libcap go-md2man m4 libseccomp" | ||
| 62 | BBCLASSEXTEND = "native" | ||
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index f09e01f8..2a485cda 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb | |||
| @@ -8,6 +8,7 @@ DESCRIPTION = "Podman is a daemonless container engine for developing, \ | |||
| 8 | 8 | ||
| 9 | inherit features_check | 9 | inherit features_check |
| 10 | REQUIRED_DISTRO_FEATURES ?= "seccomp ipv6" | 10 | REQUIRED_DISTRO_FEATURES ?= "seccomp ipv6" |
| 11 | REQUIRED_DISTRO_FEATURES:class-native ?= "" | ||
| 11 | 12 | ||
| 12 | DEPENDS = " \ | 13 | DEPENDS = " \ |
| 13 | gpgme \ | 14 | gpgme \ |
| @@ -146,6 +147,11 @@ RDEPENDS:${PN} += "\ | |||
| 146 | catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} gpgme iptables libdevmapper \ | 147 | catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} gpgme iptables libdevmapper \ |
| 147 | ${VIRTUAL-RUNTIME_container_dns} ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \ | 148 | ${VIRTUAL-RUNTIME_container_dns} ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \ |
| 148 | " | 149 | " |
| 150 | |||
| 151 | DEPENDS:class-native += " conmon" | ||
| 152 | RDEPENDS:${PN}:class-native = "" | ||
| 153 | RRECOMMENDS:${PN}:class-native = "" | ||
| 154 | |||
| 149 | RRECOMMENDS:${PN} += "slirp4netns \ | 155 | RRECOMMENDS:${PN} += "slirp4netns \ |
| 150 | kernel-module-xt-masquerade \ | 156 | kernel-module-xt-masquerade \ |
| 151 | kernel-module-xt-comment \ | 157 | kernel-module-xt-comment \ |
| @@ -155,3 +161,17 @@ RRECOMMENDS:${PN} += "slirp4netns \ | |||
| 155 | kernel-module-xt-tcpudp \ | 161 | kernel-module-xt-tcpudp \ |
| 156 | " | 162 | " |
| 157 | RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" | 163 | RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" |
| 164 | |||
| 165 | RDEPENDS:${PN}-ptest += " \ | ||
| 166 | bash \ | ||
| 167 | bats \ | ||
| 168 | buildah \ | ||
| 169 | coreutils \ | ||
| 170 | file \ | ||
| 171 | gnupg \ | ||
| 172 | jq \ | ||
| 173 | make \ | ||
| 174 | skopeo \ | ||
| 175 | tar \ | ||
| 176 | " | ||
| 177 | BBCLASSEXTEND = "native" | ||
