merge of 0a90fa3f8e7b85f79fe8930a1969aff12f3553b8

     and f207b08f6d852f81f78ab6a6c3ed4502fc88f898

8 files changed, 31 insertions, 22 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 89ab4ff924..c28e3a7e22 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"
+GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
index fad8d4e04f..5ebe98b254 100644
--- a/conf/distro/ludeos.conf
+++ b/conf/distro/ludeos.conf
@@ -19,4 +19,18 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native
 # This removes the dependency on upslug2-native.
 SLUGOS_NATIVE_DEPENDS = ""
 
+SLUGOS_EXTRA_RDEPENDS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck \
+kernel-module-ext2 \
+kernel-module-jbd \
+kernel-module-ext3 \
+kernel-module-nfs \
+kernel-module-vfat \
+kernel-module-ntfs \
+kernel-module-isofs \
+kernel-module-udf \
+kernel-module-reiserfs \
+kernel-module-nls-cp437 \
+kernel-module-nls-utf8 \
+"
+
 include conf/distro/slugos.conf
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index e4571f1ae6..53f363bf3d 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -25,3 +25,11 @@ 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_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+
+PREFERRED_VERSION_gnome-vfs-dbus = "svn"
+
+PREFERRED_VERSION_gcc = "3.4.4"
diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc
index d4422e86e9..1d09ae6051 100644
--- a/conf/distro/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/preferred-gpe-versions-2.6.inc
@@ -79,7 +79,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
 PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index ea0ab62610..933195977d 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -14,7 +14,7 @@ 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.5+cvs${SRCDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
@@ -86,7 +86,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
 PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 37ae1a00e0..9aec6866bb 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,31 +9,17 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
-EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384"
+EXTRA_IMAGECMD_jffs2_h2200 = "--pad --no-cleanmarkers --eraseblock=16384"
 
 ROOT_FLASH_SIZE = "32"
 
 BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " h2200-bootloader kernel udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools"
 
 #ship in rootfs:
-H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-h2200_audio pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
-
+H2200_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
 
 #autoload on boot:
-module_autoload_h2200_pm        = "h2200_pm"
-module_autoload_h2200_kbd       = "h2200_kbd"
-module_autoload_h2200_lcd       = "h2200_lcd"
-module_autoload_mq11xx_base     = "mq11xx_base"
-module_autoload_mq1100fb        = "mq1100fb"
-module_autoload_samcop_adcts    = "samcop_adcts"
-module_autoload_samcop_sdi      = "samcop_sdi"
-module_autoload_w1_ds2760       = "w1_ds2760"
-module_autoload_w1_samcop       = "w1_samcop"
-module_autoload_h2200_battery   = "h2200_battery"
-module_autoload_hamcop_nand     = "hamcop_nand"
-module_autoload_pxa2xx_h2200    = "pxa2xx_h2200"
-module_autoload_snd_h2200_audio = "snd-h2200_audio"
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 467d5e59f1..fbecc6e25c 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -7,7 +7,7 @@ ide-cs ide-disk ide-probe-mod \
 loop \
 vfat ext2 \
 sunrpc nfs \
-btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \
 pcnet-cs serial-cs airo-cs \
 af_packet \
 ppp-async ppp-deflate ppp-mppe \
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index ec10cd5e4e..7fc3ccc2ec 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te c7x0"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"