configtools: add config.guess and config.sub scripts to buildsystem, remove package 'configtools', cleanups

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/path

@@ -1,5 +1,14 @@
 set -e
 
+# setup initial directorys
+  CONFIG=config
+  SCRIPTS=scripts
+  PACKAGES=packages
+  SOURCES=sources
+  BUILD_BASE=build
+  TARGET=target
+  ADDONS=addons
+
 test -f config/target-$TARGET_PLATFORM && . config/target-$TARGET_PLATFORM
 
 # determine architecture's family
@@ -26,16 +35,10 @@ if [ -z "$TARGET_CPU" ]; then
   esac
 fi
 
+HOST_NAME=`$SCRIPTS/configtools/config.guess`
 TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
 
 OPENELEC_SRC=http://sources.openelec.tv/src/$OPENELEC_VERSION
-CONFIG=config
-SCRIPTS=scripts
-PACKAGES=packages
-SOURCES=sources
-BUILD_BASE=build
-TARGET=target
-ADDONS=addons
 BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
 [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
 TARGET_IMG=$ROOT/$TARGET
@@ -60,13 +63,6 @@ elif [ "$OPENELEC_VERSION" = debug ]; then
  DEVTOOLS=yes
 fi
 
-HOST_NAME_CACHE=$BUILD/configtools/host_name
-if [ -f $HOST_NAME_CACHE ]; then
-  HOST_NAME=`cat $HOST_NAME_CACHE`
-elif [ -x $BUILD/configtools/config.guess ]; then
-  HOST_NAME=`$BUILD/configtools/config.guess`
-fi
-
 MAKE="$ROOT/$TOOLCHAIN/bin/make"
 MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
 SED="sed -i"

packages/toolchain/devel/configtools/build

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$BUILD/$1/config.guess > $HOST_NAME_CACHE

packages/toolchain/devel/configtools/url

@@ -1 +0,0 @@
-http://sources.openelec.tv/svn/configtools.tar.bz2

packages/toolchain/meta

@@ -6,7 +6,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="configtools make sed pkg-config automake autoconf intltool gcc-final cmake jam yasm"
+PKG_BUILD_DEPENDS="make sed pkg-config automake autoconf intltool gcc-final cmake jam yasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"

scripts/configtools/README

@@ -0,0 +1,2 @@
+URL: http://git.savannah.gnu.org/cgit/config.git
+

scripts/fixconfigtools

@@ -1,17 +1,12 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
-
-# Avoid infinite loop
-[ "$*" = "$BUILD/configtools" ] && exit 0
-
-$SCRIPTS/build configtools
 
 for i in $@; do
-  [ -f "$i/config.guess" ] && cp -f $BUILD/configtools/config.guess $i
+  [ -f "$i/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i
-  [ -f "$i/config.sub" ]   && cp -f $BUILD/configtools/config.sub   $i
+  [ -f "$i/config.sub" ]   && cp -f $SCRIPTS/configtools/config.sub   $i
-  [ -f "$i/configure.guess" ] && cp -f $BUILD/configtools/config.guess $i/configure.guess
+  [ -f "$i/configure.guess" ] && cp -f $SCRIPTS/configtools/config.guess $i/configure.guess
-  [ -f "$i/configure.sub" ]   && cp -f $BUILD/configtools/config.sub   $i/configure.sub
+  [ -f "$i/configure.sub" ]   && cp -f $SCRIPTS/configtools/config.sub   $i/configure.sub
 done
 
 exit 0