]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl: do not install files that contain build host specific data
authorAlexander Kanavin <alex.kanavin@gmail.com>
Thu, 6 Feb 2020 22:14:38 +0000 (23:14 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 11 Feb 2020 23:04:29 +0000 (23:04 +0000)
This was breaking reproducibility, and the files aren't needed on
target.

[YOCTO #13772]

(From OE-Core rev: 2e0f30c4680221c693495e3a0327378d502a518b)

(From OE-Core rev: 208efc88fa3c57244b272bf7e7f7f8163f14630c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-devtools/perl/perl-ptest.inc
meta/recipes-devtools/perl/perl_5.30.0.bb

index 7152057762f0a73819fc494f9189365d519cda59..98e3361fcc10209eb1e5b1a988dc492f1c6ed0f2 100644 (file)
@@ -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() {
index ba2a8437d47243ee2703cb65e9d9eedaa2c9a956..c567d4e7a2d6344b8a6a46b31c2c48ed8b551e43 100644 (file)
@@ -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() {