From 527d741c07a3b2ca4237d402fcbd0c5006c3580e Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Tue, 1 Mar 2022 15:20:35 +0100 Subject: [PATCH] osbuilder: Fix use of LIBC in rootfs.sh - Add a doc comment - Pass to build container, e.g. to build x86_64 with glibc (would always use musl) Signed-off-by: Jakob Naucke --- tools/osbuilder/rootfs-builder/rootfs.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 831aba78e..323c54145 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -124,6 +124,9 @@ KERNEL_MODULES_DIR Path to a directory containing kernel modules to include in the rootfs. Default value: +LIBC libc the agent is built against (gnu or musl). + Default value: ${LIBC} (varies with architecture) + ROOTFS_DIR Path to the directory that is populated with the rootfs. Default value: <${script_name} path>/rootfs- @@ -427,11 +430,11 @@ build_rootfs_distro() --env AGENT_INIT="${AGENT_INIT}" \ --env CI="${CI}" \ --env KERNEL_MODULES_DIR="${KERNEL_MODULES_DIR}" \ + --env LIBC="${LIBC}" \ --env EXTRA_PKGS="${EXTRA_PKGS}" \ --env OSBUILDER_VERSION="${OSBUILDER_VERSION}" \ --env OS_VERSION="${OS_VERSION}" \ --env INSIDE_CONTAINER=1 \ - --env LIBC="${LIBC}" \ --env SKOPEO="${SKOPEO}" \ --env UMOCI="${UMOCI}" \ --env AA_KBC="${AA_KBC}" \