X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4dfad95acece0e413595f46a90c6105147d8d959..2c6e69a1c56a77df431f23ae01d27b59880c2ec0:/scripts/deptest.sh diff --git a/scripts/deptest.sh b/scripts/deptest.sh index 43757026c..97d9aa2ba 100755 --- a/scripts/deptest.sh +++ b/scripts/deptest.sh @@ -1,6 +1,7 @@ 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" @@ -19,7 +20,7 @@ mkdir -p "$STAMP_DIR" "$BUILD_DIR" "$LOG_DIR" for pkg in `cat tmp/.packagedeps | grep CONFIG_PACKAGE | grep -v curdir | sed -e 's,.*[/=]\s*,,' | sort -u`; do SELECTED= - for conf in `grep CONFIG_PACKAGE tmp/.packagedeps | grep " $pkg\$" | sed -e 's,package-$(\(CONFIG_PACKAGE_.*\)).*,\1,'`; do + 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 @@ -34,6 +35,7 @@ for pkg in `cat tmp/.packagedeps | grep CONFIG_PACKAGE | grep -v curdir | sed - cp -al "$STAGING_DIR_HOST_TMPL" "$STAGING_DIR_HOST" make package/$pkg/compile \ BUILD_DIR="$BUILD_DIR" \ + 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 \