merge of 5945a66a6847c21d25595376695c23f3971f6f8a

     and e544df2d6779a2a53f1c47a6d1e1961d875d17af

8 files changed, 92 insertions, 25 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3b642e58f7..48a1daf64a 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
+E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 APACHE_MIRROR = "http://www.apache.org/dist"
@@ -400,4 +401,4 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
-PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file
+PCMCIA_MANAGER ?= "pcmcia-cs"
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index c5c9f6868c..1063356217 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 304cd6dcfa..09f3691b65 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index 53f363bf3d..c8f246ff69 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
 # Specify which versions of E-related libraries and applications to build
 #
 
-PREFERRED_VERSION_e = "0.16.999.023"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.023"
-PREFERRED_VERSION_ecore-native = "0.9.9.023"
-PREFERRED_VERSION_edb = "1.0.5.005"
-PREFERRED_VERSION_edb-native = "1.0.5.005"
-PREFERRED_VERSION_edje = "0.5.0.023"
-PREFERRED_VERSION_edje-native = "0.5.0.023"
-PREFERRED_VERSION_eet = "0.9.10.023"
-PREFERRED_VERSION_eet-native = "0.9.10.023"
-PREFERRED_VERSION_embryo = "0.9.1.023"
-PREFERRED_VERSION_embryo-native = "0.9.1.023"
+PREFERRED_VERSION_e = "0.16.999.025"
+PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+PREFERRED_VERSION_ecore-native = "0.9.9.025"
+PREFERRED_VERSION_edb = "1.0.5.006"
+PREFERRED_VERSION_edb-native = "1.0.5.006"
+PREFERRED_VERSION_edje = "0.5.0.025"
+PREFERRED_VERSION_edje-native = "0.5.0.025"
+PREFERRED_VERSION_eet = "0.9.10.025"
+PREFERRED_VERSION_eet-native = "0.9.10.025"
+PREFERRED_VERSION_embryo = "0.9.1.025"
+PREFERRED_VERSION_embryo-native = "0.9.1.025"
 PREFERRED_VERSION_emotion = "0.0.1.004"
 PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.005"
-PREFERRED_VERSION_epsilon = "0.3.0.005"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.005"
-PREFERRED_VERSION_evas-x11 = "0.9.9.023"
-PREFERRED_VERSION_evas-native = "0.9.9.023"
-PREFERRED_VERSION_ewl = "0.0.4.005"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
-PREFERRED_VERSION_imlib2-native = "1.2.1.010"
-PREFERRED_VERSION_e-wm = "0.16.999.023"
-PREFERRED_VERSION_entrance = "0.9.0.005"
+PREFERRED_VERSION_epeg = "0.9.0.006"
+PREFERRED_VERSION_epsilon = "0.3.0.006"
+PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+PREFERRED_VERSION_evas-native = "0.9.9.025"
+PREFERRED_VERSION_ewl = "0.0.4.006"
+PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+PREFERRED_VERSION_e-wm = "0.16.999.025"
+PREFERRED_VERSION_entrance = "0.9.0.006"
 
 PREFERRED_PROVIDER_virtual/evas = "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 3ed8549418..b89d5728f7 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -169,7 +169,6 @@ ${PKGDIR}/packages/obexftp/*.bb \
 ${PKGDIR}/packages/openjade/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
-${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openobex/*.bb \
 ${PKGDIR}/packages/opensp/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 24ef6e6c33..bb6c6efa6a 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -19,6 +19,16 @@ UCSLUGC_EXTRA_BBFILES ?= ""
 # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
 # setting - either may be set in local.conf to override these values.
 UCSLUGC_EXTRA_RDEPENDS ?= ""
+
+UCSLUGC_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 #
 SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
 
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index e961445209..1308340887 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.7-beta"
+DISTRO_VERSION = "6.8-beta"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 885bf40b4f..b1dcd7fe3b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1,4 +1,43 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+PCMCIA_MANAGER ?= "pcmciautils"
 
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             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-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"
+
+# Wireless Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
+                             hostap-conf orinoco-conf"
+
+# Sound Modules
+###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
+                             kernel-module-snd-pcm  \
+                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+			     
+###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "