merge of 6b9aad33efbe7d42956463905d36b5d886340224

     and c9370fe0b51a1422478e89483290e5776597d26c

98 files changed, 2910 insertions, 76 deletions

diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 1be7bf8c33..e98edb4777 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,9 +1,6 @@
 def tinder_form_data(bound, dict, log):
-    """
-    Create the boundary for the HTTP Post
-    """
     output = []
-
+  #br
     # for each key in the dictionary
     for name in dict:
         output.append( "--" + bound )
@@ -257,7 +254,7 @@ def tinder_do_tinder_report(event):
     name = getName(event)
     log  = ""
     status = 1
-
+    #print asd 
     # Check what we need to do Build* shows we start or are done
     if name == "BuildStarted":
         tinder_build_start(event.data)
@@ -295,8 +292,18 @@ def tinder_do_tinder_report(event):
         log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True)
         status = 200
     elif name == "BuildCompleted":
-	log += "Build Completed\n"
+        log += "Build Completed\n"
         status = 100
+    elif name == "MultipleProviders":
+        log += "<--- TINDERBOX Multiple Providers\n"
+        log += "multiple providers are available (%s);\n" % ", ".join(event.getCandidates())
+        log += "consider defining PREFERRED_PROVIDER_%s\n" % event.getItem()
+        log += "is runtime: %d" % event.isRuntime()
+        log += "---> TINDERBOX Multiple Providers\n"
+    elif name == "NoProvider":
+        log += "Error: No Provider for: %s\n" % event.getItem()
+        log += "Error:Was Runtime: %d\n" % event.isRuntime()
+        status = 200
 
     # now post the log
     if len(log) == 0:
@@ -312,7 +319,6 @@ addhandler tinderclient_eventhandler
 python tinderclient_eventhandler() {
     from bb import note, error, data
     from bb.event import NotHandled
-
     do_tinder_report = data.getVar('TINDER_REPORT', e.data, True)
     if do_tinder_report and do_tinder_report == "1":
         tinder_do_tinder_report(e)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 6afd6ca2cd..a2ba5e6382 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime"
+ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native"
 
 ##################################################################
 # Package default variables.
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index be0f5e93fe..37756ac5ef 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -33,7 +33,7 @@ PREFERRED_VERSION_qte = "2.3.10"
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-#PREFERRED_PROVIDER_libx11 = "diet-x11"
+PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
@@ -44,21 +44,18 @@ PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
 #EABI stuff
-#PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_gcc ?= "4.0.2"
-PREFERRED_VERSION_gcc-cross ?= "4.0.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
-
+PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
 
 #use EABI toolchain
-#PREFERRED_VERSION_gcc ?= "4.1.0"
-#PREFERRED_VERSION_gcc-cross ?= "4.1.0"
-#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
-#PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
-#PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
-#PREFERRED_VERSION_glibc ?= "2.3.6+cvs20060314"
-#PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+cvs20060314"
+PREFERRED_VERSION_gcc ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross ?= "4.1.0"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
+PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 3102e53062..c63a5c53b7 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -17,12 +17,13 @@ INHERIT += "package_ipk debian"
 #use multimachine buildrules 
 include conf/distro/include/multimachine.conf
 
-#Generate locales on the buildsystem instead of on the target. Speeds up first boot
-ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+ENABLE_BINARY_LOCALE_GENERATION ?= ""
 
 
-#EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime
-#TARGET_OS = "none-linux-gnueabi"
+#Use the ARM EABI when building for an ARM cpu.
+TARGET_VENDOR_arm = "-none"
+TARGET_OS_arm = "linux-gnueabi"
 TARGET_OS = "linux"
 
 #mess with compiler flags to use -Os instead of -O2
@@ -30,11 +31,12 @@ TARGET_OS = "linux"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
 
-#eabi is softfloat by default, but let's make sure :)
+#EABI is softfloat by default, but let's make sure :)
 TARGET_FPU = "soft"
 
 PARALLEL_INSTALL_MODULES = "1"
 
+#Always ship these packages
 BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
 BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
 
@@ -42,4 +44,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 
+# Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 85afa71d35..5d82b4f9f7 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -1,5 +1,6 @@
 BBFILES := "\
 ${PKGDIR}/packages/alsa/*.bb \
+${PKGDIR}/packages/apr/*.bb \
 ${PKGDIR}/packages/atftp/*.bb \
 ${PKGDIR}/packages/audiofile/*.bb \
 ${PKGDIR}/packages/aumix/*.bb \
@@ -38,6 +39,7 @@ ${PKGDIR}/packages/dbus/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/device-mapper/*.bb \
 ${PKGDIR}/packages/devlabel/*.bb \
+${PKGDIR}/packages/didiwiki/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/diffutils