aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage/patches
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:23 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:23 +0000
commit6d4358aed0535dc87e8bf9c40c087f631a17ec6a (patch)
tree97d081d05c3574933402b9d5e8b4a08889a582fd /tools/mkimage/patches
parentfe44af36ae4d20ba541e4ec7bf52ec6918f37f4b (diff)
downloadupstream-6d4358aed0535dc87e8bf9c40c087f631a17ec6a.tar.gz
upstream-6d4358aed0535dc87e8bf9c40c087f631a17ec6a.tar.bz2
upstream-6d4358aed0535dc87e8bf9c40c087f631a17ec6a.zip
mkimage: update to 2011.12
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31171
Diffstat (limited to 'tools/mkimage/patches')
-rw-r--r--tools/mkimage/patches/020-darwin-10_7-getline-fix.patch22
-rw-r--r--tools/mkimage/patches/030-allow-to-use-different-magic.patch18
2 files changed, 9 insertions, 31 deletions
diff --git a/tools/mkimage/patches/020-darwin-10_7-getline-fix.patch b/tools/mkimage/patches/020-darwin-10_7-getline-fix.patch
deleted file mode 100644
index ff1ae807da..0000000000
--- a/tools/mkimage/patches/020-darwin-10_7-getline-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tools/os_support.h
-+++ b/tools/os_support.h
-@@ -28,7 +28,7 @@
- #include "mingw_support.h"
- #endif
-
--#ifdef __APPLE__
-+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
- #include "getline.h"
- #endif
-
---- a/tools/os_support.c
-+++ b/tools/os_support.c
-@@ -23,6 +23,7 @@
- #ifdef __MINGW32__
- #include "mingw_support.c"
- #endif
--#ifdef __APPLE__
-+
-+#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L
- #include "getline.c"
- #endif
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 31a9065f3f..73a0ac4f91 100644
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -8,7 +8,7 @@
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
};
-@@ -180,6 +181,16 @@ main (int argc, char **argv)
+@@ -186,6 +187,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 ()
+@@ -595,12 +606,13 @@ usage ()
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/mkimage.h
+++ b/tools/mkimage.h
-@@ -64,6 +64,7 @@ struct mkimage_params {
+@@ -65,6 +65,7 @@ struct mkimage_params {
int arch;
int type;
int comp;
@@ -52,12 +52,12 @@
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
-@@ -110,7 +110,7 @@ static void image_set_header (void *ptr,
+@@ -111,7 +111,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);
+- 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);