[oe-commits] Richard Purdie : elibc-package.bbclass: Operate on PKG, not D after package .bbclass updates

git version control git at git.openembedded.org
Tue Nov 10 12:39:23 UTC 2009


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

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Tue Nov 10 11:23:44 2009 +0000

elibc-package.bbclass: Operate on PKG, not D after package.bbclass updates

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 recipes/eglibc/eglibc-package.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index a50ec61..27437f6 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -152,23 +152,23 @@ do_prep_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 	rm -rf $treedir
 	mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-	cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
+	cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n
 	# unzip to avoid parsing errors
 	for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
 		gunzip $i
 	done
-	ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
+	ls -d ${PKGD}${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
-	install -m 0755 ${D}${bindir}/localedef $treedir/bin
+	install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin
 }
 
 do_collect_bins_from_locale_tree() {
 	treedir=${WORKDIR}/locale-tree
 
-	mkdir -p ${D}${libdir}
-	cp -pPR $treedir/${libdir}/locale ${D}${libdir}
+	mkdir -p ${PKGD}${libdir}
+	cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir}
 }
 
 python package_do_split_gconvs () {





More information about the Openembedded-commits mailing list