Skip to contentSkip to conversation

(e)glibc's do_prep_locale_tree() in bbclass

PATCH New Marc Olzheim 1 participant 1 message Jun 9, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 (e)glibc's do_prep_locale_tree() in bbclass

Hi,

do_prep_locale_tree() in both recipes/eglibc/eglibc-package.bbclass and recipes/glibc/glibc-package.bbclass do an
"ls ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib"

That works fine as longs as there are no directories in there. When there are directories in there (which is the case in my situation at least, using org.openembedded.dev), ls produces "directory:" lines which obviously confuse the cp command.

Simply adding a "-d" flag to ls solves this issue.

Patch attached.

Marc

commit b4098e51e5bc76dda6755e2f949b107ccd85a088

Author: Marc Olzheim <[email protected]>
Date:   Tue Jun 9 11:39:11 2009 +0200

Fix do_prep_locale_tree() for eglibc as well.

recipes/eglibc/eglibc-package.bbclass +1 -1
index f2acc96..e8bb333 100644
@@ -156,7 +156,7 @@ do_prep_locale_tree() {
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+	ls -d ${D}/lib/* | 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

commit 6a703c95b135290b617d5b9dd14a4d08a8b1131b

Author: Marc Olzheim <[email protected]>
Date:   Tue Jun 9 10:47:24 2009 +0200

Fix do_prep_locale_tree().

recipes/glibc/glibc-package.bbclass +1 -1
index 2bf08ce..2da6818 100644
@@ -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