1 files changed, 17 insertions, 30 deletions

diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index b1f1cb9d20..6a9df4ad4a 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -5,37 +5,24 @@ SRC_URI += "file://run-ptest \
 
 do_install_ptest () {
         mkdir -p ${D}${PTEST_PATH}
-        cp -pv TestInit.pm MANIFEST config.sh ${D}${PTEST_PATH}/
+        sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl
+        sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh
+        tar -cf - * --exclude \*.o --exclude libperl.so --exclude Makefile --exclude makefile --exclude hostperl \
+                --exclude miniperl --exclude generate_uudmap | ( cd ${D}${PTEST_PATH} && tar -xf - )
+
+        sed -i -e "s,${D},,g" \
+               -e "s,--sysroot=${STAGING_DIR_HOST},,g" \
+               -e "s,-isystem${STAGING_INCDIR} ,,g" \
+               -e "s,${STAGING_LIBDIR},${libdir},g" \
+               -e "s,${STAGING_BINDIR},${bindir},g" \
+               -e "s,${STAGING_INCDIR},${includedir},g" \
+               -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \
+               -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
+               -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \
+            ${D}${PTEST_PATH}/lib/Config.pm
+
+        ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl
 
-        tar -cf - t/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
-        ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/
-        ln -sf ${libdir}/perl/${PV} ${D}${PTEST_PATH}/lib
-
-        for dir in `find ext/ dist/ cpan/ -maxdepth 2 -type d -name t ` ; do
-            tar -cf - $dir | ( cd ${D}${PTEST_PATH} && tar -xf - )
-        done
-        for file in `find ext dist cpan -name \*.t -o -name \test.pl`;  do
-            tar -cf - $file | ( cd ${D}${PTEST_PATH} && tar -xf - )
-        done
-
-        # Tweaks to make tests pass
-        cp -pv lib/unicore/TestProp.pl ${D}${libdir}/perl/${PV}/unicore/
-        # Put all *.t files from the lib dir in the ptest package
-        cd lib
-        for file in `find -name \*.t`; do
-            tar -cf - $file | ( cd ${D}${libdir}/perl/${PV} && tar -xf - )
-        done
-        cd ..
-
-        mkdir -p ${D}${libdir}/perl/${PV}/XS
-        cp -pv lib/XS/APItest.pm ${D}${libdir}/perl/${PV}/XS/
-        cp -pv lib/XS/Typemap.pm ${D}${libdir}/perl/${PV}/XS/
-        mkdir -p ${D}${libdir}/perl/${PV}/auto/XS/APItest
-        cp -pv lib/auto/XS/APItest/APItest.so ${D}${libdir}/perl/${PV}/auto/XS/APItest/
-        mkdir -p ${D}${libdir}/perl/${PV}/auto/XS/Typemap
-        cp -pv lib/auto/XS/Typemap/Typemap.so ${D}${libdir}/perl/${PV}/auto/XS/Typemap/
-        cp -pv cpan/Digest-MD5/README ${D}${PTEST_PATH}/cpan/Digest-MD5/
-        cp -pv cpan/Digest-MD5/MD5.xs ${D}${PTEST_PATH}/cpan/Digest-MD5/
 }
 
 python populate_packages_prepend() {