Merge pull request #9 from wigyori/cc-mkimage-fix

CC: fix tools build with GCC6

4 files changed, 185 insertions, 6 deletions

diff --git a/tools/mkimage/patches/010-freebsd-ulong-fix.patch b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
index 75b9e892ad..1101e72d15 100644
--- a/tools/mkimage/patches/010-freebsd-ulong-fix.patch
+++ b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
@@ -1,6 +1,6 @@
 --- a/include/image.h
 +++ b/include/image.h
-@@ -44,6 +44,10 @@
+@@ -44,6 +44,10 @@ struct lmb;
  
  #endif /* USE_HOSTCC */
  
diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
index d5afdd35b2..dcab48894c 100644
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -1,6 +1,6 @@
 --- a/tools/mkimage.c
 +++ b/tools/mkimage.c
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,7 @@ struct image_tool_params params = {
  	.arch = IH_ARCH_PPC,
  	.type = IH_TYPE_KERNEL,
  	.comp = IH_COMP_GZIP,
@@ -8,7 +8,7 @@
  	.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
  	.imagename = "",
  	.imagename2 = "",
-@@ -168,6 +169,16 @@
+@@ -168,6 +169,16 @@ main (int argc, char **argv)
  					genimg_get_comp_id (*++argv)) < 0)
  					usage ();
  				goto NXTARG;
@@ -25,7 +25,7 @@
  			case 'D':
  				if (--argc <= 0)
  					usage ();
-@@ -623,12 +634,13 @@
+@@ -623,12 +634,13 @@ static void usage(void)
  	fprintf (stderr, "Usage: %s -l image\n"
  			 "          -l ==> list image header information\n",
  		params.cmdname);
@@ -42,7 +42,7 @@
  			 "          -n ==> set image name to 'name'\n"
 --- a/tools/default_image.c
 +++ b/tools/default_image.c
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ static void image_set_header(void *ptr,
  			sbuf->st_size - sizeof(image_header_t));
  
  	/* Build new header */
@@ -53,7 +53,7 @@
  	image_set_load(hdr, params->addr);
 --- a/tools/imagetool.h
 +++ b/tools/imagetool.h
