From df2570a472dc7f1060b1542f5a442ec07acfca93 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Thu, 12 Mar 2020 13:17:04 +0100 Subject: [PATCH] resources: Simplify kernel config filename Since we only keep one single version of the kernel config file in our repository, there is no reason to keep the filename complex. Signed-off-by: Sebastien Boeuf --- README.md | 2 +- resources/{linux-virtio-fs-virtio-iommu-config => linux-config} | 0 scripts/run_integration_tests.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename resources/{linux-virtio-fs-virtio-iommu-config => linux-config} (100%) diff --git a/README.md b/README.md index ef688ec00..205a89c77 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ $ git clone --depth 1 https://github.com/cloud-hypervisor/linux.git -b virtio-fs $ pushd linux-cloud-hypervisor # Use the cloud-hypervisor kernel config to build your kernel -$ cp $CLOUDH/cloud-hypervisor/resources/linux-virtio-fs-virtio-iommu-config .config +$ cp $CLOUDH/cloud-hypervisor/resources/linux-config .config $ make bzImage -j `nproc` $ popd ``` diff --git a/resources/linux-virtio-fs-virtio-iommu-config b/resources/linux-config similarity index 100% rename from resources/linux-virtio-fs-virtio-iommu-config rename to resources/linux-config diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 365e60461..d25862798 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -87,7 +87,7 @@ if [ ! -f "$VMLINUX_IMAGE" ]; then pushd $WORKLOADS_DIR time git clone --depth 1 "https://github.com/cloud-hypervisor/linux.git" -b "virtio-fs-virtio-iommu-virtio-mem-5.6-rc4" $LINUX_CUSTOM_DIR pushd $LINUX_CUSTOM_DIR - cp $SRCDIR/resources/linux-virtio-fs-virtio-iommu-config .config + cp $SRCDIR/resources/linux-config .config time make bzImage -j `nproc` cp vmlinux $VMLINUX_IMAGE || exit 1 cp arch/x86/boot/bzImage $BZIMAGE_IMAGE || exit 1