mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

curl_7.54.1.bb: improve reproducibility

Browse Source 
Improve reproducible build of curl-dev and curl-dbg packages.

curl-dev: Correctly remove build host references from curl-config
curl-dbg: Do not generate time stamps in files generated by mkhelp.pl

(From OE-Core rev: 4b5bfbf0f474d2657c1ed54a2ff00502d5f419d9)

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Juro Bystricky
2017-10-30 10:49:46 -07:00
committed by Richard Purdie
parent 8d3edc9821
commit f8c7eff81d
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-support/curl/curl/reproducible-mkhelp.patch Normal file
View File

@@ -0,0 +1,32 @@
From 1fe92fd3dd64c7228f6ff41e3fc16c4f2392471a Mon Sep 17 00:00:00 2001
From: Juro Bystricky <juro.bystricky@intel.com>
Date: Fri, 27 Oct 2017 08:28:25 -0700
Subject: mkhelp.pl: support reproducible build
Do not generate line with the current date, such as:
* Generation time: Tue Oct-24 18:01:41 2017
This will improve reproducibility. The generated string is only
part of a comment, so there should be no adverse consequences.
Upstream-Status: Submitted [ https://github.com/curl/curl/pull/2026 ]
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 270daa2..757f024 100755
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -102,11 +102,9 @@ while(<READ>) {
}
close(READ);
-$now = localtime;
print <<HEAD
/*
* NEVER EVER edit this manually, fix the mkhelp.pl script instead!
- * Generation time: $now
*/
#ifdef USE_MANUAL
#include "tool_hugehelp.h"

10
meta/recipes-support/curl/curl_7.54.1.bb
View File

@@ -13,6 +13,10 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://CVE-2017-1000254.patch \
"
SRC_URI_append_class-target = " \
file://reproducible-mkhelp.patch \
"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
#
@@ -66,7 +70,11 @@ do_install_append() {
do_install_append_class-target() {
# cleanup buildpaths from curl-config
sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config
sed -i \
-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
-e 's|${DEBUG_PREFIX_MAP}||g' \
${D}${bindir}/curl-config
}
PACKAGES =+ "lib${BPN}"