From 192055c9ea011aad2d921607af07572a6242fe7e Mon Sep 17 00:00:00 2001 From: "Chen, Gang G" Date: Mon, 22 Jan 2024 14:13:13 +0800 Subject: [PATCH] Remove directory while compressing android images directory is not required in final release packages Test done: make flashfiles use_tar=true uzip flashfile.tar.gz and iso.tar.gz, no directory in extracted files Tracked-On: OAM-115260 Signed-off-by: Chen, Gang G --- releasetools/flashfiles_from_target_files.sh | 2 +- tasks/flashfiles.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/releasetools/flashfiles_from_target_files.sh b/releasetools/flashfiles_from_target_files.sh index 62c5bc5..f29f941 100755 --- a/releasetools/flashfiles_from_target_files.sh +++ b/releasetools/flashfiles_from_target_files.sh @@ -76,7 +76,7 @@ if [[ $SUPER_IMG == "true" ]]; then rm -f $flashfile_dir/system.img $flashfile_dir/vendor.img $flashfile_dir/product.img fi -tar -cvf - $flashfile_dir/ | /usr/bin/pigz > $flashfile +tar -cvf - -C $flashfile_dir/ . | /usr/bin/pigz > $flashfile echo "========================" echo "Flashfiles Tar $PRODUCT_OUT/$flashfile_dir/$flashfile created" diff --git a/tasks/flashfiles.mk b/tasks/flashfiles.mk index 36de49e..d4a12a4 100755 --- a/tasks/flashfiles.mk +++ b/tasks/flashfiles.mk @@ -319,6 +319,8 @@ ISO_INSTALL_IMG_COMP = $(ISO_INSTALL_IMG).zip endif ISO_RELEASE_TAR = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-releasefile-$(TARGET_BUILD_VARIANT).iso.tar.gz ISO_EFI = $(PRODUCT_OUT)/iso_tmp.efi +iso_basename = $(shell basename $(ISO_INSTALL_IMG)) +iso_path = $(shell dirname $(ISO_INSTALL_IMG)) LOCAL_TOOL:= \ PATH="/bin:$$PATH" @@ -475,7 +477,7 @@ endif @echo "Compress ISO image $(ISO_INSTALL_IMG_COMP) ..." ifeq ($(use_tar),true) - $(hide) tar -cvf - $(ISO_INSTALL_IMG) | /usr/bin/pigz > $(ISO_INSTALL_IMG_COMP) + $(hide) tar -cvf - -C $(iso_path) $(iso_basename) | /usr/bin/pigz > $(ISO_INSTALL_IMG_COMP) else $(hide)zip -r -j $(ISO_INSTALL_IMG_COMP) $(ISO_INSTALL_IMG) endif