[oe-commits] Thomas Zimmermann : shr/merge: fix shr-image (bluez3 -> bluez4 and glibc -> eglibc)

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: a44a563dd0b3c5a0d63f004b3ccc134d30836177
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a44a563dd0b3c5a0d63f004b3ccc134d30836177

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Sat Oct 24 10:23:45 2009 +0000

shr/merge: fix shr-image (bluez3 -> bluez4 and glibc -> eglibc)

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/images/shr-image.inc      |    6 +++---
 recipes/tasks/task-shr-minimal.bb |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index 1a5a224..0e2414f 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -3,7 +3,7 @@
 #------------------------------------------------------
 
 PV = "2.0"
-PR = "r4"
+PR = "r5"
 
 
 DEPENDS += "task-shr-minimal"
@@ -135,7 +135,7 @@ shr_rootfs_gta02_postprocess() {
     cd ${IMAGE_ROOTFS}/boot
     ln -s uImage uImage-GTA02.bin
     cd $curdir
-    sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
+    #sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
 }
 
 shr_rootfs_gta01_postprocess() {
@@ -144,7 +144,7 @@ shr_rootfs_gta01_postprocess() {
     cd ${IMAGE_ROOTFS}/boot
     ln -s uImage uImage-GTA01.bin
     cd $curdir
-    sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
+    #sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
 }
 
 ROOTFS_POSTPROCESS_COMMAND += " shr_rootfs_postprocess"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index cc890b7..460b69c 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r10"
+PR = "r11"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -25,7 +25,7 @@ def get_rdepends(bb, d):
         import os
         ipkdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1)
 
-        regexp1 = re.compile("glibc-binary-localedata-.*") # search pattern
+        regexp1 = re.compile("eglibc-binary-localedata-.*") # search pattern
         regexp2 = re.compile("_.*") # we want to remove all version info and file extension
 
         for root, subFolders, files in os.walk(ipkdir):
@@ -44,7 +44,7 @@ def get_rdepends(bb, d):
             locale = regexp1.sub("", locale)
             locale = regexp2.sub("-", locale)
             locale = str.lower(locale)
-            rdepends = "%s glibc-binary-localedata-%s" % (rdepends, locale)
+            rdepends = "%s eglibc-binary-localedata-%s" % (rdepends, locale)
     return rdepends