From 30010ed4f40f3e470f7315e5db381a57f2b49097 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Mon, 3 Feb 2020 20:12:07 +0000 Subject: [PATCH] Use consistent compression and archive naming. Signed-off-by: Drew Moseley Changelog: Title (cherry picked from commit 6f27becbbd66d11bc725e7f1cfb8e528bbfd6a73) --- configs/beaglebone_black_base_config | 4 ++-- configs/raspberrypi_config | 2 +- configs/rockpro64_config | 2 +- mender-convert-modify | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/beaglebone_black_base_config b/configs/beaglebone_black_base_config index 94b1b33..1b8c437 100644 --- a/configs/beaglebone_black_base_config +++ b/configs/beaglebone_black_base_config @@ -10,14 +10,14 @@ MENDER_COPY_BOOT_GAP=n # 4MB alignment MENDER_PARTITION_ALIGNMENT="4194304" -BEAGLEBONE_BLACK_BINARIES="${BEAGLEBONE_BLACK_CONFIG}-2018.07.tar" +BEAGLEBONE_BLACK_BINARIES="${BEAGLEBONE_BLACK_CONFIG}-2018.07.tar.gz" BEAGLEBONE_BLACK_BINARIES_URL="${MENDER_STORAGE_URL}/mender-convert/uboot/beaglebone/${BEAGLEBONE_BLACK_BINARIES}" function platform_modify() { mkdir -p work/bbb/binaries run_and_log_cmd "wget -q ${BEAGLEBONE_BLACK_BINARIES_URL} -P work/bbb/binaries" - run_and_log_cmd "tar xvf work/bbb/binaries/${BEAGLEBONE_BLACK_BINARIES} -C work/bbb/binaries" + run_and_log_cmd "tar xzvf work/bbb/binaries/${BEAGLEBONE_BLACK_BINARIES} -C work/bbb/binaries" # Mask udisks2.service, otherwise it will mount the inactive part and we # might write an update while it is mounted which often result in diff --git a/configs/raspberrypi_config b/configs/raspberrypi_config index 610069f..436c1e3 100644 --- a/configs/raspberrypi_config +++ b/configs/raspberrypi_config @@ -17,7 +17,7 @@ function platform_modify() { mkdir -p work/rpi/binaries run_and_log_cmd "wget -q ${RASPBERRYPI_BINARIES_URL} -P work/rpi/binaries" - run_and_log_cmd "tar xvf work/rpi/binaries/${RASPBERRYPI_BINARIES} -C work/rpi/binaries" + run_and_log_cmd "tar xzvf work/rpi/binaries/${RASPBERRYPI_BINARIES} -C work/rpi/binaries" # By default, we modify cmdline.txt. # diff --git a/configs/rockpro64_config b/configs/rockpro64_config index 60f0d86..61a7ea7 100644 --- a/configs/rockpro64_config +++ b/configs/rockpro64_config @@ -14,7 +14,7 @@ function platform_modify() { mkdir -p work/rockpro64 run_and_log_cmd "wget -Nq ${ROCKPRO64_BINARIES_URL} -P work/rockpro64" - run_and_log_cmd "tar xvf work/rockpro64/${ROCKPRO64_BINARIES} -C work/rockpro64" + run_and_log_cmd "tar xzvf work/rockpro64/${ROCKPRO64_BINARIES} -C work/rockpro64" run_and_log_cmd "sudo cp work/rockpro64/boot.scr work/boot" diff --git a/mender-convert-modify b/mender-convert-modify index 43f454d..3f06083 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -94,7 +94,7 @@ run_and_log_cmd "wget -Nq ${MENDER_STORAGE_URL}/${MENDER_CLIENT_VERSION}/dist-pa cd work/mender-deb run_and_log_cmd "ar -xv ${deb_name}" -run_and_log_cmd "tar -xf data.tar.xz -C files" +run_and_log_cmd "tar xJf data.tar.xz -C files" cd - > /dev/null 2>&1 run_and_log_cmd "sudo rsync --archive --keep-dirlinks --verbose work/mender-deb/files/ work/rootfs/" @@ -109,7 +109,7 @@ if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then check_for_broken_uboot_uefi_support work/boot run_and_log_cmd "wget -Nq '${MENDER_GRUBENV_URL}' -P work/" - run_and_log_cmd "tar xvf work/${MENDER_GRUBENV_VERSION}.tar.gz -C work/" + run_and_log_cmd "tar xzvf work/${MENDER_GRUBENV_VERSION}.tar.gz -C work/" if [ -z "${MENDER_GRUB_KERNEL_IMAGETYPE}" ]; then kernel_imagetype=$(probe_kernel_in_boot_and_root)