github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 00:46:38 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy-binaires: Remove CC virtiofsd build

Browse Source 
We can simply ship the one from main.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2023-07-20 23:46:35 +02:00
parent f62a88f179
commit 3fa936e492
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy/local-build/Makefile
View File

@@ -155,7 +155,6 @@ cc-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
cc: cc-kernel-tarball \ cc: cc-kernel-tarball \
cc-rootfs-image-tarball \ cc-rootfs-image-tarball \
cc-virtiofsd-tarball \
cc-shim-v2-tarball \ cc-shim-v2-tarball \
${EXTRA_TARBALL} ${EXTRA_TARBALL}
@@ -180,9 +179,6 @@ cc-tdx-rootfs-image-tarball:
cc-shim-v2-tarball: cc-shim-v2-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-virtiofsd-tarball:
${MAKE} $@-build
cc-tdx-kernel-tarball: cc-tdx-kernel-tarball:
${MAKE} $@-build ${MAKE} $@-build

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

@@ -118,7 +118,6 @@ options:
cc-sev-rootfs-initrd cc-sev-rootfs-initrd
cc-se-image cc-se-image
cc-shimv2 cc-shimv2
cc-virtiofsd
cc-sev-ovmf cc-sev-ovmf
cc-x86_64-ovmf cc-x86_64-ovmf
EOF EOF
@@ -369,25 +368,6 @@ install_cc_shimv2() {
DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}" DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}"
} }
# Install static CC virtiofsd asset
install_cc_virtiofsd() {
local virtiofsd_version="$(get_from_kata_deps "externals.virtiofsd.version")-$(get_from_kata_deps "externals.virtiofsd.toolchain")"
install_cached_tarball_component \
"virtiofsd" \
"${jenkins_url}/job/kata-containers-2.0-virtiofsd-cc-$(uname -m)/${cached_artifacts_path}" \
"${virtiofsd_version}" \
"$(get_virtiofsd_image_name)" \
"${final_tarball_name}" \
"${final_tarball_path}" \
&& return 0
info "build static CC virtiofsd"
"${virtiofsd_builder}"
info "Install static CC virtiofsd"
mkdir -p "${destdir}/${cc_prefix}/libexec/"
sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd"
}
# Install cached kernel compoenent # Install cached kernel compoenent
install_cached_kernel_component() { install_cached_kernel_component() {
tee="${1}" tee="${1}"
@@ -973,7 +953,6 @@ handle_build() {
install_cc_kernel install_cc_kernel
install_cc_image install_cc_image
install_cc_shimv2 install_cc_shimv2
install_cc_virtiofsd
install_cc_sev_image install_cc_sev_image
;; ;;
@@ -991,8 +970,6 @@ handle_build() {
cc-shim-v2) install_cc_shimv2 ;; cc-shim-v2) install_cc_shimv2 ;;
cc-virtiofsd) install_cc_virtiofsd ;;
cc-tdx-kernel) install_cc_tdx_kernel ;; cc-tdx-kernel) install_cc_tdx_kernel ;;
cc-sev-kernel) install_cc_sev_kernel ;; cc-sev-kernel) install_cc_sev_kernel ;;