move firmware loading to hotplug2-init.rules (should fix #2056)

[openwrt.git] / include / host.mk

diff --git a/include/host.mk b/include/host.mk
index 1130d5b..833aa83 100644 (file)
--- a/include/host.mk
+++ b/include/host.mk
@@ -9,9 +9,11 @@ include $(TMP_DIR)/.host.mk
 
 export TAR
 
-$(TMP_DIR)/.host.mk: $(INCLUDE_DIR)/host.mk
+ifneq ($(__host_inc),1)
+__host_inc:=1
+$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
+       @mkdir -p $(TMP_DIR)
        @( \
-               echo -n "BASH:=$(shell which bash)"; \
                HOST_OS=`uname`; \
                case "$$HOST_OS" in \
                        Linux) HOST_ARCH=`uname -m`;; \
@@ -23,11 +25,16 @@ $(TMP_DIR)/.host.mk: $(INCLUDE_DIR)/host.mk
                echo "HOST_OS:=$$HOST_OS" > $@; \
                echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
                echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-               TAR=`which gtar`; \
-               [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \
+               TAR=`which gtar 2>/dev/null`; \
+               [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
                echo "TAR:=$$TAR" >> $@; \
-               ZCAT=`which gzcat`; \
-               [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
-               echo "ZCAT:=$$ZCAT" >> $@; \
+               echo "BASH:=$(shell which bash)" >> $@; \
        )
 
+endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif