Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

7 files changed, 86 insertions, 72 deletions

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 769ec7c4c7..a2d1992706 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1,5 +1,6 @@
 # Upgraded
 # use newer version then preferred by default
+PREFERRED_VERSION_boost ?= "1.40.0"
 PREFERRED_VERSION_dbus ?= "1.3.0"
 PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
@@ -11,6 +12,7 @@ PREFERRED_VERSION_strace ?= "4.5.15"
 PREFERRED_VERSION_linux-libc-headers = "2.6.29"
 
 # upgrades used in Angstrom
+PREFERRED_VERSION_pixman        = "0.17.1"
 PREFERRED_VERSION_gtk+          = "2.18.3"
 PREFERRED_VERSION_hal           = "0.5.13"
 PREFERRED_VERSION_libtool       = "2.2.6a"
@@ -25,8 +27,3 @@ UDEV_GE_141 = "1"
 # Downgraded
 # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
 PREFERRED_VERSION_python-pygtk ?= "2.10.4"
-PREFERRED_VERSION_gpe-gallery ?= "0.97"
-PREFERRED_VERSION_boost ?= "1.33.1"
-PREFERRED_VERSION_man-pages ?= "2.41"
-PREFERRED_VERSION_xchat ?= "2.8.4"
-PREFERRED_VERSION_x11vnc ?= "0.9.3"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 422145c8c2..4ea318fdbb 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -41,6 +41,7 @@ SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_rosetta ?= "20090514"
 SRCDATE_sctzap ?= "20060814"
+SRCDATE_squashfs ?= "20091110"
 SRCDATE_tslib ?= "20051101"
 SRCDATE_waimea ?= "20060814"
 SRCDATE_xcompmgr ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 88c9f9a883..b012df1cea 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,44 +1,44 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "34fe2fb88cceac6f8d40374b170c226b213b7d4a"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
+SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
 SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
-SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
-SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
+SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
+SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
 SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
-SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
-SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
+SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
+SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d"
-SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb"
-SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77"
+SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
+SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
+SRCREV_pn-fso-specs ?= "60eaf17a53d410c564417b226db1e6ea8ca9a2a3"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82"
-SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59"
-SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50"
-SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
-SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b"
+SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
+SRCREV_pn-libfso-glib ?= "3630315a498f91106b4187e41608613520d63090"
+SRCREV_pn-libframeworkd-glib ?= "f7ea17bc2a33d6f0989a71f86ccc6ed3e8051e77"
+SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
+SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
 SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
-FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" 
-SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44"
-SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d"
-SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d"
+SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
+SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0"
 SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bca98f1139..7b11e1dda6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,13 +42,14 @@ SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
+SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-e-tasks ?= "14"
-SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-sysactions-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -76,7 +77,8 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-ffalarms ?= "67"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd-config-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-fltk2 ?= "6671"
+SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr}
 SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
 SRCREV_pn-fsoraw ?= "20"
@@ -90,7 +92,7 @@ SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
 SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV}
 SRCREV_pn-gcc-cross-sdk ?= ${GCCREV}
 SRCREV_pn-gconf-dbus ?= "641"
-SRCREV_pn-glamo-dri-tests ?= "445f370be5bd76643efb65d8ff7414b133753cfa"
+SRCREV_pn-glamo-dri-tests ?= "080b8db3d9dbfae38ebb00439887b5535ab1d380"
 SRCREV_pn-gnet ?= "495"
 SRCREV_pn-gpe-conf ?= "9900"
 SRCREV_pn-gpe-contacts ?= "9312"
@@ -133,16 +135,16 @@ SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710c
 SRCREV_pn-libframeworkd-phonegui-efl2 ?= "917226025c67b75def91e98ea923c2e550474a5b"
 SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
-SRCREV_pn-libgee-native ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
+SRCREV_pn-libgee ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
+SRCREV_pn-libgee-native ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
-SRCREV_pn-libjana = "749"
-SRCREV_pn-libmodulo = "7d2f657d248bd86377e66c329aa6826459d406da"
+SRCREV_pn-libjana ?= "749"
+SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da"
 SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "4568"
-SRCREV_pn-libmokoui2 ?= "4342"
+SRCREV_pn-libmokoui2 ?= "4695"
 SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159"
@@ -163,7 +165,8 @@ SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "c848d00bd43c47e7f11724330380e0c68ec7ae5e"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
+SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
@@ -186,10 +189,10 @@ SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
-SRCREV_pn-mokonnect ?= "110"
+SRCREV_pn-mokonnect ?= "111"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer-maemo ?= "342"
-SRCREV_pn-msn-pecan = "e795b33b29d792f19fcf699275eb966dc68be257"
+SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
@@ -199,7 +202,7 @@ SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-numptyphysics ?= "109"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-SRCREV_pn-ologicd = "4a32af91a9479ebd4d1d39057354ac9904d74cbb"
+SRCREV_pn-ologicd ?= "4a32af91a9479ebd4d1d39057354ac9904d74cbb"
 SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
 SRCREV_pn-om-neon ?= "68"
 SRCREV_pn-om-settings ?= "74"
