[oe-commits] Marc Olzheim : eglibc-package.bbclass glibc-package.bbclass: Use ls -d in do_prep_locale_tree
git version control
git at git.openembedded.org
Tue Aug 11 02:45:47 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 19a190ca2bedf9a8d017f3c5fb163d51d0b3a828
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=19a190ca2bedf9a8d017f3c5fb163d51d0b3a828
Author: Marc Olzheim <zlo at zlo.nu>
Date: Mon Aug 10 13:53:39 2009 -0700
eglibc-package.bbclass glibc-package.bbclass: Use ls -d in do_prep_locale_tree
ls -d will list directories as plain files and then cp -R will copy the
contents over.
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
recipes/eglibc/eglibc-package.bbclass | 2 +-
recipes/eglibc/eglibc.inc | 2 +-
recipes/glibc/glibc-package.bbclass | 2 +-
recipes/glibc/glibc.inc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index 7843d9f..ac8a7fe 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -152,7 +152,7 @@ do_prep_locale_tree() {
for i in $treedir/${datadir}/i18n/charmaps/*gz; do
gunzip $i
done
- ls ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+ ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
fi
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc
index 1ca0c62..f81523e 100644
--- a/recipes/eglibc/eglibc.inc
+++ b/recipes/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"
SECTION = "libs"
PRIORITY = "required"
LICENSE = "LGPL"
-INC_PR = "r5"
+INC_PR = "r6"
# nptl needs unwind support in gcc, which can't be built without glibc.
DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
#this leads to circular deps, so lets not add it yet
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 2bf08ce..2da6818 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -147,7 +147,7 @@ do_prep_locale_tree() {
for i in $treedir/${datadir}/i18n/charmaps/*gz; do
gunzip $i
done
- ls ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+ ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then
cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
fi
diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc
index 9a39421..4efff78 100644
--- a/recipes/glibc/glibc.inc
+++ b/recipes/glibc/glibc.inc
@@ -11,7 +11,7 @@ PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
# INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc
-INC_PR = "r32"
+INC_PR = "r33"
inherit autotools
More information about the Openembedded-commits
mailing list