1 files changed, 6 insertions, 6 deletions

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 733f26b85e..c9d81f0638 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -104,24 +104,24 @@ TMP_LOCALE="/tmp/locale${libdir}/locale"
 do_prep_locale_tree() {
         treedir=${WORKDIR}/locale-tree
         rm -rf $treedir
-        mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
-        cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n
+        mkdir -p $treedir/${base_bindir} $treedir/${base_libdir} $treedir/${datadir} $treedir/${libdir}/locale
+        tar -cf - -C ${PKGD}${datadir} -ps i18n | tar -xf - -C $treedir/${datadir}
         # unzip to avoid parsing errors
         for i in $treedir/${datadir}/i18n/charmaps/*gz; do 
                 gunzip $i
         done
-        cp -pPR ${PKGD}${base_libdir}/* $treedir/lib
+        tar -cf - -C ${PKGD}${base_libdir} -ps . | tar -xf - -C $treedir/${base_libdir}
         if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/lib/libgcc_s.* ]; then
-                cp -pPR ${STAGING_DIR_NATIVE}/${prefix_native}/lib/libgcc_s.* $treedir/lib
+                tar -cf - -C ${STAGING_DIR_NATIVE}/${prefix_native}/${base_libdir} -ps libgcc_s.* | tar -xf - -C $treedir/${base_libdir}
         fi
-        install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin
+        install -m 0755 ${PKGD}${bindir}/localedef $treedir/${base_bindir}
 }
 
 do_collect_bins_from_locale_tree() {
         treedir=${WORKDIR}/locale-tree
 
         mkdir -p ${PKGD}${libdir}
-        cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir}
+        tar -cf - -C $treedir/${libdir} -ps locale | tar -xf - -C ${PKGD}${libdir}
 }
 
 inherit qemu