From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 9 Nov 2009 23:21:56 +0000 (+0000)
Subject: glibc-package.bbclass: Operate on PKG, not D after package.bbclass updates
X-Git-Tag: 2011-1~6799
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6c92cfc02014a55c4d3a40d70ff29308ad6255e7;p=openembedded-core.git

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

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

diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index 7fa32e6272..561805a66e 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -142,23 +142,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
-	cp -pPR ${D}${base_libdir}/* $treedir/lib
+	cp -pPR ${PKGD}${base_libdir}/* $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 () {