2 files changed, 22 insertions, 52 deletions

diff --git a/recipes-containers/podman/podman/run-ptest b/recipes-containers/podman/podman/run-ptest
deleted file mode 100644
index 108ff451..00000000
--- a/recipes-containers/podman/podman/run-ptest
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: MIT
-
-#
-# Podman system tests
-#
-
-# The system tests don't need any go related variables. Dummy-define them to
-# avoid useless warnings/errors.
-GOOS=undefined GO=true BUILDTAGS= make localsystem
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 32de3f0c..8d8e0f05 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -10,18 +10,16 @@ inherit features_check
 REQUIRED_DISTRO_FEATURES ?= "seccomp ipv6"
 
 DEPENDS = " \
-    go-metalinter-native \
     gpgme \
     libseccomp \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
     gettext-native \
 "
 
-SRCREV = "bb81e85a430fa95d23a15b77c717fd68bf06ebf2"
+SRCREV = "227df90eb7c021097c9ba5f8000c83648a598028"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=v5.0;protocol=https \
+    git://github.com/containers/libpod.git;branch=v5.4;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
     ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
-    file://run-ptest \
 "
 
 LICENSE = "Apache-2.0"
@@ -31,7 +29,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "5.0.1+git"
+PV = "v5.4.1"
 
 CVE_STATUS[CVE-2022-2989] = "fixed-version: fixed since v4.3.0"
 CVE_STATUS[CVE-2023-0778] = "fixed-version: fixed since v4.5.0"
@@ -46,16 +44,17 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
 exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}"
 
 # overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1
-export LDFLAGS=""
+export LDFLAGS = ""
 
 # https://github.com/llvm/llvm-project/issues/53999
 TOOLCHAIN = "gcc"
 
 # podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS
-export BUILDFLAGS="${GOBUILDFLAGS}"
+export BUILDFLAGS = "${GOBUILDFLAGS}"
 
 inherit go goarch
-inherit systemd pkgconfig ptest
+inherit container-host
+inherit systemd pkgconfig
 
 do_configure[noexec] = "1"
 
@@ -65,10 +64,13 @@ EXTRA_OEMAKE = " \
      SYSTEMDDIR=${systemd_unitdir}/system USERSYSTEMDDIR=${systemd_user_unitdir} \
 "
 
-# remove 'docker' from the packageconfig if you don't want podman to
+# remove 'docker' from the features if you don't want podman to
 # build and install the docker wrapper. If docker is enabled in the
-# packageconfig, the podman package will rconfict with docker.
-PACKAGECONFIG ?= "docker"
+# variable, the podman package will rconfict with docker.
+PODMAN_FEATURES ?= "docker"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[rootless] = ",,,fuse-overlayfs slirp4netns,,"
 
 do_compile() {
         cd ${S}/src
@@ -106,7 +108,7 @@ do_install() {
         export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
 
         oe_runmake install DESTDIR="${D}"
-        if ${@bb.utils.contains('PACKAGECONFIG', 'docker', 'true', 'false', d)}; then
+        if ${@bb.utils.contains('PODMAN_FEATURES', 'docker', 'true', 'false', d)}; then
                 oe_runmake install.docker DESTDIR="${D}"
         fi
 
@@ -116,21 +118,15 @@ do_install() {
 
         if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then
                 install -d "${D}${sysconfdir}/sysctl.d"
-                install -m 0644 "${WORKDIR}/50-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
+                install -m 0644 "${UNPACKDIR}/50-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
+                install -d "${D}${sysconfdir}/containers"
+                cat <<-EOF >> "${D}${sysconfdir}/containers/containers.conf"
+                [NETWORK]
+                default_rootless_network_cmd="slirp4netns"
+                EOF
         fi
 }
 
-do_install_ptest () {
-        cp ${S}/src/import/Makefile ${D}${PTEST_PATH}
-        install -d ${D}${PTEST_PATH}/test
-        cp -r ${S}/src/import/test/system ${D}${PTEST_PATH}/test
-
-        # Some compatibility links for the Makefile assumptions.
-        install -d ${D}${PTEST_PATH}/bin
-        ln -s ${bindir}/podman ${D}${PTEST_PATH}/bin/podman
-        ln -s ${bindir}/podman-remote ${D}${PTEST_PATH}/bin/podman-remote
-}
-
 FILES:${PN} += " \
     ${systemd_unitdir}/system/* \
     ${nonarch_libdir}/systemd/* \
@@ -149,8 +145,8 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
 COMPATIBLE_HOST = "^(?!mips).*"
 
 RDEPENDS:${PN} += "\
-        conmon ${VIRTUAL-RUNTIME_container_runtime} iptables ${VIRTUAL-RUNTIME_container_networking} skopeo ${VIRTUAL-RUNTIME_base-utils-nsenter} \
-        ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \
+        catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper \
+        ${VIRTUAL-RUNTIME_container_dns} ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \
 "
 RRECOMMENDS:${PN} += "slirp4netns \
                       kernel-module-xt-masquerade \
@@ -161,16 +157,3 @@ RRECOMMENDS:${PN} += "slirp4netns \
                       kernel-module-xt-tcpudp \
                       "
 RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
-
-RDEPENDS:${PN}-ptest += " \
-        bash \
-        bats \
-        buildah \
-        catatonit \
-        coreutils \
-        file \
-        gnupg \
-        jq \
-        make \
-        tar \
-"