merge of ddc841bc5413de481ba5f7392575bba7a9ef04a7

     and f19ce428c20ed51be635a051213519acfded5d4b

10 files changed, 61 insertions, 26 deletions

diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index 3ab2c056ae..158d7757b6 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -1,10 +1,11 @@
 # automatically generated by bitbake freeze
 BBFILES := "\
-${PKGDIR}/packages/gzip/*.bb \
+${PKGDIR}/packages/apache/*.bb \
+${PKGDIR}/packages/openssl/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/meta/package-index.bb \
 ${PKGDIR}/packages/meta/openslug-native-packages.bb \
 ${PKGDIR}/packages/freeze/*.bb \
-${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/pcre/*.bb \
+${PKGDIR}/packages/expat/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
-# I don't know of any packages we currently need to compile nativly, so this is something to test with
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 27ee4fa30e..316a030f8a 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -1,6 +1,8 @@
 BBFILES := "\
+${PKGDIR}/packages/alsa/*.bb \
 ${PKGDIR}/packages/atftp/*.bb \
 ${PKGDIR}/packages/audiofile/*.bb \
+${PKGDIR}/packages/aumix/*.bb \
 ${PKGDIR}/packages/autoconf/*.bb \
 ${PKGDIR}/packages/automake/*.bb \
 ${PKGDIR}/packages/base-files/*.bb \
@@ -44,6 +46,7 @@ ${PKGDIR}/packages/gcc/*.bb \
 ${PKGDIR}/packages/gdb/*.bb \
 ${PKGDIR}/packages/gdbm/*.bb \
 ${PKGDIR}/packages/gettext/*.bb \
+${PKGDIR}/packages/glib-1.2/*.bb \
 ${PKGDIR}/packages/glib-2.0/*.bb \
 ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
@@ -55,26 +58,32 @@ ${PKGDIR}/packages/hotplug-ng/*.bb \
 ${PKGDIR}/packages/icecast/*.bb \
 ${PKGDIR}/packages/initscripts/*.bb \
 ${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/intltool/*.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/irssi/*.bb \
 ${PKGDIR}/packages/ixp425-eth/*.bb \
 ${PKGDIR}/packages/ixp4xx/*.bb \
 ${PKGDIR}/packages/jpeg/*.bb \
 ${PKGDIR}/packages/joe/*.bb \
+${PKGDIR}/packages/lcdproc/*.bb \
 ${PKGDIR}/packages/less/*.bb \
 ${PKGDIR}/packages/libaal/*.bb \
 ${PKGDIR}/packages/libao/*.bb \
+${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
+${PKGDIR}/packages/libgsm/*.bb \
 ${PKGDIR}/packages/libid3tag/*.bb \
 ${PKGDIR}/packages/liblockfile/*.bb \
 ${PKGDIR}/packages/libmad/*.bb \
 ${PKGDIR}/packages/libmikmod/*.bb \
 ${PKGDIR}/packages/libogg/*.bb \
+${PKGDIR}/packages/libol/*.bb \
 ${PKGDIR}/packages/libpcap/*.bb \
 ${PKGDIR}/packages/libpng/*.bb \
 ${PKGDIR}/packages/libtiff/*.bb \
@@ -144,6 +153,7 @@ ${PKGDIR}/packages/puppy/*.bb \
 ${PKGDIR}/packages/pwc/*.bb \
 ${PKGDIR}/packages/python/*.bb \
 ${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/qc-usb/*.bb \ 
 ${PKGDIR}/packages/readline/*.bb \
 ${PKGDIR}/packages/reiser4progs/*.bb \
 ${PKGDIR}/packages/reiserfsprogs/*.bb \
@@ -154,11 +164,13 @@ ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/spca5xx/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
 ${PKGDIR}/packages/sysfsutils/*.bb \
+${PKGDIR}/packages/syslog-ng/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/tar/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 0c028c5345..8d3d03f779 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,22 +3,25 @@
 #
 
 #work around some breakages
-CVSDATE_minimo=20050401
+#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_libmatchbox ?= "1.7"
 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-wm ?= "0.9.5"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_pango ?= "1.8.1"
+PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.103"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
 PREFERRED_VERSION_libgpevtype ?= "0.12"
diff --git a/conf/distro/unslung-binary-kernel.conf b/conf/distro/unslung-binary-kernel.conf
index 20a1e32fa7..3f8dbf3b0c 100644
--- a/conf/distro/unslung-binary-kernel.conf
+++ b/conf/distro/unslung-binary-kernel.conf
@@ -2,14 +2,14 @@
 #@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_VERSION = "6.0-alpha"
 DISTRO_TYPE = "beta"
 
+FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/unstable"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/unstable"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/unstable"
+
 # pull in the frozen list of bbfiles
 UNSLUNG_EXTRA_BBFILES ?= ""
 include conf/distro/freeze.conf
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 06331707fc..482f47881a 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -2,14 +2,14 @@
 #@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 = "5.6-alpha"
+DISTRO_VERSION = "5.6-beta"
 DISTRO_TYPE = "beta"
 
+FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
+
 # pull in the frozen list of bbfiles
 UNSLUNG_EXTRA_BBFILES ?= ""
 include conf/distro/freeze.conf
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
new file mode 100644
index 0000000000..0950a5a008
--- /dev/null
+++ b/conf/machine/borzoi.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3100
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RRECOMMENDS += ""
+
+# Useful things for the built-in Harddisk
+BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+
+IMAGE_FSTYPES = "jffs2 tar"
+
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 0c25562644..f9ecedad46 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -7,14 +7,13 @@ IPKG_ARCHS = "all arm ipaqsa h3600"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params"
+BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
 
 H3600_MODULES = "\
 h3600-asic \
 h3600-micro \
 h3600-microkbd h3600-stowaway \
-h3600-uda1341 \
 hwtimer \
 l3-backpaq \
 nvrd \
@@ -26,7 +25,6 @@ sa1100-rtc \
 sa1100usb-core \
 sd-mod \
 serial-h3800 \
-uda1341 \
 usb-char \
 usb-eth"
 
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1616299ae9..7f56b32282 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -129,6 +129,7 @@ USE_VT = "0"
 #-------------------------------------------------------------------------------
 CVSDATE_gnu-config ?= "20050713"
 CVSDATE_gnu-config-native ?= "20050713"
+CVSDATE_ipkg-utils ?= "20050713"
 CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
 
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 9b0ef708fa..b3e0a50bc6 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
 # Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
-                             kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
 
 # USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+#                             kernel-module-g-serial kernel-module-g-ether"
 
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index 285ab851ab..f55f2d2554 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -14,8 +14,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
 include conf/machine/handheld-common.conf