merge of '400e309c08a8818180ce9e6440f4695a898cdf83'

     and '918e51dad50cec492dd6963b204ad643f9ec7f35'

7 files changed, 9 insertions, 23 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3eb3ab436f..fd4830d849 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -320,8 +320,9 @@ export palmqtdir = "/opt/QtPalmtop"
 
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net"
+SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net"
 GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
+GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone"
 GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
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/include/angstrom.inc b/conf/distro/include/angstrom.inc
index c057d1a05e..79ec27af72 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -50,3 +50,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 2e004d26bd..c0401d93d3 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -35,7 +35,7 @@
 #DISTRO_TYPE
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.2"
+SLUGOS_VERSION = "4.3"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
@@ -169,18 +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"
-
-# Latest linphone supports yeaphone
-PREFERRED_VERSION_linphone ?= "1.6.0"
-
 # 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/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 \
 "
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index 85bce509b1..ae3e74bee4 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -22,3 +22,4 @@ require conf/machine/include/tune-xscale.conf
 require conf/machine/include/tune-thumb.conf
 
 module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_palmz72-battery = "palmz72-battery"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 4cad129a9d..71eac0d6c5 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "i686"
 
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"