github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-19 07:49:17 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Fix bad merges

Browse Source 
- Fix issues found with auto-merged

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2023-06-30 10:30:43 +01:00
parent 51eb0c5130
commit 1fefa3790a
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,8 +341,10 @@ install_cc_kernel() {
"${final_tarball_path}" \ "${final_tarball_path}" \
&& return 0 && return 0
info "build initramfs for CC kernel" if [ "${MEASURED_ROOTFS}" == "yes" ]; then
"${initramfs_builder}" info "build initramfs for cc kernel"
"${initramfs_builder}"
fi
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -f -v "${kernel_version}" DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -f -v "${kernel_version}"
} }

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

@@ -130,13 +130,7 @@ get_tee_kernel() {
mkdir -p ${kernel_path} mkdir -p ${kernel_path}
if [ -z "${kernel_url}" ]; then [ -z "${kernel_url}" ] && kernel_url=$(get_from_kata_deps "assets.kernel.${tee}.url")
if [[ "${conf_guest}" == "tdx" ]]; then
kernel_url=$(get_from_kata_deps "assets.kernel-tdx-experimental.url")
else
kernel_url=$(get_from_kata_deps "assets.kernel.${tee}.url")
fi
fi
local kernel_tarball="${version}.tar.gz" local kernel_tarball="${version}.tar.gz"
@@ -619,12 +613,8 @@ main() {
kernel_version=$(get_from_kata_deps "assets.kernel-dragonball-experimental.version") kernel_version=$(get_from_kata_deps "assets.kernel-dragonball-experimental.version")
elif [[ "${conf_guest}" != "" ]]; then elif [[ "${conf_guest}" != "" ]]; then
#If specifying a tag for kernel_version, must be formatted version-like to avoid unintended parsing issues #If specifying a tag for kernel_version, must be formatted version-like to avoid unintended parsing issues
if [[ "${conf_guest}" == "tdx" ]]; then kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.version" 2>/dev/null || true)
kernel_version=$(get_from_kata_deps "assets.kernel-tdx-experimental.version" 2>/dev/null || true) [ -n "${kernel_version}" ] || kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.tag")
else
kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.version" 2>/dev/null || true)
[ -n "${kernel_version}" ] || kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.tag")
fi
else else
kernel_version=$(get_from_kata_deps "assets.kernel.version") kernel_version=$(get_from_kata_deps "assets.kernel.version")
fi fi