summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/podman/podman_git.bb12
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index dd3e78d9..46c6c969 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -65,10 +65,13 @@ EXTRA_OEMAKE = " \
65 SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_user_unitdir} \ 65 SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_user_unitdir} \
66" 66"
67 67
68# remove 'docker' from the packageconfig if you don't want podman to 68# remove 'docker' from the features if you don't want podman to
69# build and install the docker wrapper. If docker is enabled in the 69# build and install the docker wrapper. If docker is enabled in the
70# packageconfig, the podman package will rconfict with docker. 70# variable, the podman package will rconfict with docker.
71PACKAGECONFIG ?= "docker" 71PODMAN_FEATURES ?= "docker"
72
73PACKAGECONFIG ?= ""
74PACKAGECONFIG[rootless] = ",,,fuse-overlayfs slirp4netns,,"
72 75
73do_compile() { 76do_compile() {
74 cd ${S}/src 77 cd ${S}/src
@@ -106,7 +109,7 @@ do_install() {
106 export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" 109 export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
107 110
108 oe_runmake install DESTDIR="${D}" 111 oe_runmake install DESTDIR="${D}"
109 if ${@bb.utils.contains('PACKAGECONFIG', 'docker', 'true', 'false', d)}; then 112 if ${@bb.utils.contains('PODMAN_FEATURES', 'docker', 'true', 'false', d)}; then
110 oe_runmake install.docker DESTDIR="${D}" 113 oe_runmake install.docker DESTDIR="${D}"
111 fi 114 fi
112 115
@@ -156,7 +159,6 @@ COMPATIBLE_HOST = "^(?!mips).*"
156RDEPENDS:${PN} += "\ 159RDEPENDS:${PN} += "\
157 catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper \ 160 catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper \
158 ${VIRTUAL-RUNTIME_container_dns} ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \ 161 ${VIRTUAL-RUNTIME_container_dns} ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \
159 ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \
160" 162"
161RRECOMMENDS:${PN} += "slirp4netns \ 163RRECOMMENDS:${PN} += "slirp4netns \
162 kernel-module-xt-masquerade \ 164 kernel-module-xt-masquerade \