mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

tools/build-docs-container: use the basename of OCI to append args

Browse Source 
What we have is OCI = $(which $CONTAINERCMD) = /usr/bin/{docker,podman}.
So we never pass the current if conditions. Compare against the basename
of OCI to pass the checks.

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
(From yocto-docs rev: 41fc95a0e06fec29cdd8c47f75093f0a6a2df8c0)

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Antonin Godard
2025-10-13 09:12:55 +02:00
committed by Richard Purdie
parent 5e0e1c586d
commit 4735aa8fd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
documentation/tools/build-docs-container
View File

@@ -154,11 +154,11 @@ main ()
--security-opt label=disable --security-opt label=disable
) )
if [ "$OCI" = "docker" ]; then if [ "$(basename "$OCI")" = "docker" ]; then
args_run+=( args_run+=(
--user="$(id -u)":"$(id -g)" --user="$(id -u)":"$(id -g)"
) )
elif [ "$OCI" = "podman" ]; then elif [ "$(basename "$OCI")" = "podman" ]; then
# we need net access to fetch bitbake terms # we need net access to fetch bitbake terms
args_run+=( args_run+=(
--cap-add=NET_RAW --cap-add=NET_RAW