diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-09 23:21:56 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:42 +0000 |
commit | 6c92cfc02014a55c4d3a40d70ff29308ad6255e7 (patch) | |
tree | 896dab6e10a6da27c5ddf35e40af0deef9225b0a /meta/packages | |
parent | 7ad17848de7161e617b346e9a8f44c598214dd95 (diff) | |
download | poky-6c92cfc02014a55c4d3a40d70ff29308ad6255e7.tar.gz |
glibc-package.bbclass: Operate on PKG, not D after package.bbclass updates
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/glibc/glibc-package.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
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() { | |||
142 | treedir=${WORKDIR}/locale-tree | 142 | treedir=${WORKDIR}/locale-tree |
143 | rm -rf $treedir | 143 | rm -rf $treedir |
144 | mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale | 144 | mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale |
145 | cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n | 145 | cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n |
146 | # unzip to avoid parsing errors | 146 | # unzip to avoid parsing errors |
147 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do | 147 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do |
148 | gunzip $i | 148 | gunzip $i |
149 | done | 149 | done |
150 | cp -pPR ${D}${base_libdir}/* $treedir/lib | 150 | cp -pPR ${PKGD}${base_libdir}/* $treedir/lib |
151 | if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then | 151 | if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then |
152 | cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib | 152 | cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib |
153 | fi | 153 | fi |
154 | install -m 0755 ${D}${bindir}/localedef $treedir/bin | 154 | install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin |
155 | } | 155 | } |
156 | 156 | ||
157 | do_collect_bins_from_locale_tree() { | 157 | do_collect_bins_from_locale_tree() { |
158 | treedir=${WORKDIR}/locale-tree | 158 | treedir=${WORKDIR}/locale-tree |
159 | 159 | ||
160 | mkdir -p ${D}${libdir} | 160 | mkdir -p ${PKGD}${libdir} |
161 | cp -pPR $treedir/${libdir}/locale ${D}${libdir} | 161 | cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} |
162 | } | 162 | } |
163 | 163 | ||
164 | python package_do_split_gconvs () { | 164 | python package_do_split_gconvs () { |