diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2018-01-07 08:56:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-08 08:48:25 +0000 |
commit | 9a0790120dbe046091cd0392dc576cf9316b7acf (patch) | |
tree | 02a7f6db0e8b5aa2005094ce500cef55f65d1bf4 /meta/recipes-devtools/perl/perl-ptest.inc | |
parent | d1018f90b5318cc37e92bdf49a060e525800f804 (diff) | |
download | poky-9a0790120dbe046091cd0392dc576cf9316b7acf.tar.gz |
perl-ptest: various fixes
Improve reproducibility: Remove all build host references from
distributed files.
Do not package non-linux OS related files.
Also remove some additional files not needed by run-ptest. (There are
probably still more files that can be removed, but as long as they
don't leak build host references they are harmless).
Fix the expected checksum of MakeMaker/lib/ExtUtils/Liblist/Kid.pm
to match the one expected: We modified the file, but did not
recalculate/update the file checksum accordingly.
(This fixes the only failing test.)
(From OE-Core rev: 497b28d9ff0c094768462991709bfb19efa0fa56)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-ptest.inc')
-rw-r--r-- | meta/recipes-devtools/perl/perl-ptest.inc | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 1f549af1b3..6a7a2d7cb3 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc | |||
@@ -2,31 +2,43 @@ inherit ptest | |||
2 | 2 | ||
3 | SRC_URI += "file://run-ptest \ | 3 | SRC_URI += "file://run-ptest \ |
4 | " | 4 | " |
5 | |||
6 | do_install_ptest () { | 5 | do_install_ptest () { |
7 | mkdir -p ${D}${PTEST_PATH} | 6 | mkdir -p ${D}${PTEST_PATH} |
8 | sed -e "s:\/usr\/local:${bindir}:g" -i cpan/version/t/* | 7 | sed -e "s:\/usr\/local:${bindir}:g" -i cpan/version/t/* |
9 | sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl | 8 | sed -e "s:\/opt:\/usr:" -i Porting/add-package.pl |
10 | sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh | 9 | sed -e "s:\/local\/gnu\/:\/:" -i hints/cxux.sh |
11 | tar -c --exclude=\*.o --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \ | 10 | tar -c --exclude='*.o' --exclude=libperl.so --exclude=Makefile --exclude=makefile --exclude=hostperl \ |
11 | --exclude=cygwin --exclude=os2 --exclude=djgpp --exclude=qnx --exclude=symbian --exclude=haiku \ | ||
12 | --exclude=vms --exclude=vos --exclude=NetWare --exclude=amigaos4 --exclude=buildcustomize.pl \ | ||
13 | --exclude='win32/config.*' --exclude=plan9 --exclude=README.plan9 --exclude=perlplan9.pod --exclude=Configure \ | ||
14 | --exclude=veryclean.sh --exclude=realclean.sh --exclude=getioctlsizes \ | ||
15 | --exclude=dl_aix.xs --exclude=sdbm.3 --exclude='cflags.SH' --exclude=makefile.old \ | ||
12 | --exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x ) | 16 | --exclude=miniperl --exclude=generate_uudmap --exclude=patches * | ( cd ${D}${PTEST_PATH} && tar -x ) |
13 | 17 | ||
14 | sed -i -e "s,${D},,g" \ | 18 | ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl |
19 | |||
20 | # Remove build host references from various scattered files... | ||
21 | find "${D}${PTEST_PATH}" \ | ||
22 | \( -name '*.PL' -o -name 'myconfig' -o -name 'cflags' -o -name '*.pl' -o -name '*.sh' -o -name '*.pm' \ | ||
23 | -o -name 'h2xs' -o -name 'h2ph' \ | ||
24 | -o -name '*.h' -o -name 'config.sh-*' -o -name 'pod2man' -o -name 'pod2text' \) \ | ||
25 | -type f -exec sed -i \ | ||
26 | -e "s,${D},,g" \ | ||
15 | -e "s,--sysroot=${STAGING_DIR_HOST},,g" \ | 27 | -e "s,--sysroot=${STAGING_DIR_HOST},,g" \ |
16 | -e "s,-isystem${STAGING_INCDIR} ,,g" \ | 28 | -e "s,-isystem${STAGING_INCDIR} ,,g" \ |
29 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | ||
30 | -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ | ||
17 | -e "s,${STAGING_LIBDIR},${libdir},g" \ | 31 | -e "s,${STAGING_LIBDIR},${libdir},g" \ |
18 | -e "s,${STAGING_BINDIR},${bindir},g" \ | 32 | -e "s,${STAGING_BINDIR},${bindir},g" \ |
19 | -e "s,${STAGING_INCDIR},${includedir},g" \ | 33 | -e "s,${STAGING_INCDIR},${includedir},g" \ |
20 | -e "s,${STAGING_BINDIR_NATIVE}/perl-native/,${bindir}/,g" \ | ||
21 | -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ | 34 | -e "s,${STAGING_BINDIR_NATIVE}/,,g" \ |
22 | -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \ | 35 | -e "s,${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX},${bindir},g" \ |
23 | ${D}${PTEST_PATH}/lib/Config.pm \ | 36 | -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ |
24 | ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2man \ | 37 | -e 's:${RECIPE_SYSROOT}::g' \ |
25 | ${D}${PTEST_PATH}/cpan/podlators/scripts/pod2text | 38 | {} + |
26 | 39 | ||
27 | ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl | 40 | # Remove a useless timestamp... |
28 | # Remove plan9 related stuff | 41 | sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst |
29 | rm -rf ${D}${PTEST_PATH}/plan9 ${D}${PTEST_PATH}/README.plan9 ${D}${PTEST_PATH}/pod/perlplan9.pod | ||
30 | } | 42 | } |
31 | 43 | ||
32 | python populate_packages_prepend() { | 44 | python populate_packages_prepend() { |