summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-03 14:58:32 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-03 14:58:32 +0000
commit22441e917150b2919e52632a306d32187db6915b (patch)
tree68a47a005751b61cff44d3a7c5886a7c3560c304
parent30a7395e396d026585c9be140c9f10ba5a5b6861 (diff)
deptest: Install of host tools has to be forced for every test, because the host staging dir is cleaned prior a test.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23825 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/host-build.mk4
-rwxr-xr-xscripts/deptest.sh1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/host-build.mk b/include/host-build.mk
index 1b7f35406..6f742d28a 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -153,12 +153,12 @@ ifndef DUMP
$(call Host/Compile)
touch $$@
- $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT)
+ $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
$(call Host/Install)
mkdir -p $$(shell dirname $$@)
touch $$@
else
- $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+ $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)
$(call Host/Compile)
$(call Host/Install)
touch $$@
diff --git a/scripts/deptest.sh b/scripts/deptest.sh
index 730ca5bd3..a0c3017c7 100755
--- a/scripts/deptest.sh
+++ b/scripts/deptest.sh
@@ -74,6 +74,7 @@ test_package() # $1=pkgname
BUILD_DIR_HOST="$BUILD_DIR_HOST" \
STAGING_DIR="$STAGING_DIR" \
STAGING_DIR_HOST="$STAGING_DIR_HOST" \
+ FORCE_HOST_INSTALL=1 \
V=99 >"$LOG_DIR/$(basename $pkg).log" 2>&1
if [ $? -eq 0 ]; then
touch "$STAMP_SUCCESS"