summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-11-09 05:12:32 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-11-09 14:00:59 +0000
commit4484b8dea4bbbafd3d377f2d0fe4ac3f15645145 (patch)
tree9436f748fd01547cae86e696564213861082d32a
parent0c785e1100862ed6280fa96a39b021bea08f7cd0 (diff)
downloadmeta-virtualization-4484b8dea4bbbafd3d377f2d0fe4ac3f15645145.tar.gz
podman: fix documentation build issues
podman commit dfec510b41b5 [go-md2man: use vendored-in version, not system] removes the shell test for go-md2man, which means our native executable is not found. While we could export GOMD2MAN and point it to our sysroot version (${RECIPE_SYSROOT_NATIVE}/usr/bin/go-md2man), we could run into the issues with formatting that the podman commit is trying to avoid. If we pass our build host architecture to the build, it will be used and the executable created as part of the compilation. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/podman/podman_git.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index d599c748..7634ac85 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -11,7 +11,6 @@ REQUIRED_DISTRO_FEATURES ?= "seccomp ipv6"
11 11
12DEPENDS = " \ 12DEPENDS = " \
13 go-metalinter-native \ 13 go-metalinter-native \
14 go-md2man-native \
15 gpgme \ 14 gpgme \
16 libseccomp \ 15 libseccomp \
17 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 16 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
@@ -90,7 +89,11 @@ do_compile() {
90 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" 89 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
91 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" 90 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
92 91
93 oe_runmake BUILDTAGS="${BUILDTAGS}" 92 # podman now builds go-md2man and requires the host/build details
93 export NATIVE_GOOS=${BUILD_GOOS}
94 export NATIVE_GOARCH=${BUILD_GOARCH}
95
96 oe_runmake NATIVE_GOOS=${BUILD_GOOS} NATIVE_GOARCH=${BUILD_GOARCH} BUILDTAGS="${BUILDTAGS}"
94} 97}
95 98
96do_install() { 99do_install() {