github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-12 14:48:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11279 from skazi0/repo-components

Browse Source 
osbuilder: ubuntu: Add REPO_COMPONENTS setting
This commit is contained in:
Steve Horsman 2025-05-20 16:03:48 +01:00 committed by GitHub
commit b4aa1e3fbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@ -58,6 +58,7 @@ USE_PODMAN=${USE_PODMAN:-""}
EXTRA_PKGS=${EXTRA_PKGS:-""}
REPO_URL=${REPO_URL:-""}
REPO_URL_X86_64=${REPO_URL_X86_64:-""}
REPO_COMPONENTS=${REPO_COMPONENTS:-""}
KBUILD_SIGN_PIN=${KBUILD_SIGN_PIN:-""}
NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-""}
@ -569,6 +570,7 @@ build_rootfs_distro()
--env EXTRA_PKGS="${EXTRA_PKGS}" \
--env REPO_URL="${REPO_URL}" \
--env REPO_URL_X86_64="${REPO_URL_X86_64}" \
--env REPO_COMPONENTS="${REPO_COMPONENTS}" \
--env OSBUILDER_VERSION="${OSBUILDER_VERSION}" \
--env OS_VERSION="${OS_VERSION}" \
--env VARIANT="${VARIANT}" \

1
tools/osbuilder/rootfs-builder/ubuntu/config.sh
View File

@ -12,6 +12,7 @@ PACKAGES="chrony iptables dbus"
[ "$AGENT_INIT" = no ] && PACKAGES+=" init"
[ "$MEASURED_ROOTFS" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs"
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
REPO_COMPONENTS=${REPO_COMPONENTS:-main}
case "$ARCH" in
aarch64) DEB_ARCH=arm64;;

1
tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
View File

@ -16,6 +16,7 @@ build_rootfs() {
EXTRA_PKGS=$(echo "$EXTRA_PKGS" | tr ' ' ',')
fi
if ! mmdebstrap --mode auto --arch "$DEB_ARCH" --variant required \
--components="$REPO_COMPONENTS" \
--include "$PACKAGES,$EXTRA_PKGS" "$OS_VERSION" "$rootfs_dir" "$REPO_URL"; then
echo "ERROR: mmdebstrap failed, cannot proceed" && exit 1
else

2
tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
View File

@ -109,6 +109,7 @@ GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}"
EXTRA_PKGS="${EXTRA_PKGS:-}"
REPO_URL="${REPO_URL:-}"
REPO_URL_X86_64="${REPO_URL_X86_64:-}"
REPO_COMPONENTS="${REPO_COMPONENTS:-}"
AGENT_POLICY="${AGENT_POLICY:-yes}"
RUNTIME_CHOICE="${RUNTIME_CHOICE:-both}"
@ -147,6 +148,7 @@ docker run \
--env EXTRA_PKGS="${EXTRA_PKGS}" \
--env REPO_URL="${REPO_URL}" \
--env REPO_URL_X86_64="${REPO_URL_X86_64}" \
--env REPO_COMPONENTS="${REPO_COMPONENTS}" \
--env AGENT_POLICY="${AGENT_POLICY}" \
--env RUNTIME_CHOICE="${RUNTIME_CHOICE}" \
--env AA_KBC="${AA_KBC:-}" \

9
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -53,6 +53,7 @@ GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}"
EXTRA_PKGS="${EXTRA_PKGS:-}"
REPO_URL="${REPO_URL:-}"
REPO_URL_X86_64="${REPO_URL_X86_64:-}"
REPO_COMPONENTS="${REPO_COMPONENTS:-}"
AGENT_POLICY="${AGENT_POLICY:-yes}"
TARGET_BRANCH="${TARGET_BRANCH:-main}"
PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-}"
@ -415,6 +416,10 @@ install_image() {
export REPO_URL_X86_64
fi
if [[ -n "${REPO_COMPONENTS}" ]]; then
export REPO_COMPONENTS
fi
"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
}
@ -513,6 +518,10 @@ install_initrd() {
export REPO_URL_X86_64
fi
if [[ -n "${REPO_COMPONENTS}" ]]; then
export REPO_COMPONENTS
fi
"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
}