From c3326b18fb8982681a93822d4242c0276cf090db Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 20 Nov 2018 15:11:21 -0500 Subject: [PATCH] Fix: use lib folder directly for modules tarballs Signed-off-by: Jonathan Rajotte --- scripts/system-tests/build-kernel.sh | 2 +- scripts/system-tests/build-modules.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system-tests/build-kernel.sh b/scripts/system-tests/build-kernel.sh index a365a66..1c435b3 100644 --- a/scripts/system-tests/build-kernel.sh +++ b/scripts/system-tests/build-kernel.sh @@ -23,7 +23,7 @@ make --directory="$LINUX_PATH" INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER" module 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/" ./ +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" diff --git a/scripts/system-tests/build-modules.sh b/scripts/system-tests/build-modules.sh index bc6d04a..42c8b92 100644 --- a/scripts/system-tests/build-modules.sh +++ b/scripts/system-tests/build-modules.sh @@ -23,7 +23,7 @@ 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" -tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" ./ +tar -czf "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" lib/ $SCP_COMMAND "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_LTTNG_MODULES" $S3_COMMAND put "$DEPLOYDIR/$BUILD_NAME.lttng.modules.tar.gz" s3://"$S3_STORAGE_LTTNG_MODULES" -- 2.34.1