From 15c2f0113df065e585b80d2d197714a403f77099 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 8 Feb 2011 16:39:46 +0100 Subject: [PATCH] scripts/fixconfigtools: automate fixing of configtools Signed-off-by: Stephan Raue --- scripts/fixconfigtools | 17 ++++++++++++----- scripts/unpack | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/fixconfigtools b/scripts/fixconfigtools index 3c16456c39..3324302771 100755 --- a/scripts/fixconfigtools +++ b/scripts/fixconfigtools @@ -22,11 +22,18 @@ . config/options $1 -for i in $@; do - [ -f "$i/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i - [ -f "$i/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $i - [ -f "$i/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i/configure.guess - [ -f "$i/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $i/configure.sub +[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}` +[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}` + +for i in `find $PKG_BUILD -name config.guess`; do + CONFIGTOOLSDIR=`dirname $i` + + printf "%${INDENT}c FIXCONFIG $1: $CONFIGTOOLSDIR\n" >&$SILENT_OUT + + [ -f "$CONFIGTOOLSDIR/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR + [ -f "$CONFIGTOOLSDIR/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR + [ -f "$CONFIGTOOLSDIR/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $CONFIGTOOLSDIR/configure.guess + [ -f "$CONFIGTOOLSDIR/configure.sub" ] && cp -f $SCRIPTS/configtools/config.sub $CONFIGTOOLSDIR/configure.sub done exit 0 diff --git a/scripts/unpack b/scripts/unpack index a4f011f4c9..e375cb2c71 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -85,7 +85,7 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do fi done -$SCRIPTS/fixconfigtools $PKG_BUILD +$SCRIPTS/fixconfigtools $1 [ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT