aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-11-02 22:48:29 +0000
committerMichael Büsch <mb@bu3sch.de>2010-11-02 22:48:29 +0000
commit686a035a4932962e694b529c56f93a51589d2406 (patch)
tree87e2193ed192a9b4f66763062e9ca5f1d88d5882 /scripts
parentd4d4d268bae5c7c4342ad94682d6320a21e8f159 (diff)
downloadupstream-686a035a4932962e694b529c56f93a51589d2406.tar.gz
upstream-686a035a4932962e694b529c56f93a51589d2406.tar.bz2
upstream-686a035a4932962e694b529c56f93a51589d2406.zip
deptest: Also make sure the toolchain is built in the initialization step. This makes it possible to run the script from within a fresh tree.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23806 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/deptest.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/deptest.sh b/scripts/deptest.sh
index 3ce4291b31..b82ac46587 100755
--- a/scripts/deptest.sh
+++ b/scripts/deptest.sh
@@ -12,13 +12,17 @@ LOG_DIR="$DIR/logs"
mkdir -p "$STAMP_DIR_SUCCESS" "$STAMP_DIR_FAILED" "$BUILD_DIR" "$LOG_DIR"
+die()
+{
+ echo "$@"
+ exit 1
+}
+
[ -d "$STAGING_DIR_HOST_TMPL" ] || {
rm -rf staging_dir/host
- make tools/install V=99 || {
- 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"
}
for pkg in `cat tmp/.packagedeps | grep CONFIG_PACKAGE | grep -v curdir | sed -e 's,.*[/=]\s*,,' | sort -u`; do