merge of 885d90470dc44f85332ae3b62f38a1f1cf91b4c5

     and c9530ced58773f4fa9498d173533e73615774c22

11 files changed, 230 insertions, 9 deletions

diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index 45c4ecef79..e12fc4ef2a 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -43,7 +43,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_x11 = "diet-x11"
 
-include conf/distro/preferred-gpe-versions.inc
+include conf/distro/preferred-gpe-versions-2.7.inc
 
 #
 # E
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 0c7b93dd19..27ee4fa30e 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -58,10 +58,13 @@ ${PKGDIR}/packages/install/*.bb \
 ${PKGDIR}/packages/iperf/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/iptables/*.bb \
+${PKGDIR}/packages/iputils/*.bb \
 ${PKGDIR}/packages/ircp/*.bb \
 ${PKGDIR}/packages/ixp425-eth/*.bb \
 ${PKGDIR}/packages/ixp4xx/*.bb \
 ${PKGDIR}/packages/jpeg/*.bb \
+${PKGDIR}/packages/joe/*.bb \
 ${PKGDIR}/packages/less/*.bb \
 ${PKGDIR}/packages/libaal/*.bb \
 ${PKGDIR}/packages/libao/*.bb \
@@ -167,11 +170,15 @@ ${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/update-rc.d/*.bb \
 ${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 \
+${PKGDIR}/packages/zd1211/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 78e3cc0378..748228f304 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -15,7 +15,7 @@ TARGET_OS = "linux"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += " package_ipk debian nslu2_flashimg"
+INHERIT += " package_ipk debian nslu2-jffs2-image"
 
 # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
 # the .bb files for the packages to build - see openslug-packages.conf in this
@@ -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/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index d468d89e65..e35f997529 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -48,7 +48,7 @@ include conf/distro/preferred-opie-versions.inc
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDER_x11 = "diet-x11"
-include conf/distro/preferred-gpe-versions.inc
+include conf/distro/preferred-gpe-versions-2.7.inc
 
 #
 # E
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
new file mode 100644
index 0000000000..0c028c5345
--- /dev/null
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -0,0 +1,85 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+CVSDATE_minimo=20050401
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+
+#specify versions, as the header says :)
+PREFERRED_VERSION_libmatchbox ?= "1.6"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.4"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_cairo ?= "0.5.2"
+PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_libgpewidget ?= "0.103"
+PREFERRED_VERSION_libgpepimc ?= "0.5"
+PREFERRED_VERSION_libgpevtype ?= "0.12"
+PREFERRED_VERSION_libschedule ?= "0.14"
+PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.14"
+#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.81"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.63"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.54"
+PREFERRED_VERSION_gpe-calendar ?= "0.61"
+PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+PREFERRED_VERSION_gpe-contacts ?= "0.41"
+PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23.4"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+PREFERRED_VERSION_gpe-su ?= "0.18"
+PREFERRED_VERSION_gpe-conf ?= "0.1.24"
+PREFERRED_VERSION_gpe-clock ?= "0.20"
+PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.18"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.49"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.29"
+PREFERRED_VERSION_gpe-gallery ?= "0.96"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-filemanager ?= "0.23"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.21"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 489b1c0112..66bb74577b 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -76,6 +76,7 @@ ${PKGDIR}/packages/libvorbis/*.bb \
 ${PKGDIR}/packages/libxml/*.bb \
 ${PKGDIR}/packages/linux-libc-headers/*.bb \
 ${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/lrzsz/*.bb \
 ${PKGDIR}/packages/lsof/*.bb \
 ${PKGDIR}/packages/lzo/*.bb \
 ${PKGDIR}/packages/m4/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 0376eadd00..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_flashimg"
+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/distro/unslung-binary-kernel-packages.conf b/conf/distro/unslung-binary-kernel-packages.conf
new file mode 100644
index 0000000000..3e9059fae8
--- /dev/null
+++ b/conf/distro/unslung-binary-kernel-packages.conf
@@ -0,0 +1,38 @@
+# automatically generated by bitbake freeze
+BBFILES := "\
+${PKGDIR}/packages/autoconf/*.bb \
+${PKGDIR}/packages/automake/*.bb \
+${PKGDIR}/packages/binutils/*.bb \
+${PKGDIR}/packages/bison/*.bb \
+${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/cpio/*.bb \
+${PKGDIR}/packages/devio/*.bb \
+${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/findutils/*.bb \
+${PKGDIR}/packages/flex/*.bb \
+${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/gcc/*.bb \
+${PKGDIR}/packages/genext2fs/*.bb \
+${PKGDIR}/packages/gettext/*.bb \
+${PKGDIR}/packages/glibc/*.bb \
+${PKGDIR}/packages/gnu-config/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
+${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/libtool/*.bb \
+${PKGDIR}/packages/linux-libc-headers/*.bb \
+${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/m4/*.bb \
+${PKGDIR}/packages/makedevs/*.bb \
+${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/modutils/*.bb \
+${PKGDIR}/packages/mtd/*.bb \
+${PKGDIR}/packages/nslu2-binary-only/*.bb \
+${PKGDIR}/packages/pkgconfig/*.bb \
+${PKGDIR}/packages/portmap/*.bb \
+${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/unzip/*.bb \
+${PKGDIR}/packages/update-modules/*.bb \
+${PKGDIR}/packages/wget/*.bb \
+${PKGDIR}/packages/zlib/*.bb \
+${UNSLUNG_EXTRA_BBFILES}"
diff --git a/conf/distro/unslung-binary-kernel.conf b/conf/distro/unslung-binary-kernel.conf
new file mode 100644
index 0000000000..20a1e32fa7
--- /dev/null
+++ b/conf/distro/unslung-binary-kernel.conf
@@ -0,0 +1,56 @@
+#@TYPE: Distribution
+#@NAME: Unslung 
+#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
+
+FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/unslung/cross"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
+
+DISTRO_NAME = "Unslung"
+DISTRO_VERSION = "6.0-beta"
+DISTRO_TYPE = "beta"
+
+# pull in the frozen list of bbfiles
+UNSLUNG_EXTRA_BBFILES ?= ""
+include conf/distro/freeze.conf
+
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+INHERIT += " package_ipk nslu2-ramdisk-image"
+
+# The OVERRIDES are modified here so that 'unslung' overrides are picked up if
+# present (unslung-binary-kernel overrides take precedence).
+NSLU2_BASE_DISTRO = ":unslung"
+
+IMAGE_FSTYPE = "ext2.gz"
+UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
+EXTRA_IMAGECMD_ext2.gz = "-D ${UNSLUNG_DEVICE_TABLE}"
+IMAGE_ROOTFS_SIZE_ext2.gz = "14000"
+
+UNSLUNG_EXTRA_DEPENDS  ?= ""
+UNSLUNG_EXTRA_RDEPENDS ?= "\
+kernel-module-usbnet \
+kernel-module-pegasus kernel-module-kaweth \
+kernel-module-usbserial \
+kernel-module-pl2303 kernel-module-ftdi-sio"
+
+UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
+
+# Select between multiple alternative providers, if more than one is eligible.
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+PREFERRED_VERSION_glibc ?= "2.2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.2.5"
+PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
+PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf
index 1f41b1e846..3e9059fae8 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/unslung-packages.conf
@@ -12,6 +12,7 @@ ${PKGDIR}/packages/findutils/*.bb \
 ${PKGDIR}/packages/flex/*.bb \
 ${PKGDIR}/packages/freeze/*.bb \
 ${PKGDIR}/packages/gcc/*.bb \
+${PKGDIR}/packages/genext2fs/*.bb \
 ${PKGDIR}/packages/gettext/*.bb \
 ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 75c251f220..06331707fc 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
 FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.5-beta"
+DISTRO_VERSION = "5.6-alpha"
 DISTRO_TYPE = "beta"
 
 # pull in the frozen list of bbfiles
@@ -19,7 +19,7 @@ TARGET_OS = "linux"
 
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-INHERIT += " package_ipk nslu2_flashimg"
+INHERIT += " package_ipk nslu2-jffs2-image"
 
 IMAGE_FSTYPE = "jffs2"
 UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
@@ -43,3 +43,9 @@ PREFERRED_VERSION_glibc ?= "2.2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.2.5"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
+
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29"
+PREFERRED_VERSION_unslung-rootfs         ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r29"
+PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r29"