curl_7.54.1.bb: improve reproducibility

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: 6bc323ac9315712e75a0282cddb292bc84afc6f1) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Juro Bystricky <juro.bystricky@intel.com> 2017-10-30 10:49:46 -0700
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2017-11-08 22:24:04 +0000
commit: a3cccf2a6ee8acddf1387d48fb1b6c56b1c95407 (patch)
tree: 09bd8547bf99e03ff2c56a7c28c6cfac70d49790
parent: cd803651751fec224c78509743e10aea79a941de (diff)
download: poky-a3cccf2a6ee8acddf1387d48fb1b6c56b1c95407.tar.gz
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-support/curl/curl/reproducible-mkhelp.patch b/meta/recipes-support/curl/curl/reproducible-mkhelp.patch
new file mode 100644
index 0000000000..268bbebf09
--- /dev/null
+++ b/meta/recipes-support/curl/curl/reproducible-mkhelp.patch
@@ -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"
diff --git a/meta/recipes-support/curl/curl_7.54.1.bb b/meta/recipes-support/curl/curl_7.54.1.bb
index 9870657ca4..58f05316fe 100644
--- a/meta/recipes-support/curl/curl_7.54.1.bb
+++ b/meta/recipes-support/curl/curl_7.54.1.bb
@@ -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}"
author	Juro Bystricky <juro.bystricky@intel.com>	2017-10-30 10:49:46 -0700
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2017-11-08 22:24:04 +0000
commit	a3cccf2a6ee8acddf1387d48fb1b6c56b1c95407 (patch)
tree	09bd8547bf99e03ff2c56a7c28c6cfac70d49790
parent	cd803651751fec224c78509743e10aea79a941de (diff)
download	poky-a3cccf2a6ee8acddf1387d48fb1b6c56b1c95407.tar.gz

diff --git a/meta/recipes-support/curl/curl/reproducible-mkhelp.patch b/meta/recipes-support/curl/curl/reproducible-mkhelp.patch new file mode 100644 index 0000000000..268bbebf09 --- /dev/null +++ b/meta/recipes-support/curl/curl/reproducible-mkhelp.patch
@@ -0,0 +1,32 @@
		1	From 1fe92fd3dd64c7228f6ff41e3fc16c4f2392471a Mon Sep 17 00:00:00 2001
		2	From: Juro Bystricky <juro.bystricky@intel.com>
		3	Date: Fri, 27 Oct 2017 08:28:25 -0700
		4	Subject: mkhelp.pl: support reproducible build
		5
		6	Do not generate line with the current date, such as:
		7
		8	* Generation time: Tue Oct-24 18:01:41 2017
		9
		10	This will improve reproducibility. The generated string is only
		11	part of a comment, so there should be no adverse consequences.
		12
		13	Upstream-Status: Submitted [ https://github.com/curl/curl/pull/2026 ]
		14
		15	Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
		16
		17	diff --git a/src/mkhelp.pl b/src/mkhelp.pl
		18	index 270daa2..757f024 100755
		19	--- a/src/mkhelp.pl
		20	+++ b/src/mkhelp.pl
		21	@@ -102,11 +102,9 @@ while(<READ>) {
		22	}
		23	close(READ);
		24
		25	-$now = localtime;
		26	print <<HEAD
		27	/*
		28	* NEVER EVER edit this manually, fix the mkhelp.pl script instead!
		29	- * Generation time: $now
		30	*/
		31	#ifdef USE_MANUAL
		32	#include "tool_hugehelp.h"


diff --git a/meta/recipes-support/curl/curl_7.54.1.bb b/meta/recipes-support/curl/curl_7.54.1.bb index 9870657ca4..58f05316fe 100644 --- a/meta/recipes-support/curl/curl_7.54.1.bb +++ b/meta/recipes-support/curl/curl_7.54.1.bb
@@ -13,6 +13,10 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
13	file://CVE-2017-1000254.patch \	13	file://CVE-2017-1000254.patch \
14	"	14	"
15		15
		16	SRC_URI_append_class-target = " \
		17	file://reproducible-mkhelp.patch \
		18	"
		19
16	# curl likes to set -g0 in CFLAGS, so we stop it	20	# curl likes to set -g0 in CFLAGS, so we stop it
17	# from mucking around with debug options	21	# from mucking around with debug options
18	#	22	#
@@ -66,7 +70,11 @@ do_install_append() {
66		70
67	do_install_append_class-target() {	71	do_install_append_class-target() {
68	# cleanup buildpaths from curl-config	72	# cleanup buildpaths from curl-config
69	sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config	73	sed -i \
		74	-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
		75	-e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
		76	-e 's\|${DEBUG_PREFIX_MAP}\|\|g' \
		77	${D}${bindir}/curl-config
70	}	78	}
71		79
72	PACKAGES =+ "lib${BPN}"	80	PACKAGES =+ "lib${BPN}"