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

5 files changed, 21 insertions, 8 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 12f0c99f4c..92f3c6faef 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -854,6 +854,10 @@ sha256=f2f80e2a62a039e9a1ffa0fdf58707b2d12b3ff33c56472b46bb6d53f45e083e
 md5=e81c2f0953aa60f8062c05a4673f2be0
 sha256=cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6
 
+[http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2]
+md5=245db9f1e0f09ab7e0faaa0cf7301011
+sha256=a1cdc4a8f6c1f947ea3b87d097af2db4371019bac941d92c3844124c5694328b
+
 [http://jerakeen.org/files/PythonDaap-0.4.tar.gz]
 md5=f7672bfd563787a76fb7e9a43c062f18
 sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
@@ -4735,8 +4739,8 @@ md5=e23f236e94be4c429aa1ceac0f01544b
 sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
 
 [http://www.lartmaker.nl/lartware/port/devmem2.c]
-md5=e23f236e94be4c429aa1ceac0f01544b
-sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
+md5=be12c0132a1ae118cbf5e79d98427c1d
+sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
 
 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
 md5=b1896c1b21ddb152626aec2e8a157a3a
@@ -11470,6 +11474,10 @@ sha256=25d45acf19e3acd09745df47581ac7a13e3694ee51fe4e642108f9f228cacca9
 md5=a1d0aca33da380d6045c5c0e5002c09d
 sha256=9e4ab143828fefb3b67ce2bc3ad63a91cacc45d97161822915778683fb80343b
 
+[http://ipython.scipy.org/dist/ipython-0.10.tar.gz]
+md5=dd10cd1b622c16c1afca2239fcc0dfdf
+sha256=60d602637dc5f078b083a4ca5ab64364ba816bd72439844012ed11a30f88228c
+
 [http://ipython.scipy.org/dist/ipython-0.9.1.tar.gz]
 md5=8a1bd1a9be272f4ddf4de99e5c1ad0dc
 sha256=5540bc1a01f11ca66c3d7c31a43af670fd0f0044b8e38d142614872956548006
@@ -11974,6 +11982,10 @@ sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
 md5=481dfdef7273f2cc776c2637f481f017
 sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
 
+[http://kernel.org/pub/linux/libs/klibc/Testing/klibc-1.5.15.tar.bz2]
+md5=db2152a8a03bd81e21a5f451f537ae3d
+sha256=8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4
+
 [http://downloads.sourceforge.net/klimt/klimt-src-0.6.1.zip]
 md5=d12f56384b4ccde11cd756db2b14065c
 sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 586bbc172a..7297f4710b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,8 +111,8 @@ SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4342"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
+SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
 SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
@@ -146,6 +146,7 @@ SRCREV_pn-mplayer ?= "28346"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-netsurf ?= "3859"
@@ -257,7 +258,7 @@ SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
 SRCREV_pn-webkit-gtk ?= "45825"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
-SRCREV_pn-wmiconfig ?= "4522"
+SRCREV_pn-wmiconfig ?= "5394"
 SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 257d364292..f246bffa69 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -31,7 +31,7 @@ USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"
 
-PREFERRED_VERSION_uclibc = "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
 
 require conf/distro/minimal.conf
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 8780b827f5..ad410fae4c 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
index b2a116d109..68a62cc4dc 100644
--- a/conf/machine/vortex86sx.conf
+++ b/conf/machine/vortex86sx.conf
@@ -3,7 +3,7 @@
 
 require conf/machine/include/tune-i486sx.inc
 
-MACHINE_FEATURES += "x86"
+MACHINE_FEATURES = "kernel26 alsa vfat screen usbhost x86"
 
 KERNEL_IMAGETYPE = "bzImage"