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

12 files changed, 232 insertions, 40 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 298f1bca08..0095cc969d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3086,6 +3086,10 @@ sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
 md5=f9058305c42038678d5023fcabba22a4
 sha256=f4a92834a538dc9dbb93fde76933e849b24639faa1721b24549f209b8b590f71
 
+[http://download.tuxfamily.org/blueman/blueman-1.21.tar.gz]
+md5=26b70341b3d3da28da62c917c8b20377
+sha256=86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
+
 [http://gpe.linuxtogo.org/download/source/blueprobe-0.13.tar.gz]
 md5=33745b0e86603124654773c1361df33e
 sha256=b4318d0e1ba7422ba4415838448718e037efe4d8236cf12132075ccf36d1803d
@@ -3586,6 +3590,10 @@ sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e
 md5=aeb526108f13b91c02b115c8d86f9659
 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
 
+[http://www.busybox.net/downloads/busybox-1.14.3.tar.gz]
+md5=dfb197b8de260ff284f7222ed23614fe
+sha256=b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163
+
 [http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
 md5=6af69ebbbf8adc874ccb6d67dca95df5
 sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
@@ -5570,6 +5578,14 @@ sha256=0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484
 md5=bbf981a5f4a64e94cc6f2a693f96c21a
 sha256=8955fad7d9e7aef36f7a82f9577c3ae4901db1ded6ce57aec0d93e39c8899b65
 
+[http://bundles.openttdcoop.org/download.php?file=opengfx%2Freleases%2Fopengfx-0.1.1.zip]
+md5=1f959407f2d4a1ab0e84c2e89438c922
+sha256=c0eefb2dda166f91e1bfb317cf681165029f6f2709fa966d84dc568ffef6a31e
+
+[http://bundles.openttdcoop.org/download.php?file=opensfx%2Freleases%2Fopensfx-0.1.0.zip]
+md5=1a43ee0a2026b7fecfd47c7c7e4b056f
+sha256=ea0d90e3e049aec2e0884bc117a46e5fb78411b7e3633b3802d4c5af8f29300c
+
 [ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.13.22.tar.gz]
 md5=0fc9fffc2c2cfa7107d8f422815078c1
 sha256=c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f
@@ -8298,6 +8314,10 @@ sha256=34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
 md5=7724929a6b75ba269fd519d4a4995bbb
 sha256=b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
 
+[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.1.tar.bz2]
+md5=917dc80f5ef6adcdc15193de238476db
+sha256=da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
+
 [http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
 md5=c6c22c7f9feff81a15f5c8ece03b87c1
 sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
@@ -12374,6 +12394,10 @@ sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
 md5=59997096c3640b2601c2b4afba8a3d75
 sha256=f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
 
+[http://downloads.sourceforge.net/inkscape/inkscape-0.47.tar.bz2]
+md5=7b497c8f673e40b05295a29f6e2111f4
+sha256=4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
+
 [http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp-0.1.1.tar.gz]
 md5=a19896b756f1b29a33411a1fb2842c4b
 sha256=4afa4f4ddfdc40a32ef2c6034b2fa3bca415088b7eac4b7ad2b814202153f1e0
@@ -19786,6 +19810,10 @@ sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
 md5=5674f746b55439d32bc765d2c5baad16
 sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.19.tar.gz]
+md5=2f03b81411a1f7c359ada35459d946a5
+sha256=37fb4cffad7e361daffa9915ee6a37e615d0bf4d1f24760e585d5ac922515ca8
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -20190,6 +20218,10 @@ sha256=56e844da580761ddbb580683fc455a8d9eb3179df631568c26b7188d1ff16363
 md5=d05b9ebf67c83f07e8286d0d2b1fc293
 sha256=2d60e8a08768a9c81f37e699df6890c12d53f4d56b5562724c3a9ffa302c7197
 
+[http://binaries.openttd.org/releases/0.7.4-RC1/openttd-0.7.4-RC1-source.tar.bz2]
+md5=416a2ec6aa01b322100fb4e2f039f992
+sha256=8f57475e37a7b8544741c563bdc34463ce98e43ed3c1a7543a3fdd35647b8ea1
+
 [http://downloads.sourceforge.net/openvpn/openvpn-1.5.0.tar.gz]
 md5=55d7ce958bb2ccf3d3204d1350c27179
 sha256=d34d0a1a29de12cbb4fc6f8d80eced7b674ee3574e3df3d678fb0467283f7826
@@ -21994,6 +22026,10 @@ sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 md5=02adc2b99252675f0271db3b9edd432e
 sha256=e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.21.tar.gz]
+md5=76e623c4c72e2258bc8bdeb1599bad74
+sha256=94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+
 [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
 md5=99b5d9efd4fce35cabb4ae5d0ebb230d
 sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -23714,6 +23750,10 @@ sha256=89106b5bc5a66ca0eaf4553371c89ac8542a757964d7a91c07b8fb77e040eebe
 md5=8c0936272dcfd4e98c51512699f1c06f
 sha256=13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
 
+[http://alioth.debian.org/frs/download.php/3026/sane-backends-1.0.20.tar.gz]
+md5=a0cfdfdebca2feb4f2ba5d3418b15a42
+sha256=8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
+
 [ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-1.0.13/sane-frontends-1.0.13.tar.gz]
 md5=2930626e627df49b45192a722cedc8a6
 sha256=94cd595fe1ae130b8490d5690c7665d15536554473ad648ed46fc0ac3f383a80
@@ -24114,6 +24154,10 @@ sha256=7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959
 md5=45f77f33a6b2a5c09c28511ebb733b87
 sha256=7fd6495d6c3e8dac7ba086c68abed4930c958a94afc15359223074614559e462
 
+[ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.4.2.tar.bz2]
+md5=d593a9cab93c48ee0a6ba056db8c1997
+sha256=97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990
+
 [ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-4.1.4.tar.gz]
 md5=e1072df927bfb4410ee4dfe26dd81a17
 sha256=7e38a7826f6e71e89b55669e8343af05ae33ecfba99aad178cad45845d950a93
@@ -24882,6 +24926,10 @@ sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
 md5=b29893c06192df6230dd5f340f3badf5
 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
 
+[http://ftp.sudo.ws/sudo/dist/sudo-1.7.2p1.tar.gz]
+md5=4449d466a774f5ce401c9c0e3866c026
+sha256=34d11a1dd8bace0885f55b4c8bddda1da29993ff8d7174099e25bd80db1eaf7f
+
 [http://dev.laptop.org/pub/sugar/sources/sugar/sugar-0.82.0.tar.bz2]
 md5=1f26fa4aee57469a0636a70649343fb3
 sha256=ca4c614e09371a986ca5d86065fc697f7eb07b2064a6a2cad541755df0135883
@@ -26726,6 +26774,10 @@ sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
 md5=8c70abb3ef35523a0b8cf8685b327e11
 sha256=5c59e1fa363e876b5df7d9f5fccbac776c42bcd31bb04c4fde1d41d083538888
 
+[http://www.freesmartphone.org/sources/vala-0.7.8.2.tar.gz]
+md5=f920b9ef0e9ea52a93351d58e23e4835
+sha256=0c71ded5f709709a4309ba073908ff237966d1bae1630c593a664d70613c6218
+
 [http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2]
 md5=accd0d350c6d6de7527a0a65c40f8be2
 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
@@ -29894,6 +29946,10 @@ sha256=86b176b6efc52557b1c7631bfdd5c17e7060a438e1e85ce15ec9657be356c50b
 md5=11080456822146ebc0118b15f4b911d9
 sha256=6b5b3ef58e6646f004a5f1cbc6be8f32b824cfbf78a30bf242e4f07083668770
 
+[ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz]
+md5=7331850fc04056ab8ae6b5725d1fb3d2
+sha256=400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
+
 [http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.1.tar.bz2]
 md5=4c5482552f38a7d42398a694cc9b2ee6
 sha256=de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
@@ -30214,6 +30270,10 @@ sha256=bb797a384b9acb8209fea572934d1b1484c5de41f062fe152ae99962f52f98ea
 md5=b3d352d08e71606383c31da5790b8d60
 sha256=dff617ca33dc263caecb6afc5d42c109166ef2a1c0fe0afa070ff6691ea0e8d7
 
+[http://xournal.sourceforge.net/xournal-0.4.5.tar.gz]
+md5=795e4396ded2b67766eb2926be1fb4a9
+sha256=a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
+
 [http://xournal.sourceforge.net/xournal-0.4.tar.gz]
 md5=139ef3045c99dc5c07118b47ff9257e1
 sha256=4de076c38b4b64188d23821e7d7a0f6a26b1d6707e768dadda14eb69dcc84598
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 5f6ef768ad..0e1f39a7a6 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -204,7 +204,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc
 
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
-IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
 # Select xserver-xorg as default, since kdrive has been EOL'ed
 XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index c8607c6001..25ba8510a2 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -11,7 +11,7 @@ TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'a
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
-FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os -ggdb3"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3"
 
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 669c8ada3c..6e65285e99 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -202,7 +202,5 @@ SEPPUKU_COMPONENT    = "org.openembedded.dev"
 
 OESTATS_SERVER      ?= "tinderbox.openembedded.org"
 
-
-
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci pam"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 72714f3951..5970f2da14 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -8,6 +8,10 @@ PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
 PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
 PREFERRED_VERSION_strace ?= "4.5.15"
 
+# We need this for jamvm
+PREFERRED_VERSION_classpath ?= "0.98"
+PREFERRED_VERSION_classpath-native ?= "0.98"
+
 # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 PREFERRED_VERSION_linux-libc-headers = "2.6.29"
 
@@ -15,7 +19,6 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.29"
 EFL_SRCREV ?= "43898"
 
 # 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"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index b012df1cea..bc9dfc6a45 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,14 +3,14 @@
 # FSO Projects -- Cornucopia
 FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "34fe2fb88cceac6f8d40374b170c226b213b7d4a"
+SRCREV_pn-fsodeviced ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
 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 ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
 SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
-SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 
@@ -24,11 +24,11 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "60eaf17a53d410c564417b226db1e6ea8ca9a2a3"
+SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
-SRCREV_pn-libfso-glib ?= "3630315a498f91106b4187e41608613520d63090"
-SRCREV_pn-libframeworkd-glib ?= "f7ea17bc2a33d6f0989a71f86ccc6ed3e8051e77"
+SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
+SRCREV_pn-libframeworkd-glib ?= "dc5409fbf9d2d22a7fa871199bb66da5ac6f5084"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
 SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
 SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b11e1dda6..3dee57ca73 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -20,12 +20,13 @@ SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
+SRCREV_pn-babiloo-efl ?= "288"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654"
 SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc"
 SRCREV_pn-bubble-keyboard ?= "194"
-SRCREV_pn-calc ?= "3f4382138b71b0c31d6722604399e12a37bcebe8"
+SRCREV_pn-calc ?= "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-cdparanoia ?= "16684"
 SRCREV_pn-clutter ?= "3240"
@@ -164,7 +165,7 @@ SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 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-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
@@ -189,7 +190,7 @@ 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 ?= "111"
+SRCREV_pn-mokonnect ?= "112"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
@@ -255,9 +256,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "240"
+SRCREV_pn-opkg ?= "363"
 SRCREV_pn-opkg-native ?= "240"
-SRCREV_pn-opkg-sdk ?= "240"
+SRCREV_pn-opkg-sdk ?= "363"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -340,7 +341,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "43437"
+EFL_SRCREV ?= "43996"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index c98234fb9a..7bf196371d 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -25,8 +25,8 @@ PREFERRED_GCC_VERSION_ppc405         ?= "4.4.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 
-# This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
+# This is unrelated to the kernel version, but glibc and some userspaceapps require a recent version to build against
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.30"
 
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 78735fddce..122433b7fc 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -12,3 +12,5 @@ SRCREV_pn-phonefsod = "${AUTOREV}"
 SRCREV_pn-libphone-ui = "${AUTOREV}"
 SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
 SRCREV_pn-libphone-utils = "${AUTOREV}"
+SRCREV_pn-opimd-utils = "${AUTOREV}"
+
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 79c07afbe6..5b0b29a175 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -15,12 +15,9 @@ TOOLCHAIN_BRAND ?= ""
 
 #LIBC = "glibc"
 
-require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
 
-include conf/distro/minimal.conf
-
 #
 # Header
 #
@@ -33,7 +30,6 @@ DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
 # We only want to build UTF8 locales
@@ -75,6 +71,89 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
 PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
 
+# Helper to say what image we built
+SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
+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"
+
+# From minimal.conf
+
+#############################################################################
+# FEATURE SELECTION
+#############################################################################
+# Use bluetooth 4.0
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# libfoo -> libfoo0-2 (etc)
+INHERIT += "debian"
+
+#############################################################################
+# STAGING AREA
+#############################################################################
+# Controlled by packaging system
+INHERIT += "packaged-staging"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Chose the packaging system
+INHERIT += "package_ipk"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+require conf/distro/include/sane-feed.inc
+PREFERRED_PKG_FORMAT ?= "ipk"
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# increase inode/block ratio for ext2 filesystem 
+EXTRA_IMAGECMD_ext2 = "-i 8192"
+
+#############################################################################
+# KERNEL
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+LIBC ?= "eglibc"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# PREFERRED PROVIDERS
+#############################################################################
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
 PREFERRED_PROVIDER_gconf = "gconf"
 PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
@@ -90,21 +169,57 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/gail = "gtk+"
 PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_virtual/java-initial = "jamvm-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"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
-ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
-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"
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_avahi = "avahi"
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
+PREFERRED_PROVIDER_virtual/db = "db3"
+PREFERRED_PROVIDER_virtual/db-native = "db3-native"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
+#Use newest available (X11R7.5 now)
+#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+
+#############################################################################
+# CONTENTS
+#############################################################################
+
+# Ship extra debug utils in the rootfs when doing a debug build 
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+
+# Additional content I (only valid if you include task-base)
+# distro-feed-configs: configuration files for the online feeds
+# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken
+# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink
+DISTRO_EXTRA_RDEPENDS += "\
+  distro-feed-configs \
+  util-linux-ng-mount util-linux-ng-umount \
+  angstrom-libc-fixup-hack \
+  ${DISTRO_EXTRA_APPS} \
+"
+
+# Additional content II (can be masked with BAD_RECOMMENDATIONS)
+DISTRO_EXTRA_RRECOMMENDS += " \
+    kernel-module-vfat \
+    kernel-module-ext2 \
+    kernel-module-ext3 \
+    kernel-module-af-packet \
+    openssh-sftp-server \
+"
+
+#    avahi-daemon \
+#    avahi-autoipd \
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
new file mode 100644
index 0000000000..5a9df79ade
--- /dev/null
+++ b/conf/machine/hawkboard.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: OMAP-L138 based board
+#@DESCRIPTION: Machine configuration for the TI Hawkboard
+
+require conf/machine/include/davinci.inc
+
+UBOOT_MACHINE = "da850_omapl138_evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+MACHINE_FEATURES = "kernel26 serial ethernet ide screen"
+
+SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 2c5c4f2387..2f242a4b38 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r49"
+MACHINE_KERNEL_PR = "r50"
 
 KERNEL_IMAGETYPE = "uImage"