From 9d75f0d407be54a14bbb6bcae4d96cb433b69c86 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 1 Aug 2010 23:45:44 +0200
Subject: remove unzip dependency, use delivered cpio. some code cleanup

---
 mk/vars.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index fdd9f432c..6f38db944 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -102,7 +102,7 @@ EXTRACT_CMD=		mkdir -p ${WRKDIR}; \
 			cd ${WRKDIR} && \
 			for file in ${FULLDISTFILES}; do case $$file in \
 			*.cpio) \
-				cat $$file | cpio -i -d ;; \
+				cat $$file | $(STAGING_TOOLS)/bin/cpio -i -d ;; \
 			*.tar) \
 				tar -xf $$file ;; \
 			*.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
@@ -114,7 +114,7 @@ EXTRACT_CMD=		mkdir -p ${WRKDIR}; \
 			*.tar.bz2 | *.tbz | *.tbz2) \
 				bzip2 -dc $$file | tar -xf - ;; \
 			*.zip) \
-				unzip -qd ${WRKDIR} $$file ;; \
+				cat $$file | $(STAGING_TOOLS)/bin/cpio -ivd -H zip ;; \
 			*.arm) \
 				cp $$file ${WRKDIR} ;; \
 			*) \
-- 
cgit v1.2.3