[package] base-files: Cancel firmware loading if file doesn't exist

[openwrt.git] / include / host.mk

diff --git a/include/host.mk b/include/host.mk
index 497d044..b93ab8d 100644 (file)
--- a/include/host.mk
+++ b/include/host.mk
@@ -6,7 +6,7 @@
 #
 
 TMP_DIR ?= $(TOPDIR)/tmp
 #
 
 TMP_DIR ?= $(TOPDIR)/tmp

-ifndef DUMP
+ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)

   -include $(TMP_DIR)/.host.mk
 endif
 
   -include $(TMP_DIR)/.host.mk
 endif
 


@@ -30,6 +30,7 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
                echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
                echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
                TAR=`which gtar 2>/dev/null`; \
                echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
                echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
                TAR=`which gtar 2>/dev/null`; \

+               [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 2>/dev/null`; \

                [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
                echo "TAR:=$$TAR" >> $@; \
                FIND=`which gfind 2>/dev/null`; \
                [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
                echo "TAR:=$$TAR" >> $@; \
                FIND=`which gfind 2>/dev/null`; \