[oe-commits] Thomas Zimmermann : shr/merge: make LIBC configureable

[git version control]

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

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Wed Oct 28 09:31:26 2009 +0000

shr/merge: make LIBC configureable

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

---

 conf/distro/shr.conf              |    4 +++-
 recipes/tasks/task-shr-minimal.bb |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index d3f4041..f337d5b 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -24,6 +24,8 @@ DISTRO_PR = ".3"
 DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
+#LIBC = "glibc"
+
 # We need to override some machine stuff as well; include the machine-
 # specific file here (if it exists).
 include conf/distro/include/shr-${MACHINE}.conf
@@ -33,7 +35,7 @@ require conf/distro/include/shr-autorev.inc
 
 include conf/distro/minimal.conf
 
-include conf/distro/include/angstrom-eglibc.inc
+include conf/distro/include/angstrom-${LIBC}.inc
 # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
 # (the complete story is a bit more nuanced due to cache starvation)
 # Angstrom turns on thumb for armv4t machine according to this RFC:
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 460b69c..a10c119 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 = "r11"
+PR = "r12"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -16,7 +16,7 @@ def get_rdepends(bb, d):
     if not locales or locales == "all":
         locales = bb.data.getVar("IMAGE_LINGUAS", d, 1);
 
-
+    libc = bb.data.getVar('LIBC', d, 1)
     import re
 
     rdepends = ""
@@ -25,7 +25,7 @@ def get_rdepends(bb, d):
         import os
         ipkdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1)
 
-        regexp1 = re.compile("eglibc-binary-localedata-.*") # search pattern
+        regexp1 = re.compile(libc+"-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 eglibc-binary-localedata-%s" % (rdepends, locale)
+            rdepends = "%s %s-binary-localedata-%s" % (rdepends, libc, locale)
     return rdepends