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

7 files changed, 25 insertions, 12 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 15fff1d896..c3c91e2dbf 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1,3 +1,7 @@
+[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
+md5=30e2fe5edd143f347e03a8baf5d60f8a
+sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
+
 [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
 md5=c6a2705f6210d8ede50a947b375f1c0b
 sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
@@ -5350,6 +5354,10 @@ sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
 md5=f100632e67f94ef4fffa4da32d25427a
 sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8
 
+[http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz]
+md5=5eb8d1b02cdd99d0681e946768e529db
+sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03
+
 [http://enlightenment.freedesktop.org/files/esmart-0.9.0.007.tar.gz]
 md5=a65b4a08818ac9ef9de3dd9d4f20f148
 sha256=5df5b02c568f5e4b744252fbd62f5fae71bf0eddecc423d2b396a0ffbfe94465
@@ -6950,10 +6958,6 @@ sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
 md5=5dfac5da961ecd5f227c3175859a486d
 sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
 
-[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
-md5=5dfac5da961ecd5f227c3175859a486d
-sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
-
 [ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2]
 md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
@@ -20382,6 +20386,10 @@ sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
 md5=797ea136fe43e4286c9362ee4516674e
 sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
 
+[http://trac.luon.net/data/ruby-dbus/releases/ruby-dbus-0.2.1.tar.gz]
+md5=1f6398d8bbafa272c0b43878fec43276
+sha256=cfcadc4ae860f2de3d6aa1a1230a410b1dedf783148a27a20205bb3b54e3c3ac
+
 [http://rxtx.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip]
 md5=9290b4832d46199f8d798a531209640b
 sha256=31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fc341f3726..bb9b75bece 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -19,6 +19,7 @@ SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
@@ -98,6 +99,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libowl ?= "277"
+SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 3fdfeae292..6fe6a830e6 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH =  "i486"
 
-require conf/machine/include/tune-x86.inc
+require conf/machine/include/tune-geodegx.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index 37ea17e734..de4d9ca16e 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -1,6 +1,6 @@
 TARGET_ARCH = "i486"
 
-require conf/machine/include/tune-x86.inc
+require conf/machine/include/tune-geodelx.inc
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geodegx.inc
new file mode 100644
index 0000000000..cae285a91c
--- /dev/null
+++ b/conf/machine/include/tune-geodegx.inc
@@ -0,0 +1,6 @@
+TARGET_CC_ARCH = "-march=geode"
+BASE_PACKAGE_ARCH = "geode"
+PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
+
+FEED_ARCH = "geode"
+
diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc
index 4e146f4c04..63e6678947 100644
--- a/conf/machine/include/tune-geodelx.inc
+++ b/conf/machine/include/tune-geodelx.inc
@@ -1,9 +1,9 @@
 # Geode CPU has it's own target in GCC 4.3
 # in older versions k6-2 is closest
 #
-TARGET_CC_ARCH = "-march=k6-2"
+TARGET_CC_ARCH = "-march=geode"
 BASE_PACKAGE_ARCH = "geode"
-PACKAGE_EXTRA_ARCHS += "x86 i386 i486 geode"
+PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
 
 FEED_ARCH = "geode"
 
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index ad1138f422..c25121659c 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -2,11 +2,8 @@
 #@NAME: qemu x86 Emulator setup
 #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
 
-TARGET_ARCH = "i586"
-TARGET_CC_ARCH = "-march=i586"
-PACKAGE_EXTRA_ARCHS = "x86"
-
 require conf/machine/include/qemu.inc
+require conf/machine/i686-generic.conf
 
 MACHINE_FEATURES += "x86"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d"