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

3 files changed, 30 insertions, 1 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c4af34e8d7..c2f7666ef2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -405,6 +405,7 @@ export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
 export OBJCOPY = "${HOST_PREFIX}objcopy"
 export OBJDUMP = "${HOST_PREFIX}objdump"
+export NM = "${HOST_PREFIX}nm"
 PYTHON = "${@sys.executable}"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 85de9c2d93..ab8b320cb5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4982,6 +4982,10 @@ sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61
 md5=f92e5606c23a8092f3d5694e8d1c932e
 sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
 
+[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.10.tar.bz2]
+md5=3c9c4d55a40b78600f3b43bfa64616f9
+sha256=4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0
+
 [http://savannah.nongnu.org/download/dmidecode/dmidecode-2.9.tar.bz2]
 md5=3dac4b1817012ffebd78671473d8f56c
 sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
@@ -14282,6 +14286,10 @@ sha256=c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0
 md5=d42110ae548dae1eea73e83b03a1a936
 sha256=243311225a6bdcee065aaabc63334086cdd4298f13def45c7e798201f88d08cc
 
+[ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz]
+md5=648ecd43f7b80852419aaf73702bc23f
+sha256=b9a35e56826239add731cf083108cbc313d4a2d1770e6f5006966daa66a21eda
+
 [ftp://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz]
 md5=bf4983ea440542f3ec019cc1bb6ca87d
 sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29
@@ -17758,6 +17766,10 @@ sha256=0d10d8f70a6fadfb9cfaa7b66c5fe7eba17e64ecb96104c4ddedc82f89765d5c
 md5=16187fed2bdefec6275ece6401ce4cd2
 sha256=5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f
 
+[http://www.nano-editor.org/dist/v2.0/nano-2.0.9.tar.gz]
+md5=2be94dc43fb60fff4626a2401a977220
+sha256=6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f
+
 [http://downloads.sourceforge.net/nasm/nasm-0.98.38.tar.bz2]
 md5=9f682490c132b070d54e395cb6ee145e
 sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0
@@ -18710,6 +18722,10 @@ sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
 md5=82b059379895cf125261d7d773465915
 sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
 
+[http://downloads.sourceforge.net/oprofile/oprofile-0.9.5.tar.gz]
+md5=4b2ceca3fa013c95cc8d47c790807dc2
+sha256=1cb7c3968e3e01e7597f54b87ebc87a48c6c8e569db7e353adb91841db5b4190
+
 [http://www.rpsys.net/openzaurus/patches/archive/oprofile_always_bt_arm-r0.patch]
 md5=9d1e6a9bd4d6dc9cae3c54c18c303ace
 sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
@@ -23038,6 +23054,10 @@ sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 md5=6f3701a0f2acf3fe53093491ba3d77ee
 sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 
+[http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2]
+md5=1a53a0e72bee0bf814f4da83a9b6a636
+sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
+
 [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz]
 md5=b29893c06192df6230dd5f340f3badf5
 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
@@ -25374,10 +25394,18 @@ sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
 md5=fc805051f0fe505c7a4b1b5c8db9b9e3
 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
 
+[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz]
+md5=d6f86ccc3d1a534902e1cf8df1cb43f3
+sha256=05072405fd182425d90374d2d5b69c36fe9fd927f44e397c449a9bdd1a971218
+
 [http://www.oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz]
 md5=5442e7ffc75abd853d1ab1d12667a3e9
 sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce
 
+[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz]
+md5=f318fe11143af82aa6679acc51723a1a
+sha256=9db5a04e184bc06be17d007a58adbf2592e7a380dfd80ddc6aa9001084b9a134
+
 [http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-1.0.5.tar.gz]
 md5=5fbfec7f23b0f539d32b50de4a278b95
 sha256=277e30cbd4a4d9355e9b2c02489d34cbaed87754bbdeb8956e5463e9fb592658
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 7d404a4f65..163c9c901a 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 = "r42" 
+MACHINE_KERNEL_PR = "r43" 
 
 KERNEL_IMAGETYPE = "uImage"