-@@ -44,6 +44,7 @@
+@@ -44,6 +44,7 @@ struct image_tool_params {
  	int arch;
  	int type;
  	int comp;
diff --git a/tools/mkimage/patches/090-reproducible-SOURCE_DATE_EPOCH.patch b/tools/mkimage/patches/090-reproducible-SOURCE_DATE_EPOCH.patch
new file mode 100644
index 0000000000..c238fd62ed
--- /dev/null
+++ b/tools/mkimage/patches/090-reproducible-SOURCE_DATE_EPOCH.patch
@@ -0,0 +1,82 @@
+From f3f431a712729a1af94d01bd1bfde17a252ff02c Mon Sep 17 00:00:00 2001
+From: Paul Kocialkowski <contact@paulk.fr>
+Date: Sun, 26 Jul 2015 18:48:15 +0200
+Subject: [PATCH] Reproducible U-Boot build support, using SOURCE_DATE_EPOCH
+
+In order to achieve reproducible builds in U-Boot, timestamps that are defined
+at build-time have to be somewhat eliminated. The SOURCE_DATE_EPOCH environment
+variable allows setting a fixed value for those timestamps.
+
+Simply by setting SOURCE_DATE_EPOCH to a fixed value, a number of targets can be
+built reproducibly. This is the case for e.g. sunxi devices.
+
+However, some other devices might need some more tweaks, especially regarding
+the image generation tools.
+
+Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
+---
+ Makefile              |  7 ++++---
+ README                | 12 ++++++++++++
+ tools/default_image.c | 21 ++++++++++++++++++++-
+ 3 files changed, 36 insertions(+), 4 deletions(-)
+
+--- a/README
++++ b/README
+@@ -4928,6 +4928,18 @@ within that device.
+ 	normal addressable memory via the LBC. CONFIG_SYS_LS_MC_FW_ADDR is the
+ 	virtual address in NOR flash.
+ 
++Reproducible builds
++-------------------
++
++In order to achieve reproducible builds, timestamps used in the U-Boot build
++process have to be set to a fixed value.
++
++This is done using the SOURCE_DATE_EPOCH environment variable.
++SOURCE_DATE_EPOCH is to be set on the build host's shell, not as a configuration
++option for U-Boot or an environment variable in U-Boot.
++
++SOURCE_DATE_EPOCH should be set to a number of seconds since the epoch, in UTC.
++
+ Building the Software:
+ ======================
+ 
+--- a/tools/default_image.c
++++ b/tools/default_image.c
+@@ -89,6 +89,9 @@ static void image_set_header(void *ptr,
+ 				struct image_tool_params *params)
+ {
+ 	uint32_t checksum;
++	char *source_date_epoch;
++	struct tm *time_universal;
++	time_t time;
+ 
+ 	image_header_t * hdr = (image_header_t *)ptr;
+ 
+@@ -97,9 +100,25 @@ static void image_set_header(void *ptr,
+ 				sizeof(image_header_t)),
+ 			sbuf->st_size - sizeof(image_header_t));
+ 
++	source_date_epoch = getenv("SOURCE_DATE_EPOCH");
++	if (source_date_epoch != NULL) {
++		time = (time_t) strtol(source_date_epoch, NULL, 10);
++
++		time_universal = gmtime(&time);
++		if (time_universal == NULL) {
++			fprintf(stderr, "%s: SOURCE_DATE_EPOCH is not valid\n",
++				__func__);
++			time = 0;
++		} else {
++			time = mktime(time_universal);
++		}
++	} else {
++		time = sbuf->st_mtime;
++	}
++
+ 	/* Build new header */
+ 	image_set_magic(hdr, params->magic);
+-	image_set_time(hdr, sbuf->st_mtime);
++	image_set_time(hdr, time);
+ 	image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
+ 	image_set_load(hdr, params->addr);
+ 	image_set_ep(hdr, params->ep);
diff --git a/tools/mkimage/patches/210-openssl-1.1.x-compat.patch b/tools/mkimage/patches/210-openssl-1.1.x-compat.patch
new file mode 100644
index 0000000000..fa7c99f39b
--- /dev/null
+++ b/tools/mkimage/patches/210-openssl-1.1.x-compat.patch
@@ -0,0 +1,97 @@
+--- a/lib/rsa/rsa-sign.c
++++ b/lib/rsa/rsa-sign.c
+@@ -15,10 +15,25 @@
+ #include <openssl/ssl.h>
+ #include <openssl/evp.h>
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if OPENSSL_VERSION_NUMBER < 0x10000000L
++#define HAVE_ERR_REMOVE_STATE
++#elif OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define HAVE_ERR_REMOVE_THREAD_STATE
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100005L
++static void RSA_get0_key(const RSA *r,
++                         const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
+ static int rsa_err(const char *msg)
+ {
+ 	unsigned long sslErr = ERR_get_error();
+@@ -154,7 +169,8 @@ static void rsa_remove(void)
+ 	ERR_free_strings();
+ #ifdef HAVE_ERR_REMOVE_THREAD_STATE
+ 	ERR_remove_thread_state(NULL);
+-#else
++#endif
++#ifdef HAVE_ERR_REMOVE_STATE
+ 	ERR_remove_state(0);
+ #endif
+ 	EVP_cleanup();
+@@ -210,7 +226,6 @@ static int rsa_sign_with_key(RSA *rsa, s
+ 		ret = rsa_err("Could not obtain signature");
+ 		goto err_sign;
+ 	}
+-	EVP_MD_CTX_cleanup(context);
+ 	EVP_MD_CTX_destroy(context);
+ 	EVP_PKEY_free(key);
+ 
+@@ -270,23 +285,26 @@ static int rsa_get_exponent(RSA *key, ui
+ 	BIGNUM *bn_te;
+ 	uint64_t te;
+ 
++	const BIGNUM *bn_e;
++	RSA_get0_key(key, NULL, &bn_e, NULL);
++
+ 	ret = -EINVAL;
+ 	bn_te = NULL;
+ 
+ 	if (!e)
+ 		goto cleanup;
+ 
+-	if (BN_num_bits(key->e) > 64)
++	if (BN_num_bits(bn_e) > 64)
+ 		goto cleanup;
+ 
+-	*e = BN_get_word(key->e);
++	*e = BN_get_word(bn_e);
+ 
+-	if (BN_num_bits(key->e) < 33) {
++	if (BN_num_bits(bn_e) < 33) {
+ 		ret = 0;
+ 		goto cleanup;
+ 	}
+ 
+-	bn_te = BN_dup(key->e);
++	bn_te = BN_dup(bn_e);
+ 	if (!bn_te)
+ 		goto cleanup;
+ 
+@@ -319,6 +337,9 @@ int rsa_get_params(RSA *key, uint64_t *e
+ 	BN_CTX *bn_ctx = BN_CTX_new();
+ 	int ret = 0;
+ 
++	const BIGNUM *bn_n;
++	RSA_get0_key(key, &bn_n, NULL, NULL);
++
+ 	/* Initialize BIGNUMs */
+ 	big1 = BN_new();
+ 	big2 = BN_new();
+@@ -337,7 +358,7 @@ int rsa_get_params(RSA *key, uint64_t *e
+ 	if (0 != rsa_get_exponent(key, exponent))
+ 		ret = -1;
+ 
+-	if (!BN_copy(n, key->n) || !BN_set_word(big1, 1L) ||
++	if (!BN_copy(n, bn_n) || !BN_set_word(big1, 1L) ||
+ 	    !BN_set_word(big2, 2L) || !BN_set_word(big32, 32L))
+ 		ret = -1;
+