Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

5 files changed, 23 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d18ebbcad5..5e635c3198 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12902,6 +12902,10 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
+[http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz]
+md5=2ad1622b672ccf53a3444a0c55724d38
+sha256=ddeafa5965eaa07f3bd46b0e39b65cba6fa9940d684f7b15bfd615f77eccb51c
+
 [http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
 md5=fa4a620efa1a1c1036b6701b7d4dafe1
 sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
@@ -17202,6 +17206,10 @@ sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 md5=66817a4b4c05454e6488f6b821f2a6a3
 sha256=0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
 
+[http://downloads.sourceforge.net/musicpd/mpd-0.15.tar.bz2]
+md5=2ed93a60bd703ba46d6794e12cfb5f1d
+sha256=38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
+
 [http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz]
 md5=52d10ea80595ec83d8557ba7ac6dc8e6
 sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
@@ -17734,6 +17742,10 @@ sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
 md5=35e821cfd888e9523a90fb7e5074a072
 sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
 
+[http://www.nilfs.org/download/nilfs-utils-2.0.13.tar.bz2]
+md5=2621a9f9145c5edfa38e6e5ee79ceca1
+sha256=2f79bba49c075c101963aeff8abbf7acc77f489f0b5d7dddb1e5405f48cbd4d4
+
 [http://ftp.debian.org/debian/pool/main/n/nkf/nkf_2.07.orig.tar.gz]
 md5=af11dcd3fe71d67831c020e3bfd5073b
 sha256=71d2ba992df209a00bb1dca45e3336729dc16e51b71526bd20f897cc6127a275
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 470c31a788..9b1968f343 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -160,6 +160,9 @@ PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 
+ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez3 has been replace by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez3 has been replace by bluez4"
+
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 1f0967a42e..287bd9bd77 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -17,11 +17,9 @@ FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
 
-BUILD_OPTIMIZATION = "-O2 -ggdb3"
-BUILD_OPTIMIZATION_pn-perl = "-O1"
-BUILD_OPTIMIZATION_pn-glibc = "-O2"
-BUILD_OPTIMIZATION_sparc = "-O2"
-BUILD_OPTIMIZATION_ep9312 = "-O"
+# This is only used for -native packages
+BUILD_OPTIMIZATION = "-O2 -g"
+BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g"
 
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 525f949331..669c8ada3c 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -70,6 +70,9 @@ INHERIT += "debian"
 #activate config checker
 INHERIT += "sanity" 
 
+#activate the blacklister
+INHERIT += "angstrom"
+
 #make devshell available as task
 INHERIT += "devshell" 
 
@@ -78,6 +81,7 @@ INHERIT += "angstrom-mirrors"
 
 #run QA tests on builds and packages and log them  
 INHERIT += "insane"
+# INHERIT += "packagehistory"
 QA_LOG = "1"
 
 #run QA tests on recipes
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index ea395b441b..9c3c8f59e1 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 = "r39" 
+MACHINE_KERNEL_PR = "r40" 
 
 KERNEL_IMAGETYPE = "uImage"