aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches/030-allow-to-use-different-magic.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-28 22:42:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-28 22:42:44 +0000
commit37f09b8129aadb8cba52c15446a31dfb59328e16 (patch)
tree536991a4bd22786074ec0ead4399d32bf43974f5 /tools/mkimage/patches/030-allow-to-use-different-magic.patch
parentb3f7902a0687dced523f49a0430757ac68f6467d (diff)
downloadupstream-37f09b8129aadb8cba52c15446a31dfb59328e16.tar.gz
upstream-37f09b8129aadb8cba52c15446a31dfb59328e16.tar.bz2
upstream-37f09b8129aadb8cba52c15446a31dfb59328e16.zip
tools/mkimage: backport SOURCE_DATE_EPOCH for reproducible builds
This pulls in Paul Kocialkowski's SOURCE_DATE_EPOCH support patch for u-boot, which landed upstream circa July 2015. Note that this "host" u-boot repo is only used to compile the 'mkimage' utility, and isn't used to actually compile a bootloader for any target. This patch could be removed if/when the host u-boot package is updated to a contemporary version (but there doesn't seem to be any motivation/need to do so). Signed-off-by: bryan newbold <bnewbold@robocracy.org> Signed-off-by: Felix Fietkau <nbd@openwrt.org> [fix portability error, refresh patches] SVN-Revision: 48542
Diffstat (limited to 'tools/mkimage/patches/030-allow-to-use-different-magic.patch')
-rw-r--r--tools/mkimage/patches/030-allow-to-use-different-magic.patch10
1 files changed, 5 insertions, 5 deletions
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;