8 files changed, 12 insertions, 26 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 1694ef889a..263673f7f5 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -113,7 +113,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.7"
+PREFERRED_VERSION_gtk+ = "2.10.9"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
@@ -149,14 +149,14 @@ PREFERRED_PROVIDER_ntp = "ntp"
 PREFERRED_PROVIDER_hotplug = "udev"
 PREFERRED_PROVIDER_libxss = "libxss"
 
-
-#EABI stuff
+#NPTL stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-linux-libc-for-gcc = "glibc-intermediate"
 
 #shouldn't that be uclibc-initial????
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index d33ae96c68..2a33ad4164 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -31,7 +31,6 @@ DEBIANSLUG_EXTRA_BBFILES ?= ""
 # NOTE: only jffs2 support is an absolute requirement of boot, even
 # the ext2/ext3 support is optional!
 DEBIANSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
-DEBIANSLUG_REISER_PROGS = "reiserfsprogs"
 
 # The standard firmware contents and additional packages built as requirements
 # of the firmware are defined here in DEBIANSLUG_STANDARD_RDEPENDS and
@@ -40,7 +39,7 @@ DEBIANSLUG_STANDARD_RDEPENDS = ""
 
 # Support for a variety of file systems is built in to the debianslug
 # image, programs to format disks with these file systems may be
-# added or removed.  By default ext2. ext3 and reiserfs supported
+# added or removed.  By default ext2 and ext3 support
 # is included by the following lines.
 # 
 # These lines add support for formatting ext2 and ext3 file systems
@@ -48,10 +47,6 @@ DEBIANSLUG_STANDARD_RDEPENDS = ""
 # file system.
 DEBIANSLUG_STANDARD_RDEPENDS += "${DEBIANSLUG_EXT2_PROGS}"
 
-# These lines add support for formatting reiserfs file systems on
-# a hard disk.
-DEBIANSLUG_STANDARD_RDEPENDS += "${DEBIANSLUG_REISER_PROGS}"
-
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
 # supports a serial port.)
@@ -81,7 +76,6 @@ kernel-module-vfat \
 kernel-module-ntfs \
 kernel-module-isofs \
 kernel-module-udf \
-kernel-module-reiserfs \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 27c0437cf5..17d7d657b1 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -19,7 +19,6 @@ DISTRO_TYPE = "debug"
 #
 # Naming schemes
 #
-PARALLEL_INSTALL_MODULES = "1"
 INHERIT += "debian multimachine"
 
 #
@@ -53,10 +52,13 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 TARGET_OS = "linux"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
+
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
index 8274148823..4cdb68b4e3 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -13,8 +13,6 @@ TARGET_FPU = "soft"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
 
-PARALLEL_INSTALL_MODULES = "1"
-
 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')}"
 
 # Set minimal version of BitBake needed
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 27e34856fd..53e187abf0 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -34,6 +34,8 @@ SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-stroke ?= "20060612"
 SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
+SRCDATE_libmatchbox ?= "20060612"
+SRCDATE_libfakekey ?= "20051101"
 SRCDATE_psplash ?= "20061207"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 4c849d095d..ba61355ba8 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -169,15 +169,12 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.20"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 SRCDATE_diet-x11 ?= "20060106"
 
-# Latest wpa-supplicant which supports madwifi-ng
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
-
 # Ensure consistency across all SlugOS builds for the provider of a
 # relational database - use the latest version of the SleepyCat
 # Berkeley database
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index fc50cefe40..fd07a1a3b9 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -8,7 +8,6 @@ DISTRO_TYPE = "alpha"
 #
 # Naming schemes
 #
-#PARALLEL_INSTALL_MODULES = "1"
 INHERIT += "debian"
 
 #
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 1091aa2e98..02becf3bae 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -31,7 +31,6 @@ OPENSLUG_EXTRA_BBFILES ?= ""
 # NOTE: only jffs2 support is an absolute requirement of boot, even
 # the ext2/ext3 support is optional!
 OPENSLUG_EXT2_PROGS =  "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
-OPENSLUG_REISER_PROGS = "reiserfsprogs"
 
 # The standard firmware contents and additional packages built as requirements
 # of the firmware are defined here in OPENSLUG_STANDARD_RDEPENDS and
@@ -40,7 +39,7 @@ OPENSLUG_STANDARD_RDEPENDS = ""
 
 # Support for a variety of file systems is built in to the openslug
 # image, programs to format disks with these file systems may be
-# added or removed.  By default ext2. ext3 and reiserfs supported
+# added or removed.  By default ext2 and ext3 support
 # is included by the following lines.
 # 
 # These lines add support for formatting ext2 and ext3 file systems
@@ -48,10 +47,6 @@ OPENSLUG_STANDARD_RDEPENDS = ""
 # file system.
 OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
 
-# These lines add support for formatting reiserfs file systems on
-# a hard disk.
-OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
-
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
 # supports a serial port.)
@@ -81,7 +76,6 @@ kernel-module-vfat \
 kernel-module-ntfs \
 kernel-module-isofs \
 kernel-module-udf \
-kernel-module-reiserfs \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "