7 files changed, 11 insertions, 7 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 27b9e87e92..2f5e67c762 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6406,6 +6406,10 @@ sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
 md5=866ba97420f5ce978b6a6b1cb4338890
 sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
 
+[http://llvm.org/releases/2.1/llvm-2.1.tar.gz]
+md5=b930e7213b37acc934d0d163cf13af18
+sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
+
 [http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.3.tar.gz]
 md5=9f54fc8a40e26edd61ce67902b315a66
 sha256=07675051b60343820b235a818f2c2d528b86d2a19c2f56833213e3f574f9cd1a
diff --git a/packages/icu/icu-3.6.inc b/packages/icu/icu-3.6.inc
index 92176ee7fb..b9031e202a 100644
--- a/packages/icu/icu-3.6.inc
+++ b/packages/icu/icu-3.6.inc
@@ -5,7 +5,7 @@ SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-s
 
 S = "${WORKDIR}/icu/source"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 do_configure() {
 	libtoolize --force
diff --git a/packages/llvm/llvm-gcc4-cross_svn.bb b/packages/llvm/llvm-gcc4-cross_svn.bb
index 48302c371d..9b0e07ab94 100644
--- a/packages/llvm/llvm-gcc4-cross_svn.bb
+++ b/packages/llvm/llvm-gcc4-cross_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "various"
 
 DEPENDS = "llvm-native"
 
-PV = "2.0+svnr${SRCREV}"
+PV = "2.1+svnr${SRCREV}"
 
 inherit autotools cross
 
diff --git a/packages/llvm/llvm-native_2.0.bb b/packages/llvm/llvm-native_2.1.bb
index 03e344cc11..6366b9bbbe 100644
--- a/packages/llvm/llvm-native_2.0.bb
+++ b/packages/llvm/llvm-native_2.1.bb
@@ -1,6 +1,6 @@
 require llvm.inc
 
-SRC_URI = "http://llvm.org/releases/2.0/llvm-${PV}.tar.gz"
+SRC_URI = "http://llvm.org/releases/2.1/llvm-${PV}.tar.gz"
 
 
 inherit native
diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session
index dfef83d934..ed2346d55f 100644
--- a/packages/openmoko2/openmoko-sound-system2/session
+++ b/packages/openmoko2/openmoko-sound-system2/session
@@ -22,7 +22,7 @@ load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
 load-module module-x11-bell sample=x11-bell
 
 # Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
 load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
 load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
 
diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index 35bfe66318..57b72af4b6 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -12,7 +12,7 @@ RDEPENDS = "\
 "
 RREPLACES = "openmoko-sound-system"
 RPROVIDES = "openmoko-sound-system"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko-base update-rc.d
 
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index 0693b9bb8a..1cfb519c99 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/base"
 RREPLACES = "openmoko-sound-theme-standard"
 RPROVIDES = "openmoko-sound-theme-standard"
 PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2 autotools
 
@@ -16,7 +16,7 @@ do_install() {
         for i in *.mp3; do
                 cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
                 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
 }