From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 27 Nov 2006 04:25:34 +0000 (+0000)
Subject: trap chmod errors in tar unpack on bsd - modes like 02755 fail
X-Git-Tag: reboot~30359
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=387570cc06ab3aca5824f1856b50a5e3ae5c2dc7;p=openwrt%2Fstaging%2Fchunkeey.git

trap chmod errors in tar unpack on bsd - modes like 02755 fail

SVN-Revision: 5656
---

diff --git a/include/shell.sh b/include/shell.sh
index 6ee0cf6030..1e60692b97 100644
--- a/include/shell.sh
+++ b/include/shell.sh
@@ -13,3 +13,18 @@ isset() {
 	eval "var=\"\${$1}\""
 	[ -n "$var" ]
 }
+
+trapret() {(
+	local retvals="$1"; shift
+	local cmd="$1"; shift
+	for retval in $(echo $retvals); do
+		local trap_$retval=1
+	done
+	"$cmd" "$@" || {
+		local retval="$?"
+		eval "trapped=\${trap_$retval}"
+		[ -n "$trapped" ] || {
+			return $retval
+		}
+	}
+)}
diff --git a/include/unpack.mk b/include/unpack.mk
index e56f624152..051846bd2f 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -1,9 +1,12 @@
 ifeq ($(strip $(PKG_UNPACK)),)
+  ifneq ($(HOST_OS),Linux)
+	TAR := trapret 2 $(PKG_UNPACK) $(TAR)
+  endif
   ifneq ($(strip $(PKG_CAT)),)
     # use existing PKG_CAT
     PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
     ifeq ($(PKG_CAT),unzip)
-      PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
+      PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
     endif
     # replace zcat with $(ZCAT), because some system have it as gzcat
     ifeq ($(PKG_CAT),zcat)