From ed51e1231ac38fddac36095541a0dac33733b002 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 6 Feb 2020 23:14:38 +0100 Subject: perl: do not install files that contain build host specific data This was breaking reproducibility, and the files aren't needed on target. [YOCTO #13772] (From OE-Core rev: 2e0f30c4680221c693495e3a0327378d502a518b) (From OE-Core rev: 208efc88fa3c57244b272bf7e7f7f8163f14630c) (From OE-Core rev: e120848c6bba6ce2cf910e762d53193d85280a98) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl-ptest.inc | 3 +++ meta/recipes-devtools/perl/perl_5.30.0.bb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 7152057762..98e3361fcc 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,6 +42,9 @@ do_install_ptest () { # Remove a useless timestamp... sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst + + # Remove files with host-specific configuration for building native binaries + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh } python populate_packages_prepend() { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index ba2a8437d4..c567d4e7a2 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -135,6 +135,9 @@ do_install_append_class-target() { # This is used to substitute target configuration when running native perl via perl-configpm-switch.patch ln -s Config_heavy.pl ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config_heavy-target.pl + # This contains host-specific information used for building miniperl (a helper executable built with host compiler) + # and therefore isn't reproducible. I believe the file isn't actually needed on target. + rm ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/xconfig.h } do_install_append_class-nativesdk() { -- cgit v1.2.3-54-g00ecf