From 0bb64899c9bc601d006f0afd4b47c77db4616bdb Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 30 Nov 2018 15:32:07 -0500 Subject: [PATCH 1/1] Partial revert of 35b46f08b27c975edad28479469459155d32aea5 Signed-off-by: Jonathan Rajotte --- scripts/system-tests/build-kernel.sh | 7 ++++++- scripts/system-tests/check-build-needs.sh | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/system-tests/build-kernel.sh b/scripts/system-tests/build-kernel.sh index 219eb42..1c435b3 100644 --- a/scripts/system-tests/build-kernel.sh +++ b/scripts/system-tests/build-kernel.sh @@ -17,15 +17,20 @@ echo 'kernel-built.txt does not exist' echo 'So we build it' -make --directory="$LINUX_PATH" "-j$NPROC" bzImage +make --directory="$LINUX_PATH" "-j$NPROC" bzImage modules +make --directory="$LINUX_PATH" INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER" modules_install cp "$LINUX_PATH"/arch/x86/boot/bzImage "$DEPLOYDIR"/"$KERNEL_COMMIT_ID".bzImage cp "$LINUX_PATH"/.config "$DEPLOYDIR"/"$KERNEL_COMMIT_ID".config +tar -czf "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" lib/ + $SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_IMAGE" $SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_CONFIG" +$SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_LINUX_MODULES" $SCP_COMMAND "$LINUX_PATH/Module.symvers" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS" $S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" s3://"$S3_STORAGE_KERNEL_IMAGE" $S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" s3://"$S3_STORAGE_KERNEL_CONFIG" +$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" s3://"$S3_STORAGE_LINUX_MODULES" $S3_COMMAND put "$LINUX_PATH/Module.symvers" s3://"$S3_STORAGE_KERNEL_MODULE_SYMVERS" diff --git a/scripts/system-tests/check-build-needs.sh b/scripts/system-tests/check-build-needs.sh index fc15c83..cf51ab2 100644 --- a/scripts/system-tests/check-build-needs.sh +++ b/scripts/system-tests/check-build-needs.sh @@ -64,8 +64,6 @@ if [ $NEED_MODULES_BUILD -eq 1 ] || [ $NEED_KERNEL_BUILD -eq 1 ] ; then make --directory="$LINUX_PATH" kvmconfig fi - # Embed everything - make --directory="$LINUX_PATH" localyesconfig make --directory="$LINUX_PATH" modules_prepare fi -- 2.34.1