From 3e16daee39b50bfccf4d389385f8748da016cdcc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 14 Jul 2011 16:19:51 +0200 Subject: extract tar archive with cpio --- mk/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index 5a6359910..2b50b9e5a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -179,7 +179,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar.xz | *.txz) \ xz -dc $$file | tar -xf - ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ - gzip -dc $$file | tar -xf - ;; \ + gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.cpio.bz2 | *.cbz) \ bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ -- cgit v1.2.3 From 399f830cc2649f6036766b6d4ae66f42815cf741 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 14 Jul 2011 19:06:34 +0200 Subject: use cpio instead of tar --- mk/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index 43371edc2..844fdcffc 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -184,7 +184,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.cpio.bz2 | *.cbz) \ bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ - bzip2 -dc $$file | tar -xf - ;; \ + bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.zip) \ cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \ *.arm) \ -- cgit v1.2.3 From 3e2a35ff753caf8588684daa864e75ed55a9d193 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 14 Jul 2011 20:16:31 +0200 Subject: fix native kernel build for IBM X40 --- mk/modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 0d6a86ebb..78897efc3 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -71,7 +71,7 @@ $(eval $(call KMOD_template,MAC80211,mac80211,\ $(eval $(call KMOD_template,ATH5K,ath5k,\ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath \ $(MODULES_DIR)/kernel/drivers/net/wireless/ath/ath5k/ath5k \ -,20, kmod-leds-class)) +,20)) $(eval $(call KMOD_template,P54_COMMON,p54-common,\ $(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54common \ -- cgit v1.2.3 From 935b72f91744c691306cf2cd685b893fe23c6a7e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 16 Jul 2011 19:26:39 +0200 Subject: revert cpio changes --- 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 844fdcffc..3e8a26094 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -180,11 +180,11 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar.xz | *.txz) \ xz -dc $$file | tar -xf - ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ - gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ + gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ - bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ + bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \ *.arm) \ -- cgit v1.2.3