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

2 files changed, 28 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 43d0059636..5bb4213540 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6402,6 +6402,10 @@ sha256=7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
 md5=3c8935efb9fdc7202720894279ad04a7
 sha256=5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f
 
+[http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz]
+md5=2ff9924c7249ef7f736ecfe6f08f3f9b
+sha256=e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
+
 [http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz]
 md5=00bf95cdcbedfa7321d14e0133b31cdb
 sha256=217df8b36d848a85eb81ec6fa2a411e9bf186a747c2ddb223cb82b5001e4d80b
@@ -9966,6 +9970,10 @@ sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
 md5=97c606182f5e177eef70c1e8a55efc1f
 sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
 
+[http://downloads.sourceforge.net/inkscape/inkscape-0.46.tar.bz2]
+md5=59997096c3640b2601c2b4afba8a3d75
+sha256=f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
+
 [http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp-0.1.1.tar.gz]
 md5=a19896b756f1b29a33411a1fb2842c4b
 sha256=4afa4f4ddfdc40a32ef2c6034b2fa3bca415088b7eac4b7ad2b814202153f1e0
@@ -13958,6 +13966,10 @@ sha256=5c7226b4c65b8420960eea372547b29236df3757d005bc1d7912b44b978d5669
 md5=d351e44709c9810b85e29b877f50968a
 sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.28.tar.bz2]
+md5=d351e44709c9810b85e29b877f50968a
+sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -15742,6 +15754,10 @@ sha256=76472e51576b42bfc129e487ae7dd3a5e1f1f380105b422fc14ee408e3a881df
 md5=516c576c0ca5c0a01ad24d018093cfee
 sha256=8a29457052b73ac0139e3b2824a74323256dd7631b1691239ddb18124e231a71
 
+[http://www.webdav.org/neon/neon-0.28.2.tar.gz]
+md5=b99b3f44e8507ae2d17362f1b34aaf02
+sha256=d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
+
 [http://downloads.sourceforge.net/net-snmp/net-snmp-5.1.2.tar.gz]
 md5=8080555ab3f90011f25d5122042d9a8d
 sha256=1fca69e934c3d526e308450cc5af2478d440e012922dd0bb10388fcf093ef32e
@@ -17006,6 +17022,10 @@ sha256=fbb5ee21210a4e4e1fe25941c6e16ec0fe8634817e6c96145128f376ba0c640b
 md5=464f663266e2c18371e213adab3c0077
 sha256=4862e7bf53553f645d9d730d3657bbec79f7c03482a984259b38e10e25b54382
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.29-rc5.bz2]
+md5=60193569887cb6fe98b9c0d483f911e7
+sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -20358,6 +20378,10 @@ sha256=8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
 md5=4c333a5fe827568c67d195cda7a5e154
 sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 
+[http://subversion.tigris.org/downloads/subversion-1.5.5.tar.bz2]
+md5=6f3701a0f2acf3fe53093491ba3d77ee
+sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
+
 [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz]
 md5=b29893c06192df6230dd5f340f3badf5
 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
@@ -21226,6 +21250,10 @@ sha256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec
 md5=3aa0e0e488719611f0bc4441b63a6f56
 sha256=f3aae7e2f67cf12f3da98325388c7b2f6718729aa69c5c804d1866d6a49f8592
 
+[http://alioth.debian.org/frs/download.php/2733/tuxmath_w_fonts-1.7.1.tar.gz]
+md5=4ab3d5bd74adb0d0aeacb721b8cac395
+sha256=d0aebfb352add3ada95537aeef163019f93d5a0f9385a2fcae678125b77d5035
+
 [http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz]
 md5=5db0cd42dfdff3e681805e93b4867c43
 sha256=217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
index 4595b6aebe..b2a116d109 100644
--- a/conf/machine/vortex86sx.conf
+++ b/conf/machine/vortex86sx.conf
@@ -4,7 +4,6 @@
 require conf/machine/include/tune-i486sx.inc
 
 MACHINE_FEATURES += "x86"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d"
 
 KERNEL_IMAGETYPE = "bzImage"