X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=scripts%2Fdeptest.sh;h=33dfa8337642a1e35387e723023d2b3560a6b973;hb=cb7138af960e370aba8cb525ff56e54c26a6218b;hp=ab54b513d810185d0ea47ceff9aa5ca7b67a9ccf;hpb=c170bb0a1a542c590e339c5bb022d2e0be10f89b;p=openwrt.git

diff --git a/scripts/deptest.sh b/scripts/deptest.sh
index ab54b513d8..33dfa83376 100755
--- a/scripts/deptest.sh
+++ b/scripts/deptest.sh
@@ -1,23 +1,41 @@
 #!/bin/bash
 
-DIR="$PWD/tmp/deptest"
-STAMP_DIR="$DIR/stamp"
-BUILD_DIR="$DIR/build"
-BUILD_DIR_HOST="$DIR/build_host"
-STAGING_DIR="$DIR/staging"
-STAGING_DIR_HOST="$DIR/staging_host"
-STAGING_DIR_HOST_TMPL="$DIR/staging_host_tmpl"
+SCRIPTDIR="$(dirname "$0")"
+[ "${SCRIPTDIR:0:1}" = "/" ] || SCRIPTDIR="$PWD/$SCRIPTDIR"
+BASEDIR="$SCRIPTDIR/.."
+
+DIR="$BASEDIR/tmp/deptest"
+STAMP_DIR_SUCCESS="$DIR/stamp-success"
+STAMP_DIR_FAILED="$DIR/stamp-failed"
+STAMP_DIR_BLACKLIST="$DIR/stamp-blacklist"
+BUILD_DIR="$DIR/build_dir/target"
+BUILD_DIR_HOST="$DIR/build_dir/host"
+STAGING_DIR="$DIR/staging_dir"
+STAGING_DIR_HOST="$DIR/staging_dir_host"
+STAGING_DIR_HOST_TMPL="$DIR/staging_dir_host_tmpl"
 LOG_DIR="$DIR/logs"
 
-mkdir -p "$STAMP_DIR" "$BUILD_DIR" "$LOG_DIR"
+die()
+{
+	echo "$@"
+	exit 1
+}
+
+[ -f "$BASEDIR/include/toplevel.mk" ] || \
+	die "Error: Could not find buildsystem base directory"
+[ -f "$BASEDIR/.config" ] || \
+	die "The buildsystem is not configured. Please run make menuconfig."
+cd "$BASEDIR" || die "Failed to enter base directory"
+
+mkdir -p "$STAMP_DIR_SUCCESS" "$STAMP_DIR_FAILED" "$STAMP_DIR_BLACKLIST" \
+	"$BUILD_DIR" "$BUILD_DIR_HOST" "$LOG_DIR"
 
 [ -d "$STAGING_DIR_HOST_TMPL" ] || {
 	rm -rf staging_dir/host
-	make tools/install || {
-		echo "make tools/install failed, please check"
-		exit 1
-	}
+	make tools/install V=99 || die "make tools/install failed, please check"
 	cp -al staging_dir/host "$STAGING_DIR_HOST_TMPL"
+	make toolchain/install V=99 || die "make toolchain/install failed, please check"
+	make target/linux/install V=99 || die "make target/linux/install failed, please check"
 }
 
 for pkg in `cat tmp/.packagedeps  | grep CONFIG_PACKAGE | grep -v curdir | sed -e 's,.*[/=]\s*,,' | sort -u`; do
@@ -25,11 +43,19 @@ for pkg in `cat tmp/.packagedeps  | grep CONFIG_PACKAGE | grep -v curdir | sed -
 	for conf in `grep CONFIG_PACKAGE tmp/.packagedeps | grep -E "[ /]$pkg\$" | sed -e 's,package-$(\(CONFIG_PACKAGE_.*\)).*,\1,'`; do
 		grep "$conf=" .config > /dev/null && SELECTED=1
 	done
-	[ -f "$STAMP_DIR/$pkg-done" ] && continue
+	STAMP_SUCCESS="$STAMP_DIR_SUCCESS/$pkg"
+	STAMP_FAILED="$STAMP_DIR_FAILED/$pkg"
+	STAMP_BLACKLIST="$STAMP_DIR_BLACKLIST/$pkg"
+	rm -f "$STAMP_FAILED"
+	[ -f "$STAMP_SUCCESS" ] && continue
 	[ -n "$SELECTED" ] || {
 		echo "Package $pkg is not selected"
 		continue
 	}
+	[ -f "$STAMP_BLACKLIST" ] && {
+		echo "Package $pkg is blacklisted"
+		continue
+	}
 	echo "Testing package $pkg..."
 	rm -rf "$STAGING_DIR"
 	mkdir -p "$STAGING_DIR"
@@ -40,8 +66,11 @@ for pkg in `cat tmp/.packagedeps  | grep CONFIG_PACKAGE | grep -v curdir | sed -
 		BUILD_DIR_HOST="$BUILD_DIR_HOST" \
 		STAGING_DIR="$STAGING_DIR" \
 		STAGING_DIR_HOST="$STAGING_DIR_HOST" \
-		V=99 >"$LOG_DIR/$(basename $pkg).log" 2>&1 \
-	&& touch "$STAMP_DIR/$pkg-done" || {
+		V=99 >"$LOG_DIR/$(basename $pkg).log" 2>&1
+	if [ $? -eq 0 ]; then
+		touch "$STAMP_SUCCESS"
+	else
+		touch "$STAMP_FAILED"
 		echo "Building package $pkg failed!"
-	}
+	fi
 done