From f77d698f83b230f7efcb7d28af3aacfa9589cc89 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:21 +0200 Subject: [PATCH] support/scripts/apply-patches: use appropriate TAR Note that here, it is in fact not really relevant. We only extract a tarball, and we don't use any "modern" or GNU-only options like --strip-components. However, for consistency it's better to use the same tar everywhere. Signed-off-by: Yann E. MORIN Cc: "Maier, Brandon L Collins" Reviewed-by: brandon.maier@collins.com [Arnout: quote TAR="..."] Signed-off-by: Arnout Vandecappelle --- package/Makefile.in | 2 +- support/scripts/apply-patches.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index f415e55f84..5476234c7e 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -231,7 +231,7 @@ endif INSTALL := $(shell which install || type -p install) UNZIP := $(shell which unzip || type -p unzip) -q -APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) +APPLY_PATCHES = TAR="$(TAR)" PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) HOST_CPPFLAGS = -I$(HOST_DIR)/include HOST_CFLAGS ?= -O2 diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 6da83f6826..4e633b23be 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -146,7 +146,7 @@ function scan_patchdir { unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked" rm -rf "$unpackedarchivedir" 2> /dev/null mkdir "$unpackedarchivedir" - tar -C "$unpackedarchivedir" -xaf "${path}/$i" + ${TAR} -C "$unpackedarchivedir" -xaf "${path}/$i" scan_patchdir "$unpackedarchivedir" else apply_patch "$path" "$i"