projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e259eca
)
mkimage: upgrade to version 2013.01.01
author
Luka Perkov
<luka@openwrt.org>
Fri, 8 Mar 2013 20:16:11 +0000
(20:16 +0000)
committer
Luka Perkov
<luka@openwrt.org>
Fri, 8 Mar 2013 20:16:11 +0000
(20:16 +0000)
SVN-Revision: 35905
tools/mkimage/Makefile
patch
|
blob
|
history
tools/mkimage/patches/010-freebsd-ulong-fix.patch
patch
|
blob
|
history
tools/mkimage/patches/020-openbsd_fixes.patch
patch
|
blob
|
history
tools/mkimage/patches/030-allow-to-use-different-magic.patch
patch
|
blob
|
history
tools/mkimage/patches/040-include_order.patch
patch
|
blob
|
history
diff --git
a/tools/mkimage/Makefile
b/tools/mkimage/Makefile
index 149aaa6f12aa3bd22f046f4e9d3a9e5a5c2e3ddd..7bd7316537e2b8d03cd2397f046417a18eff160f 100644
(file)
--- a/
tools/mkimage/Makefile
+++ b/
tools/mkimage/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-201
2
OpenWrt.org
+# Copyright (C) 2006-201
3
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# 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
include $(TOPDIR)/rules.mk
PKG_NAME:=mkimage
-PKG_VERSION:=201
2.04
.01
+PKG_VERSION:=201
3.01
.01
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=
192bb231082d9159fb6e16de3039b6b2
+PKG_MD5SUM:=
73939f78606f89a1775c7e9acb2ca617
PKG_CAT:=bzcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
PKG_CAT:=bzcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
@@
-22,12
+22,12
@@
define Host/Prepare
$(Host/Prepare/Default)
rm -f \
$(HOST_BUILD_DIR)/include/errno.h \
$(Host/Prepare/Default)
rm -f \
$(HOST_BUILD_DIR)/include/errno.h \
- $(HOST_BUILD_DIR)/include/malloc.h
+ $(HOST_BUILD_DIR)/include/malloc.h \
+ $(HOST_BUILD_DIR)/tools/.depend
+ touch $(HOST_BUILD_DIR)/include/config.h
endef
define Host/Compile
endef
define Host/Compile
- rm -f $(HOST_BUILD_DIR)/tools/.depend
- touch $(HOST_BUILD_DIR)/include/config.h
$(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="$(HOST_STATIC_LINKING)" tools
endef
$(MAKE) -C $(HOST_BUILD_DIR) BUILD_DIR= BIN_FILES-y="mkimage" HOSTLDFLAGS="$(HOST_STATIC_LINKING)" tools
endef
diff --git
a/tools/mkimage/patches/010-freebsd-ulong-fix.patch
b/tools/mkimage/patches/010-freebsd-ulong-fix.patch
index 32fa07453390cfa95575e62ec0e68317c9225916..737291466c57ecf9c15e612fda380b3a8094c65b 100644
(file)
--- a/
tools/mkimage/patches/010-freebsd-ulong-fix.patch
+++ b/
tools/mkimage/patches/010-freebsd-ulong-fix.patch
@@
-1,6
+1,6
@@
--- a/include/image.h
+++ b/include/image.h
--- a/include/image.h
+++ b/include/image.h
-@@ -5
0,6 +50
,10 @@
+@@ -5
1,6 +51
,10 @@
#endif /* USE_HOSTCC */
#endif /* USE_HOSTCC */
diff --git
a/tools/mkimage/patches/020-openbsd_fixes.patch
b/tools/mkimage/patches/020-openbsd_fixes.patch
index 31ee38f66e02364c1fb292a033135bcf1b1ce0a7..17232360d2c2594f89bd2da453041b0f7f616560 100644
(file)
--- a/
tools/mkimage/patches/020-openbsd_fixes.patch
+++ b/
tools/mkimage/patches/020-openbsd_fixes.patch
@@
-1,7
+1,6
@@
-diff -Nur u-boot-2012.04.01.orig/tools/mkimage.c u-boot-2012.04.01/tools/mkimage.c
---- u-boot-2012.04.01.orig/tools/mkimage.c Wed Apr 25 15:22:50 2012
-+++ u-boot-2012.04.01/tools/mkimage.c Wed Mar 6 17:09:29 2013
-@@ -449,6 +449,7 @@
+--- a/tools/mkimage.c
++++ b/tools/mkimage.c
+@@ -464,6 +464,7 @@
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
@@
-9,7
+8,7
@@
diff -Nur u-boot-2012.04.01.orig/tools/mkimage.c u-boot-2012.04.01/tools/mkimage
!defined(__APPLE__)
(void) fdatasync (ifd);
#else
!defined(__APPLE__)
(void) fdatasync (ifd);
#else
-@@ -
492,6 +493
,7 @@
+@@ -
507,6 +508
,7 @@
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
#if defined(_POSIX_SYNCHRONIZED_IO) && \
!defined(__sun__) && \
!defined(__FreeBSD__) && \
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 23f39ad22ca340b25484b4729247bd7c0da8a94d..305b8342b3d0401465bf5053bca3e9cc9f6b3dc8 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
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
-@@ -37,6 +37,7 @@
struct mkimage_params params = {
+@@ -37,6 +37,7 @@
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
+ .magic = IH_MAGIC,
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
+ .magic = IH_MAGIC,
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
- };
-@@ -18
6,6 +187,16 @@ main (int argc, char **argv)
+ .imagename2 = "",
+@@ -18
9,6 +190,16 @@
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
genimg_get_comp_id (*++argv)) < 0)
usage ();
goto NXTARG;
@@
-25,7
+25,7
@@
case 'D':
if (--argc <= 0)
usage ();
case 'D':
if (--argc <= 0)
usage ();
-@@ -
596,12 +607,13 @@ usage ()
+@@ -
613,12 +624,13 @@
fprintf (stderr, "Usage: %s -l image\n"
" -l ==> list image header information\n",
params.cmdname);
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
" -n ==> set image name to 'name'\n"
--- a/tools/mkimage.h
+++ b/tools/mkimage.h
-@@ -65,6 +65,7 @@
struct mkimage_params {
+@@ -65,6 +65,7 @@
int arch;
int type;
int comp;
int arch;
int type;
int comp;
@@
-52,7
+52,7
@@
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
unsigned int ep;
--- a/tools/default_image.c
+++ b/tools/default_image.c
-@@ -111,7 +111,7 @@
static void image_set_header(void *ptr,
+@@ -111,7 +111,7 @@
sbuf->st_size - sizeof(image_header_t));
/* Build new header */
sbuf->st_size - sizeof(image_header_t));
/* Build new header */
diff --git
a/tools/mkimage/patches/040-include_order.patch
b/tools/mkimage/patches/040-include_order.patch
index 5a9d15eb765442ddd38905efbd5c6165ad2cb743..f94e91d700006fb2486196a73eb90bedfc6cb285 100644
(file)
--- a/
tools/mkimage/patches/040-include_order.patch
+++ b/
tools/mkimage/patches/040-include_order.patch
@@
-1,6
+1,6
@@
--- a/tools/Makefile
+++ b/tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -1
59,9 +159,9 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_
+@@ -1
62,9 +162,9 @@
# Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
#
# Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
#