merge of 26ad3f94c9657a7c1863c3ac7d31f1fa6c42b738

     and 65876316eaa0a47f796c7bf502478eb9c886d0b8

4 files changed, 35 insertions, 6 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 79c680a12d..4df804800b 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -172,8 +172,10 @@ ${PKGDIR}/packages/upslug/*.bb \
 ${PKGDIR}/packages/usbutils/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/watchdog/*.bb \
+${PKGDIR}/packages/wireless-tools/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index b5a580d97b..748228f304 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -163,3 +163,5 @@ PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
+
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 39251c5375..be2e54e917 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -7,6 +7,7 @@
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "UcSlugC"
 DISTRO_VERSION = "1.1-beta"
+DISTRO_FEED = "unstable"
 DISTRO_TYPE ?= "beta"
 
 TARGET_FPU = "soft"
@@ -19,7 +20,7 @@ ARM_INTERWORK = ":thumb-interwork"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += " package_ipk debian nslu2-jffs2-image"
+INHERIT += " package_ipk debian"
 
 # The OVERRIDES are modified here so that 'openslug' overrides are picked up if
 # present (ucslugc overrides take precedence).
@@ -46,11 +47,15 @@ include conf/distro/freeze.conf
 #  (such as a local feed) can be defined in local.conf
 #----------------------------------------------------------------------------------
 # Add to the user's feeds from local.conf (there may be none)
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_VERSION}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_VERSION}"
+#
+#NOTE: at present there is no released feed for ucslugc, therefore this feed
+# is set to the 'unstable' version.  In released images DISTRO_FEED will typically
+# be DISTRO_VERSION.
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_FEED}"
 
 #
-# Uncomment the following to get the unstable feeds
+# Uncomment the following to get the unstable feeds in a released version.
 #FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/unstable"
 #FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable"
 
@@ -76,6 +81,24 @@ CMDLINE_DEBUG = "noirqdebug"
 # root file system), if this is not the case the following must not be done!
 IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
 
+# Building a full image.  If you add the following extra commands will be
+# appended to the openslug-image build by classes/nslu2-jffs2-image.bbclass
+# (note that you can, instead, simply add 'inherit nslu2-jffs2-image' to
+# openslug-image.bb).  If you do this you will need to find a source for the
+# LinkSys software to be placed in the full image - 'RedBoot' (the boot loader),
+# 'Trailer' (just a bunch of bytes to flag the image as valid) and 'SysConf'
+# (actually just a block of unset data - you could modify this to pre-configure
+# the SysConf partition of the image).  If you own an NSLU2 then this data is
+# already in the flash of the NSLU2 and you can download it (including new
+# versions) from the LinkSys web site - the bbclass will output information
+# about where to put the downloaded data.
+#
+#NOTE: you do not actually need the boot loader in normal use because it is
+# *not* overwritten by a standard upslug upgrade, so you can make an image with
+# just non-LinkSys software which can be flashed into the NSLU2.
+
+#INHERIT += " nslu2-jffs2-image"
+
 # EXTRA PACKAGES
 # --------------
 # UcSlugC builds an openslug-image with no extra packages - to add packages to the
@@ -108,3 +131,5 @@ PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
+
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index da7952d994..9e1b677ecf 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -22,8 +22,8 @@ include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-xscale.conf