merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff

     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf

4 files changed, 87 insertions, 42 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4f732ecc2a..ca7ddc873d 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -46,6 +46,8 @@ require conf/distro/include/preferred-opie-versions.inc
 # GPE
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 
+PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
+
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
 
@@ -55,10 +57,12 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
+PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
 
+
 # E
 require conf/distro/include/preferred-e-versions.inc
 
@@ -120,7 +124,7 @@ PREFERRED_VERSION_busybox = "1.2.1"
 
 PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
 PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.91"
+PREFERRED_VERSION_dbus ?= "0.92"
 PREFERRED_VERSION_gstreamer ?= "0.10.6"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
@@ -140,21 +144,23 @@ PCMCIA_MANAGER_tosa = "pcmciautils"
 PCMCIA_MANAGER_poodle = "pcmciautils"
 PCMCIA_MANAGER_nokia770 = "pcmciautils"
 PCMCIA_MANAGER_h2200 = "pcmciautils"
+PCMCIA_MANAGER_h4000 = "pcmciautils"
 PCMCIA_MANAGER_h6300 = "pcmciautils"
 PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
-EXTRA_STUFF_append_c7x0 = "altboot"
-EXTRA_STUFF_append_akita = "altboot"
-EXTRA_STUFF_append_spitz = "altboot"
-EXTRA_STUFF_append_poodle = "altboot"
-EXTRA_STUFF_append_tosa = "altboot"
+#EXTRA_STUFF_append_c7x0 = "altboot"
+#EXTRA_STUFF_append_akita = "altboot"
+#EXTRA_STUFF_append_spitz = "altboot"
+#EXTRA_STUFF_append_poodle = "altboot"
+#EXTRA_STUFF_append_tosa = "altboot"
 
 ### GPE section ###
 
 #Install libgtkinput in devices without a keyboard
 GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput"
+GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput"
 GPE_EXTRA_INSTALL_append_simpad =  " libgtkinput" 
 GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
index b7f456320f..264cceecfd 100644
--- a/conf/distro/include/openzaurus.inc
+++ b/conf/distro/include/openzaurus.inc
@@ -16,3 +16,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
 PARALLEL_INSTALL_MODULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+# Set minimal version of BitBake needed
+BB_MIN_VERSION = "1.4.4"
+INHERIT += "sanity"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 3bff27763d..e668c3ce38 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -8,33 +8,41 @@ DISTRO_VERSION = "donkey"
 
 export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
 
-# No uniroot
+#<>----------------------------------------------------------------->
+#<> No uniroot
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-#<>
+
+#<>----------------------------------------------------------------->
 #<> We will set CVS DATE when things are known to work.
-#<>
+#<>-----------------------------------------------------------------<
 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"
 
+
+#<>----------------------------------------------------------------->
 #<> We want this so we can crosscompile the kernel using gcc 3.4.3
 #<> Also, select version of modules (and kernel)
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
 
-#<>
+
+#<>----------------------------------------------------------------->
 #<>We want kdrive as our default X-Server.
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/xserver  = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11    = "libx11"
+PREFERRED_VERSION_liblbxutil         = "X11R7.0-1.0.0"
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 
-#<>
+#<>----------------------------------------------------------------->
 #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_VERSION_binutils = "2.17"
 PREFERRED_VERSION_binutils-cross = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7"
@@ -44,76 +52,101 @@ PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
 PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
 PREFERRED_VERSION_glibc = "2.4"
 PREFERRED_VERSION_glibc-intermediate = "2.4"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 
-#<>
-#<>Setting Preferred glib-2.0,glib-1.2
-#<>
+#<>------------------------------------------------------------------>
+#<>Setting Preferred glib, dbus, db-native
+#<>------------------------------------------------------------------<
 PREFERRED_VERSION_glib-2.0-native = "2.6.5"
 PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.10.0"
+PREFERRED_VERSION_glib-2.0 = "2.12.0"
 PREFERRED_VERSION_glib-1.2 = "1.2.10"
+PREFERRED_VERSION_pango = "1.12.0"
+PREFERRED_VERSION_dbus = "0.61"
+PREFERRED_VERSION_dbus-native = "0.61"
+PREFERRED_PROVIDER_dbus-glib = "dbus"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
 
+#<>------------------------------------------------------------------>
 #<>
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>
+#<>------------------------------------------------------------------<
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
 PREFERRED_PROVIDER_tslib         = "tslib"
-PREFRRED_VERSION_cairo           = "1.0.4"
-#<>
+
+
+#<>------------------------------------------------------------------>
 #<>Other Specific stuff.
 #<>
 #<>
 #<>We want to be able to build this for all jornadas so
 #<>to not mess up the folders we need to make them dynamic.
 #<>It will use different folders depending on Arch (set in local.conf)
+#<>------------------------------------------------------------------<
 SRC_DIST_LOCAL = "copy"
 INHERIT += "package_ipk package_tar multimachine src_distribute_local"
 BBINCLUDELOGS = "yes"
 IMAGE_FSTYPES = "tar.bz2"
 TARGET_OS = "linux"
 
+
+#<>------------------------------------------------------------------>
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
-#<>
+#<>------------------------------------------------------------------<
 BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools  \
                              udev e2tools e2fsprogs kernel-modules keymaps \
 			     wget"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<>What Qte, libqte.. versions should we use.
-#<>
+#<>------------------------------------------------------------------<
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
 OPIE_VERSION = "1.2.2"
 require conf/distro/include/preferred-opie-versions.inc
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> Lets decide on a GPE versipns
-#<>
+#<> And lets override GTK to something that builds
+#<>------------------------------------------------------------------<
 require conf/distro/include/preferred-gpe-versions-2.7.inc
+PREFERRED_VERSION_gtk+ = "2.8.16"
+PREFERRED_VERSION_pango = "1.12.0"
+PREFERRED_VERSION_cairo = "1.2.2"
+PREFERRED_VERSION_gtk-engines = "2.7.4"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> We want pcmciautils, not pcmcia-cs
-#<>
+#<>------------------------------------------------------------------<
 PCMCIA_MANAGER = "pcmciautils"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> We are using gcc 4.1.1 so lets keep optimizations low
-#<> 
+#<>------------------------------------------------------------------< 
 FULL_OPTIMIZATION = "-O1"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<>Our Image files should look abit better.
 #<>
-#<>
+#<>------------------------------------------------------------------<
 IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
 
+
+#<>------------------------------------------------------------------>
 #<>
 #<>
+#<> General non-essential programs with known working versions
 #<>
-#<> General non-essential programs
-#<>
-#<>
-PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file
+#<>------------------------------------------------------------------<
+PREFERRED_VERSION_irssi = "0.8.10"
+PREFERRED_VERSION_mc = "4.6.1"
+PREFERRED_VERSION_nano = "1.3.9"
+PREFERRED_VERSION_ncurses = "5.4"
+PREFERRED_VERSION_ncftp = "3.1.9"
\ No newline at end of file
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index bf653d9e97..410de9a100 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -2,13 +2,16 @@
 #@NAME: HP iPAQ h4xxx
 #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx
 
+INHERIT += "linux_modules"
+
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa"
+IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
 ROOT_FLASH_SIZE = "32"
+PCMCIA_MANAGER = "pcmciautils"
 
 BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}"
@@ -21,16 +24,15 @@ H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_g_ether = "g_ether"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # LAB can only resolve relative symlinks
 ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "