Make use of $TAR_COMMAND variable

Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

6 files changed, 19 insertions, 16 deletions

diff --git a/gen_compile.sh b/gen_compile.sh
index a2c70a82..b3a8382e 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -487,7 +487,7 @@ populate_binpkg() {
 		# current .config.
 		if [[ -f "${BINPKG}" ]]
 		then
-			local oldconfig_md5="$(tar -xaf "${BINPKG}" -O ./configs/.config.gk_orig 2>/dev/null | md5sum)"
+			local oldconfig_md5="$("${TAR_COMMAND}" -xaf "${BINPKG}" -O ./configs/.config.gk_orig 2>/dev/null | md5sum)"
 			local newconfig_md5="$(md5sum < "${TEMP}"/busybox-config)"
 			if [[ "${oldconfig_md5}" != "${newconfig_md5}" ]]
 			then
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 176afb28..f1c887e3 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -7,7 +7,7 @@ determine_KV() {
 
 	if ! isTrue "${KERNEL_SOURCES}" && [ -e "${KERNCACHE}" ]
 	then
-		tar -x -C "${TEMP}" -f "${KERNCACHE}" kerncache.config \
+		"${TAR_COMMAND}" -x -C "${TEMP}" -f "${KERNCACHE}" kerncache.config \
 			|| gen_die "Failed to extract 'kerncache.config' from '${KERNCACHE}' to '${TEMP}'!"
 
 		if [ -e "${TEMP}/kerncache.config" ]
diff --git a/gen_funcs.sh b/gen_funcs.sh
index a1a3cf66..e0b679aa 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -835,7 +835,8 @@ get_tar_cmd() {
 	local archive_file=${1}
 
 	local -a tar_cmd
-	tar_cmd+=( 'tar -c' )
+	tar_cmd+=( "${TAR_COMMAND}" )
+	tar_cmd+=( '-c' )
 
 	local pcmd
 	if [[ "${archive_file}" == *.tar.bz2 ]]
@@ -1188,6 +1189,7 @@ gkbuild() {
 		"GKPKG_SRCTAR='${SRCTAR}'"
 		"GKPKG_BINPKG='${BINPKG}'"
 		"GKPKG_DEPS='${DEPS}'"
+		"TAR_COMMAND='${TAR_COMMAND}'"
 	)
 
 	envvars+=(
@@ -1268,6 +1270,7 @@ unpack() {
 	)
 
 	envvars+=(
+		"TAR_COMMAND='${TAR_COMMAND}'"
 		"UNPACK_FILE='${unpack_file}'"
 		"UNPACK_DIR='${unpack_dir}'"
 	)
diff --git a/gen_package.sh b/gen_package.sh
index 665f1015..4a1ca431 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -7,19 +7,19 @@ gen_minkernpackage() {
 	mkdir "${TEMP}/minkernpackage" || gen_die "Failed to create '${TEMP}/minkernpackage'!"
 	if [ -n "${KERNCACHE}" ]
 	then
-		tar -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" kernel-${ARCH}-${KV} \
+		"${TAR_COMMAND}" -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" kernel-${ARCH}-${KV} \
 			|| gen_die "Failed to extract 'kernel-${ARCH}-${KV}' from '${KERNCACHE}' to '${TEMP}/minkernpackage'!"
 
 		mv "${TEMP}"/minkernpackage/{kernel-${ARCH}-${KV},kernel-${KNAME}-${ARCH}-${KV}} \
 			|| gen_die "Failed to rename '${TEMP}/minkernpackage/kernel-${ARCH}-${KV}' to 'kernel-${KNAME}-${ARCH}-${KV}'!"
 
-		tar -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" System.map-${ARCH}-${KV} \
+		"${TAR_COMMAND}" -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" System.map-${ARCH}-${KV} \
 			|| gen_die "Failed to extract 'System.map-${ARCH}-${KV}' from '${KERNCACHE}' to '${TEMP}/minkernpackage'!"
 
 		mv "${TEMP}"/minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} \
 			|| gen_die "Failed to rename '${TEMP}/minkernpackage/System.map-${ARCH}-${KV}' to 'System.map-${KNAME}-${ARCH}-${KV}'!"
 
-		tar -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" config-${ARCH}-${KV} \
+		"${TAR_COMMAND}" -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" config-${ARCH}-${KV} \
 			|| gen_die "Failed to extract 'config-${ARCH}-${KV}' from '${KERNCACHE}' to '${TEMP}/minkernpackage'!"
 
 		mv "${TEMP}"/minkernpackage/{config-${ARCH}-${KV},config-${KNAME}-${ARCH}-${KV}} \
@@ -27,7 +27,7 @@ gen_minkernpackage() {
 
 		if isTrue "${GENZIMAGE}"
 		then
-			tar -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" kernelz-${ARCH}-${KV} \
+			"${TAR_COMMAND}" -x -C "${TEMP}"/minkernpackage -f "${KERNCACHE}" kernelz-${ARCH}-${KV} \
 				|| gen_die "Failed to extract 'kernelz-${ARCH}-${KV}' from '${KERNCACHE}' to '${TEMP}/minkernpackage'!"
 
 			mv "${TEMP}"/minkernpackage/{kernelz-${ARCH}-${KV},kernelz-${KNAME}-${ARCH}-${KV}} \
@@ -174,7 +174,7 @@ gen_kerncache() {
 }
 
 gen_kerncache_extract_kernel() {
-	tar -xf "${KERNCACHE}" -C "${TEMP}" \
+	"${TAR_COMMAND}" -xf "${KERNCACHE}" -C "${TEMP}" \
 		|| gen_die "Failed to extract '${KERNCACHE}' to '${TEMP}'!"
 
 	copy_image_with_preserve \
@@ -200,10 +200,10 @@ gen_kerncache_extract_modules() {
 	print_info 1 "Extracting kerncache kernel modules from '${KERNCACHE}' ..."
 	if [ -n "${INSTALL_MOD_PATH}" ]
 	then
-		tar -xf "${KERNCACHE}" --strip-components 1 -C "${INSTALL_MOD_PATH}"/lib \
+		"${TAR_COMMAND}" -xf "${KERNCACHE}" --strip-components 1 -C "${INSTALL_MOD_PATH}"/lib \
 			|| gen_die "Failed to extract kerncache modules from '${KERNCACHE}' to '${INSTALL_MOD_PATH}/lib'!"
 	else
-		tar -xf "${KERNCACHE}" --strip-components 1 -C /lib \
+		"${TAR_COMMAND}" -xf "${KERNCACHE}" --strip-components 1 -C /lib \
 			|| gen_die "Failed to extract kerncache modules from '${KERNCACHE}' to '${INSTALL_MOD_PATH}/lib'!"
 	fi
 }
@@ -216,7 +216,7 @@ gen_kerncache_extract_config() {
 		mkdir -p /etc/kernels || gen_die "Failed to create '/etc/kernels'!"
 	fi
 
-	tar -xf "${KERNCACHE}" -C /etc/kernels config-${ARCH}-${KV} \
+	"${TAR_COMMAND}" -xf "${KERNCACHE}" -C /etc/kernels config-${ARCH}-${KV} \
 		|| gen_die "Failed to extract kerncache config 'config-${ARCH}-${KV}' from '${KERNCACHE}' to '/etc/kernels'!"
 
 	mv /etc/kernels/config-${ARCH}-${KV} /etc/kernels/kernel-config-${ARCH}-${KV} \
@@ -228,7 +228,7 @@ gen_kerncache_is_valid() {
 
 	if [ -e "${KERNCACHE}" ]
 	then
-		tar -xf "${KERNCACHE}" -C "${TEMP}" \
+		"${TAR_COMMAND}" -xf "${KERNCACHE}" -C "${TEMP}" \
 			|| gen_die "Failed to extract '${KERNCACHE}' to '${TEMP}'!"
 
 		if ! isTrue "${KERNEL_SOURCES}"
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 32940a14..41d27914 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -178,7 +178,7 @@ _gkbuild_main() {
 		unset found_dyn_files
 	fi
 
-	tar -caf "${GKPKG_BINPKG}" . \
+	"${TAR_COMMAND}" -caf "${GKPKG_BINPKG}" . \
 		|| die "Failed to create binpkg of ${P} in '${GKPKG_BINPKG}'!"
 }
 
@@ -295,7 +295,7 @@ _initialize() {
 			fi
 
 			print_info 2 "$(get_indent 2)${P}: >> Unpacking required binpkg '${GKPKG_DEP}' ..."
-			tar -xaf "${GKPKG_DEP}" -C "${BROOT}" \
+			"${TAR_COMMAND}" -xaf "${GKPKG_DEP}" -C "${BROOT}" \
 				|| die "Unable to build ${P}: Failed to extract required binpkg '${GKPKG_DEP}' to '${BROOT}'!"
 		done
 		unset GKPKG_DEP
@@ -448,7 +448,7 @@ _src_prepare() {
 
 _src_unpack() {
 	cd "${WORKDIR}" || die "Failed to chdir to '${WORKDIR}'!"
-	tar -xaf "${GKPKG_SRCTAR}" \
+	"${TAR_COMMAND}" -xaf "${GKPKG_SRCTAR}" \
 		|| die "Failed to unpack '${GKPKG_SRCTAR}' to '${WORKDIR}'!"
 }
 
diff --git a/worker_modules/unpack.sh b/worker_modules/unpack.sh
index b0a03fcb..2706bc55 100644
--- a/worker_modules/unpack.sh
+++ b/worker_modules/unpack.sh
@@ -21,6 +21,6 @@ _unpack_main() {
 		mkdir -p "${UNPACK_DIR}" || die "Failed to create '${UNPACK_DIR}'!"
 	fi
 
-	tar -xaf "${UNPACK_FILE}" --directory "${UNPACK_DIR}" \
+	"${TAR_COMMAND}" -xaf "${UNPACK_FILE}" --directory "${UNPACK_DIR}" \
 		|| die "Failed to unpack '${UNPACK_FILE}' to '${UNPACK_DIR}'!"
 }