diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-02 16:25:23 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-02 16:25:23 +0000 |
| commit | 8354231fe6d67d81f291cbdf500f9204f2ecb8df (patch) | |
| tree | 9ef3cdf994114734260180213e483848ae33fb22 /tools | |
| parent | fe9fc3633fc59d41ae8741b74a0622a5fdfb55db (diff) | |
[tools] mkimage: update to 2011.12
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31171 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkimage/Makefile | 6 | ||||
| -rw-r--r-- | tools/mkimage/patches/020-darwin-10_7-getline-fix.patch | 22 | ||||
| -rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 18 |
3 files changed, 12 insertions, 34 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index 2ea1123c2..5ed82e6fa 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mkimage -PKG_VERSION:=2011.06 +PKG_VERSION:=2011.12 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=0cc5026aad02f218a9b9ac56b301c97a +PKG_MD5SUM:=7f29b9f6da44d6e46e988e7561fd1d5f PKG_CAT:=bzcat HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION) 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 ff1ae807d..000000000 --- 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 31a9065f3..73a0ac4f9 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); |