diff options
-rw-r--r-- | recipes-containers/podman/podman/run-ptest | 13 | ||||
-rw-r--r-- | recipes-containers/podman/podman_git.bb | 27 |
2 files changed, 1 insertions, 39 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # SPDX-FileCopyrightText: Huawei Inc. | ||
4 | # | ||
5 | # SPDX-License-Identifier: MIT | ||
6 | |||
7 | # | ||
8 | # Podman system tests | ||
9 | # | ||
10 | |||
11 | # The system tests don't need any go related variables. Dummy-define them to | ||
12 | # avoid useless warnings/errors. | ||
13 | GOOS=undefined GO=true BUILDTAGS= make localsystem | ||
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 46c6c969..8d8e0f05 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb | |||
@@ -20,7 +20,6 @@ SRCREV = "227df90eb7c021097c9ba5f8000c83648a598028" | |||
20 | SRC_URI = " \ | 20 | SRC_URI = " \ |
21 | git://github.com/containers/libpod.git;branch=v5.4;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | 21 | git://github.com/containers/libpod.git;branch=v5.4;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
22 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \ | 22 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \ |
23 | file://run-ptest \ | ||
24 | " | 23 | " |
25 | 24 | ||
26 | LICENSE = "Apache-2.0" | 25 | LICENSE = "Apache-2.0" |
@@ -55,7 +54,7 @@ export BUILDFLAGS = "${GOBUILDFLAGS}" | |||
55 | 54 | ||
56 | inherit go goarch | 55 | inherit go goarch |
57 | inherit container-host | 56 | inherit container-host |
58 | inherit systemd pkgconfig ptest | 57 | inherit systemd pkgconfig |
59 | 58 | ||
60 | do_configure[noexec] = "1" | 59 | do_configure[noexec] = "1" |
61 | 60 | ||
@@ -128,17 +127,6 @@ do_install() { | |||
128 | fi | 127 | fi |
129 | } | 128 | } |
130 | 129 | ||
131 | do_install_ptest () { | ||
132 | cp ${S}/src/import/Makefile ${D}${PTEST_PATH} | ||
133 | install -d ${D}${PTEST_PATH}/test | ||
134 | cp -r ${S}/src/import/test/system ${D}${PTEST_PATH}/test | ||
135 | |||
136 | # Some compatibility links for the Makefile assumptions. | ||
137 | install -d ${D}${PTEST_PATH}/bin | ||
138 | ln -s ${bindir}/podman ${D}${PTEST_PATH}/bin/podman | ||
139 | ln -s ${bindir}/podman-remote ${D}${PTEST_PATH}/bin/podman-remote | ||
140 | } | ||
141 | |||
142 | FILES:${PN} += " \ | 130 | FILES:${PN} += " \ |
143 | ${systemd_unitdir}/system/* \ | 131 | ${systemd_unitdir}/system/* \ |
144 | ${nonarch_libdir}/systemd/* \ | 132 | ${nonarch_libdir}/systemd/* \ |
@@ -169,16 +157,3 @@ RRECOMMENDS:${PN} += "slirp4netns \ | |||
169 | kernel-module-xt-tcpudp \ | 157 | kernel-module-xt-tcpudp \ |
170 | " | 158 | " |
171 | RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" | 159 | RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" |
172 | |||
173 | RDEPENDS:${PN}-ptest += " \ | ||
174 | bash \ | ||
175 | bats \ | ||
176 | buildah \ | ||
177 | coreutils \ | ||
178 | file \ | ||
179 | gnupg \ | ||
180 | jq \ | ||
181 | make \ | ||
182 | skopeo \ | ||
183 | tar \ | ||
184 | " | ||