From 93a7433c6f270e3265d48bef6459306d977e68bd Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 30 Nov 2018 16:59:00 -0500 Subject: [PATCH] LAVA: embed the kernel modules into the lttng-modules tarball Signed-off-by: Jonathan Rajotte --- scripts/system-tests/build-modules.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh index e68124b..7ad25b9 100644 --- a/scripts/system-tests/build-modules.sh +++ b/scripts/system-tests/build-modules.sh @@ -19,17 +19,15 @@ echo 'So we build them against the kernel' $SCP_COMMAND "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS" "$LINUX_PATH/Module.symvers" -$S3_COMMAND get "s3://$S3_STORAGE_LINUX_MODULES/$KERNEL_COMMIT_ID.linux.modules.tar.gz" + +KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" +KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" modules_install INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER" # Extract the linux modules to MODULES_INSTALL_FOLDER. # The resulting tarball will contain both lttng-modules and linux modules needed # for testing - -tar -xvzf $KERNEL_COMMIT_ID.linux.modules.tar.gz -C "$MODULES_INSTALL_FOLDER" - -KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" - -KERNELDIR="$LINUX_PATH" make -j"$NPROC" --directory="$LTTNG_MODULES_PATH" modules_install INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER" +$S3_COMMAND get "s3://$S3_STORAGE_LINUX_MODULES" +tar -xvzf $(basename "$S3_STORAGE_LINUX_MODULES") -C "$MODULES_INSTALL_FOLDER" tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" lib/ -- 2.34.1