@@ -263,7 +266,7 @@ SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
-SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
+SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
 SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01"
 SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
 SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c"
@@ -272,7 +275,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
-SRCREV_pn-pyphonelog ?= "0355bf623b31d695e53cc3cf77fb992e58b449a5"
+SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda"
 SRCREV_pn-pythm ?= "19"
 SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
@@ -298,7 +301,7 @@ SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
 SRCREV_pn-shr-launcher ?= "87"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
-SRCREV_pn-shr-settings ?= "4177f9d7ef34e3be7796585ca8c94cc2dea3f253"
+SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
 SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
 SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -326,10 +329,11 @@ SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
+SRCREV_pn-wesnoth ?= "39828"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "5394"
-SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
+SRCREV_pn-xf86-video-glamo ?= "9918e082104340da42eb92b6bdefce4d9266a6a4"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 7488ddec3e..9d84d1b8c8 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -1,8 +1,9 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: Jlime 2009.1 <jlime.com>
+#@NAME: Jlime 2009.1 <http://jlime.com>
 #@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-#              HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c.
+#              HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c,
+#	       Ben Nanonote.
 #@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
 #-----------------------------------------------------------------------------
 
@@ -11,9 +12,7 @@
 #
 DISTRO_NAME = "Jlime"
 DISTRO_VERSION = "2009.1"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
+DISTRO_TYPE = "release"
 export FEED_URLS_jlime = "http://repository.jlime.com/"
 
 #<>------------------------------------------------------------------>
@@ -30,22 +29,16 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
 IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}"
 
 #
-# Naming schemes
+# Naming schemes + packages
 #
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-INHERIT += "package_tar"
-IMAGE_FSTYPES = "tar.bz2"
+INHERIT += "debian package_tar package_ipk src_distribute_local src_distribute"
+IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
 
 #
 # Kernel
 #
 KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
+MACHINE_KERNEL_VERSION = "git"
 
 #
 # Binutils & Compiler
@@ -54,6 +47,15 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libusb0 = "libusb"
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/gtk+ = "gtk+"
+PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_gtk+ = "gtk+"
 
 PREFERRED_VERSION_gcc = "4.2.2"
 PREFERRED_VERSION_gcc-cross = "4.2.2"
@@ -61,19 +63,24 @@ PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
 PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
 PREFERRED_VERSION_binutils = "2.18"
 PREFERRED_VERSION_binutils-cross = "2.18"
+PREFERRED_VERSION_coreutils-native = "6.0"
 
 #
 # Target OS & FPU system
 # 
 TARGET_OS = "linux"
+TARGET_FPU_sh = "soft"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
+TARGET_FPU_mipsel = "soft"
+TARGET_FPU_mips = "soft"
 
 LIBC = "glibc"
 require conf/distro/include/${LIBC}.inc
 
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_linux-libc-headers = "2.6.25"
+PREFERRED_VERSION_glibc-initial = "2.6.1"
+PREFERRED_VERSION_glibc = "2.6.1"
 
 #
 # Bootstrap & Init
@@ -91,15 +98,3 @@ PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index a1220ee592..25880dff9d 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -76,11 +76,13 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 #############################################################################
 PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
 PREFERRED_PROVIDER_virtual/libx11	= "libx11"
+PREFERRED_PROVIDER_virtual/gail         ?= "gtk+"
 #############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
 
 #############################################################################
 # NLS
@@ -99,6 +101,8 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1"
 # Collapse /usr into /
 prefix = ""
 exec_prefix = ""
+prefix_native = ""
+exec_prefix_native = ""
 
 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index e45fc07334..79c07afbe6 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -39,8 +39,16 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
+#save statistical info on images
 INHERIT += "testlab"
 
+#activate the angstrom blacklister
+INHERIT += "angstrom"
+
+ANGSTROM_BLACKLIST_pn-bluez-libs  = "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
+
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
@@ -84,6 +92,7 @@ PREFERRED_PROVIDER_virtual/gail = "gtk+"
 PREFERRED_PROVIDER_opkg = "opkg"
 PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 PREFERRED_PROVIDER_atd = "atd-over-fso"
+PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
 
 # Helper to say what image we built
 SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
@@ -95,3 +104,7 @@ ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE}
 
 #Package customization
 EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"
+
+#Illume settings
+ILLUME_CONFIG = "e-wm-config-illume-shr"
+ILLUME_THEME = "e-wm-theme-illume-gry"