github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 10:12:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9730 from zvonkok/kernel-no-sudo

Browse Source 
ci: kernel no sudo
This commit is contained in:
GabyCT 2024-05-29 10:23:31 -06:00 committed by GitHub
commit 03be220482
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/packaging/kernel/build-kernel.sh
View File

@ -489,6 +489,7 @@ build_kernel_headers() {
pushd "${kernel_path}" >>/dev/null pushd "${kernel_path}" >>/dev/null
if [ "$linux_headers" == "deb" ]; then if [ "$linux_headers" == "deb" ]; then
export KBUILD_BUILD_USER="${USER}"
make -j $(nproc ${CI:+--ignore 1}) bindeb-pkg ARCH="${arch_target}" make -j $(nproc ${CI:+--ignore 1}) bindeb-pkg ARCH="${arch_target}"
fi fi
if [ "$linux_headers" == "rpm" ]; then if [ "$linux_headers" == "rpm" ]; then

2
tools/packaging/kernel/kata_config_version
View File

@ -1 +1 @@
130 131

17
tools/packaging/static-build/kernel/build.sh
View File

@ -42,30 +42,35 @@ if [ "${CROSS_BUILD}" == "true" ]; then
fi fi
fi fi
sudo docker pull ${container_image} || \ docker pull ${container_image} || \
(sudo docker ${BUILDX} build ${PLATFORM} \ (docker ${BUILDX} build ${PLATFORM} \
--build-arg ARCH=${ARCH} -t "${container_image}" "${script_dir}" && \ --build-arg ARCH=${ARCH} -t "${container_image}" "${script_dir}" && \
# No-op unless PUSH_TO_REGISTRY is exported as "yes" # No-op unless PUSH_TO_REGISTRY is exported as "yes"
push_to_registry "${container_image}") push_to_registry "${container_image}")
sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
-w "${PWD}" \ -w "${PWD}" \
--user "$(id -u)":"$(id -g)" \
"${container_image}" \ "${container_image}" \
bash -c "${kernel_builder} ${kernel_builder_args} setup" bash -c "${kernel_builder} ${kernel_builder_args} setup"
sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
-w "${PWD}" \ -w "${PWD}" \
--user "$(id -u)":"$(id -g)" \
"${container_image}" \ "${container_image}" \
bash -c "${kernel_builder} ${kernel_builder_args} build" bash -c "${kernel_builder} ${kernel_builder_args} build"
sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
-w "${PWD}" \ -w "${PWD}" \
--env DESTDIR="${DESTDIR}" --env PREFIX="${PREFIX}" \ --env DESTDIR="${DESTDIR}" --env PREFIX="${PREFIX}" \
--user "$(id -u)":"$(id -g)" \
"${container_image}" \ "${container_image}" \
bash -c "${kernel_builder} ${kernel_builder_args} install" bash -c "${kernel_builder} ${kernel_builder_args} install"
sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
-w "${PWD}" \ -w "${PWD}" \
--env DESTDIR="${DESTDIR}" --env PREFIX="${PREFIX}" \ --env DESTDIR="${DESTDIR}" --env PREFIX="${PREFIX}" \
--env USER="${USER}" \
--user "$(id -u)":"$(id -g)" \
"${container_image}" \ "${container_image}" \
bash -c "${kernel_builder} ${kernel_builder_args} build-headers" bash -c "${kernel_builder} ${kernel_builder_args} build-headers"