From cb59f826ad554f95375dd7c8003b2555de3e6709 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 9 Oct 2019 09:53:37 -0700 Subject: [PATCH] scripts: Use virtio-fs-virtio-iommu branch as custom kernel Because we want both early support for virtio-fs and virtio-iommu, our custom kernel is now based on the kernel branch virtio-fs-virtio-iommu. Signed-off-by: Sebastien Boeuf --- ...x-virtio-fs-config => linux-virtio-fs-virtio-iommu-config} | 0 scripts/run_integration_tests.sh | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/{linux-virtio-fs-config => linux-virtio-fs-virtio-iommu-config} (100%) diff --git a/resources/linux-virtio-fs-config b/resources/linux-virtio-fs-virtio-iommu-config similarity index 100% rename from resources/linux-virtio-fs-config rename to resources/linux-virtio-fs-virtio-iommu-config diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 58ed98647..f8362c251 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -84,9 +84,9 @@ LINUX_CUSTOM_DIR="linux-custom" if [ ! -f "$VMLINUX_IMAGE" ]; then SRCDIR=$PWD pushd $WORKLOADS_DIR - git clone --depth 1 "https://github.com/sboeuf/linux.git" -b "virtio-fs" $LINUX_CUSTOM_DIR + git clone --depth 1 "https://github.com/sboeuf/linux.git" -b "virtio-fs-virtio-iommu" $LINUX_CUSTOM_DIR pushd $LINUX_CUSTOM_DIR - cp $SRCDIR/resources/linux-virtio-fs-config .config + cp $SRCDIR/resources/linux-virtio-fs-virtio-iommu-config .config make bzImage -j `nproc` cp vmlinux $VMLINUX_IMAGE cp arch/x86/boot/bzImage $BZIMAGE_IMAGE