tools/mkimage: backport SOURCE_DATE_EPOCH for reproducible builds

[openwrt/openwrt.git] / tools / mkimage / patches / 030-allow-to-use-different-magic.patch

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 31a9065f3f04d6694bf7972c9162a03051a92701..dcab48894c0fb5a0cc2308fa64a6996e9d16833e 100644 (file)
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -1,14 +1,14 @@
 --- a/tools/mkimage.c
 +++ b/tools/mkimage.c
-@@ -37,6 +37,7 @@ struct mkimage_params params = {
+@@ -24,6 +24,7 @@ struct image_tool_params params = {
        .arch = IH_ARCH_PPC,
        .type = IH_TYPE_KERNEL,
        .comp = IH_COMP_GZIP,
 +      .magic = IH_MAGIC,
        .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
        .imagename = "",
- };
-@@ -180,6 +181,16 @@ main (int argc, char **argv)
+       .imagename2 = "",
+@@ -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 ();
-@@ -580,12 +591,13 @@ usage ()
+@@ -623,12 +634,13 @@ static void usage(void)
        fprintf (stderr, "Usage: %s -l image\n"
                         "          -l ==> list image header information\n",
                params.cmdname);
@@ -40,9 +40,20 @@
                         "          -a ==> set load address to 'addr' (hex)\n"
                         "          -e ==> set entry point to 'ep' (hex)\n"
                         "          -n ==> set image name to 'name'\n"
---- a/tools/mkimage.h
-+++ b/tools/mkimage.h
-@@ -64,6 +64,7 @@ struct mkimage_params {
+--- a/tools/default_image.c
++++ b/tools/default_image.c
+@@ -98,7 +98,7 @@ static void image_set_header(void *ptr,
+                       sbuf->st_size - sizeof(image_header_t));
+ 
+       /* Build new header */
+-      image_set_magic(hdr, IH_MAGIC);
++      image_set_magic(hdr, params->magic);
+       image_set_time(hdr, sbuf->st_mtime);
+       image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
+       image_set_load(hdr, params->addr);
+--- a/tools/imagetool.h
++++ b/tools/imagetool.h
+@@ -44,6 +44,7 @@ struct image_tool_params {
        int arch;
        int type;
        int comp;
@@ -50,14 +61,3 @@
        char *dtc;
        unsigned int addr;
        unsigned int ep;
---- a/tools/default_image.c
-+++ b/tools/default_image.c
-@@ -110,7 +110,7 @@ static void image_set_header (void *ptr,
-                       sbuf->st_size - sizeof(image_header_t));
- 
-       /* Build new header */
--      image_set_magic (hdr, IH_MAGIC);
-+      image_set_magic (hdr, params->magic);
-       image_set_time (hdr, sbuf->st_mtime);
-       image_set_size (hdr, sbuf->st_size - sizeof(image_header_t));
-       image_set_load (hdr, params->addr);