Changeset 35905


Ignore:
Timestamp:
2013-03-08T21:16:11+01:00 (5 years ago)
Author:
luka
Message:

[tools] mkimage: upgrade to version 2013.01.01

Location:
trunk/tools/mkimage
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkimage/Makefile

    r33519 r35905  
    11# 
    2 # Copyright (C) 2006-2012 OpenWrt.org 
     2# Copyright (C) 2006-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    88 
    99PKG_NAME:=mkimage 
    10 PKG_VERSION:=2012.04.01 
     10PKG_VERSION:=2013.01.01 
    1111 
    1212PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 
    1313PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot 
    14 PKG_MD5SUM:=192bb231082d9159fb6e16de3039b6b2 
     14PKG_MD5SUM:=73939f78606f89a1775c7e9acb2ca617 
    1515PKG_CAT:=bzcat 
    1616 
     
    2323        rm -f \ 
    2424                $(HOST_BUILD_DIR)/include/errno.h \ 
    25                 $(HOST_BUILD_DIR)/include/malloc.h 
     25                $(HOST_BUILD_DIR)/include/malloc.h \ 
     26                $(HOST_BUILD_DIR)/tools/.depend 
     27        touch $(HOST_BUILD_DIR)/include/config.h 
    2628endef 
    2729 
    2830define Host/Compile 
    29         rm -f $(HOST_BUILD_DIR)/tools/.depend 
    30         touch $(HOST_BUILD_DIR)/include/config.h 
    3131        $(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="$(HOST_STATIC_LINKING)" tools 
    3232endef 
  • trunk/tools/mkimage/patches/010-freebsd-ulong-fix.patch

    r24887 r35905  
    11--- a/include/image.h 
    22+++ b/include/image.h 
    3 @@ -50,6 +50,10 @@ 
     3@@ -51,6 +51,10 @@ 
    44  
    55 #endif /* USE_HOSTCC */ 
  • trunk/tools/mkimage/patches/020-openbsd_fixes.patch

    r35900 r35905  
    1 diff -Nur u-boot-2012.04.01.orig/tools/mkimage.c u-boot-2012.04.01/tools/mkimage.c 
    2 --- u-boot-2012.04.01.orig/tools/mkimage.c      Wed Apr 25 15:22:50 2012 
    3 +++ u-boot-2012.04.01/tools/mkimage.c   Wed Mar  6 17:09:29 2013 
    4 @@ -449,6 +449,7 @@ 
     1--- a/tools/mkimage.c 
     2+++ b/tools/mkimage.c 
     3@@ -464,6 +464,7 @@ 
    54 #if defined(_POSIX_SYNCHRONIZED_IO) && \ 
    65    !defined(__sun__) && \ 
     
    109        (void) fdatasync (ifd); 
    1110 #else 
    12 @@ -492,6 +493,7 @@ 
     11@@ -507,6 +508,7 @@ 
    1312 #if defined(_POSIX_SYNCHRONIZED_IO) && \ 
    1413    !defined(__sun__) && \ 
  • trunk/tools/mkimage/patches/030-allow-to-use-different-magic.patch

    r32143 r35905  
    11--- a/tools/mkimage.c 
    22+++ b/tools/mkimage.c 
    3 @@ -37,6 +37,7 @@ struct mkimage_params params = { 
     3@@ -37,6 +37,7 @@ 
    44        .arch = IH_ARCH_PPC, 
    55        .type = IH_TYPE_KERNEL, 
     
    88        .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, 
    99        .imagename = "", 
    10  }; 
    11 @@ -186,6 +187,16 @@ main (int argc, char **argv) 
     10        .imagename2 = "", 
     11@@ -189,6 +190,16 @@ 
    1212                                        genimg_get_comp_id (*++argv)) < 0) 
    1313                                        usage (); 
     
    2626                                if (--argc <= 0) 
    2727                                        usage (); 
    28 @@ -596,12 +607,13 @@ usage () 
     28@@ -613,12 +624,13 @@ 
    2929        fprintf (stderr, "Usage: %s -l image\n" 
    3030                         "          -l ==> list image header information\n", 
     
    4343--- a/tools/mkimage.h 
    4444+++ b/tools/mkimage.h 
    45 @@ -65,6 +65,7 @@ struct mkimage_params { 
     45@@ -65,6 +65,7 @@ 
    4646        int arch; 
    4747        int type; 
     
    5353--- a/tools/default_image.c 
    5454+++ b/tools/default_image.c 
    55 @@ -111,7 +111,7 @@ static void image_set_header(void *ptr, 
     55@@ -111,7 +111,7 @@ 
    5656                        sbuf->st_size - sizeof(image_header_t)); 
    5757  
  • trunk/tools/mkimage/patches/040-include_order.patch

    r33519 r35905  
    11--- a/tools/Makefile 
    22+++ b/tools/Makefile 
    3 @@ -159,9 +159,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_ 
     3@@ -162,9 +162,9 @@ 
    44 # Use native tools and options 
    55 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps 
Note: See TracChangeset for help on using the changeset viewer.