mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-12-22 05:35:20 +00:00
scripts: Replace download_linux with prepare_linux
`prepare_linux` is capable of determining whether we need to invoke `build_custom_linux` for building linux from source or `download_linux` for downloading pre-built. Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
This commit is contained in:
parent
906580ee92
commit
3c05626ad1
@ -154,8 +154,8 @@ update_workloads() {
|
|||||||
fi
|
fi
|
||||||
popd || exit
|
popd || exit
|
||||||
|
|
||||||
# Download prebuild linux binaries
|
# Prepare linux image (build from source or download pre-built)
|
||||||
download_linux
|
prepare_linux
|
||||||
|
|
||||||
# Update the kernel in the cloud image for some tests that requires recent kernel version
|
# Update the kernel in the cloud image for some tests that requires recent kernel version
|
||||||
FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME="focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw"
|
FOCAL_OS_RAW_IMAGE_UPDATE_KERNEL_NAME="focal-server-cloudimg-arm64-custom-20210929-0-update-kernel.raw"
|
||||||
|
@ -56,8 +56,8 @@ popd || exit
|
|||||||
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches
|
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches
|
||||||
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
|
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
|
||||||
if [ ! -f "$VMLINUX_IMAGE" ]; then
|
if [ ! -f "$VMLINUX_IMAGE" ]; then
|
||||||
# Download prebuild linux binaries
|
# Prepare linux image (build from source or download pre-built)
|
||||||
download_linux
|
prepare_linux
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
|
@ -44,8 +44,8 @@ if ! grep focal sha1sums-x86_64 | sha1sum --check; then
|
|||||||
fi
|
fi
|
||||||
popd || exit
|
popd || exit
|
||||||
|
|
||||||
# Download prebuild linux binaries
|
# Prepare linux image (build from source or download pre-built)
|
||||||
download_linux
|
prepare_linux
|
||||||
|
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
|
if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
|
||||||
|
@ -102,8 +102,8 @@ popd || exit
|
|||||||
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches
|
# Build custom kernel based on virtio-pmem and virtio-fs upstream patches
|
||||||
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
|
VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
|
||||||
if [ ! -f "$VMLINUX_IMAGE" ]; then
|
if [ ! -f "$VMLINUX_IMAGE" ]; then
|
||||||
# Download prebuild linux binaries
|
# Prepare linux image (build from source or download pre-built)
|
||||||
download_linux
|
prepare_linux
|
||||||
fi
|
fi
|
||||||
|
|
||||||
VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
|
VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
|
||||||
|
@ -80,8 +80,8 @@ if [ "${TEST_ARCH}" == "aarch64" ]; then
|
|||||||
guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_TOOL_ROOT_DIR"
|
guestunmount "$FOCAL_OS_RAW_IMAGE_UPDATE_TOOL_ROOT_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Download prebuild linux binaries
|
# Prepare linux image (build from source or download pre-built)
|
||||||
download_linux
|
prepare_linux
|
||||||
|
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then
|
if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user