KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kexec-tools update to version 2.0.0; add support for armeb.

Browse source 
SVN-Revision: 14121
This commit is contained in:
Jose Vasconcellos 2009-01-20 19:46:45 +00:00
parent ce5b7766e6
commit af64ea8f8c
5 changed files with 27 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kexec-tools/Makefile
View file

@ -9,19 +9,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=kexec-tools
PKG_VERSION:=testing-20080324
PKG_VERSION:=2.0.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
PKG_MD5SUM:=9f442520b0e238ae5beb4ebea0867377
PKG_MD5SUM:=d9f2ecd3c3307905f24130a25816e6cc
include $(INCLUDE_DIR)/package.mk
define Package/kexec-tools
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:=@i386||@TARGET_ps3||@mipsel||@mips +zlib
DEPENDS:=@armeb||@i386||@TARGET_ps3||@mipsel||@mips +zlib
TITLE:=Kernel boots kernel
URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
MENU:=1

39
package/kexec-tools/patches/0001-Use-separate-CPPFLAGS-and-LDFLAGS-for-purgatory.patch
View file

@ -1,39 +0,0 @@
From ee274ca1ae88bef43da3090d0e1e9155e3b493ad Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 19 Mar 2008 17:06:24 +1100
Subject: [PATCH] Use separate CPPFLAGS and LDFLAGS for purgatory
Currently, CPPFLAGS and LDFLAGS can 'leak' into the purgatory build
from the main kexec/kexec object. Because of this, the purgatory
is build with -lz, but we may not have a zlib present for the
architecture of the purgatory object.
This change uses fresh CPPFLAGS and LDFLAGS for the purgatory object.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
purgatory/Makefile | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/purgatory/Makefile b/purgatory/Makefile
index 6c747b1..ac58719 100644
--- a/purgatory/Makefile
+++ b/purgatory/Makefile
@@ -49,11 +49,12 @@ $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
-Os -fno-builtin -ffreestanding \
-fno-zero-initialized-in-bss
-$(PURGATORY): CPPFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+$(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
-I$(srcdir)/purgatory/include \
-I$(srcdir)/purgatory/arch/$(ARCH)/include \
+ -I$(srcdir)/util_lib/include \
-I$(shell $(CC) -print-file-name=include)
-$(PURGATORY): LDFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
+$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
-e purgatory_start -r
--
1.5.0.rc4.g85b1

24
package/kexec-tools/patches/0001-arm.patch Normal file
View file

@ -0,0 +1,24 @@
diff -ruN kexec-tools/kexec/arch/arm/kexec-arm.c kexec-tools-mod/kexec/arch/arm/kexec-arm.c
--- kexec-tools/kexec/arch/arm/kexec-arm.c 2008-07-14 05:28:19.000000000 -0600
+++ kexec-tools-mod/kexec/arch/arm/kexec-arm.c 2008-12-04 17:35:46.913936145 -0600
@@ -110,6 +110,8 @@
const struct arch_map_entry arches[] = {
{ "arm", KEXEC_ARCH_ARM },
+ { "armv5teb", KEXEC_ARCH_ARM },
+ { "armv6l", KEXEC_ARCH_ARM },
{ 0 },
};
diff -ruN kexec-tools/kexec/arch/arm/kexec-zImage-arm.c kexec-tools-mod/kexec/arch/arm/kexec-zImage-arm.c
--- kexec-tools/kexec/arch/arm/kexec-zImage-arm.c 2008-07-14 05:28:19.000000000 -0600
+++ kexec-tools-mod/kexec/arch/arm/kexec-zImage-arm.c 2008-12-04 17:03:41.512536642 -0600
@@ -11,7 +11,7 @@
#include <stdint.h>
#include <getopt.h>
#include <arch/options.h>
-#include <asm/page.h>
+#include <unistd.h>
#include "../../kexec.h"
#define COMMAND_LINE_SIZE 1024

27
package/kexec-tools/patches/0002-Use-separate-LDFLAGS-for-bin-to-hex.patch
View file

@ -1,27 +0,0 @@
From 072159b1f4aca88f7d99259fe2bd14a6653ede52 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 19 Mar 2008 17:20:39 +1100
Subject: [PATCH] Use separate LDFLAGS for bin-to-hex
We don't need the general -L and -l flags for the bin-to-hex util.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
util/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/util/Makefile b/util/Makefile
index 89732a1..11d82fd 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -6,6 +6,7 @@ $(BIN_TO_HEX): $(srcdir)/util/bin-to-hex.c
$(BIN_TO_HEX): CC=$(BUILD_CC)
$(BIN_TO_HEX): CFLAGS=$(BUILD_CFLAGS)
+$(BIN_TO_HEX): LDFLAGS=
dist += util/Makefile util/bin-to-hex.c
clean += util/bin-to-hex.o $(BIN_TO_HEX)
--
1.5.0.rc4.g85b1

132
package/kexec-tools/patches/0003-Give-installed-files-user-writable-permission.patch
View file

@ -1,132 +0,0 @@
From 0c5e14cdad161e510497df58eb206d3b8f8eba47 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 19 Mar 2008 17:25:37 +1100
Subject: [PATCH] Give installed files user-writable permission
Currently we install all files as 0555 or 0444. This means that we
can't easily do any post-install modification to the files (eg.
stripping, as is done with OpenWRT).
This change installs the files with the user write bit set
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
Makefile.in | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 306d6e9..037f9a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -237,87 +237,87 @@ install: $(TARGETS)
for file in $(TARGETS) ; do \
if test `$(DIRNAME) $$file` = "$(SBINDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(sbindir)/; \
- $(INSTALL) -m 555 $$file $(DESTDIR)/$(sbindir)/; \
+ $(INSTALL) -m 755 $$file $(DESTDIR)/$(sbindir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(BINDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(bindir)/; \
- $(INSTALL) -m 555 $$file $(DESTDIR)/$(bindir)/; \
+ $(INSTALL) -m 755 $$file $(DESTDIR)/$(bindir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(LIBEXECDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(libexecdir)/; \
- $(INSTALL) -m 555 $$file $(DESTDIR)/$(libexecdir)/; \
+ $(INSTALL) -m 755 $$file $(DESTDIR)/$(libexecdir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(DATADIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(datadir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(datadir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(datadir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(SYSCONFDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(sysconfdir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(sysconfdir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(sysconfdir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(SHAREDSTATEDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(sharedstatedir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(sharedstatedir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(sharedstatedir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(LOCALSTATEDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(localstatedir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(localstatedir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(localstatedir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(LIBDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(libdir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(libdir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(libdir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(INFODIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(infodir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(infodir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(infodir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN1DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man1; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man1; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN2DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man2; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man2; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man2; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN3DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man3/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man3/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man3/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN4DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man4/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man4/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man4/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN5DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man5/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man5/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man5/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN6DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man6/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man6/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man6/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN7DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man7/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man7/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man7/; \
fi; \
if test `$(DIRNAME) $$file` = "$(MAN8DIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(mandir)/man8/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(mandir)/man8/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(mandir)/man8/; \
fi; \
if test `$(DIRNAME) $$file` = "$(INCLUDEDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(includedir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(includedir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(includedir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(PKGDATADIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(pkgdatadir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkgdatadir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(pkgdatadir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(PKGLIBDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(pkglibdir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkglibdir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(pkglibdir)/; \
fi; \
if test `$(DIRNAME) $$file` = "$(PKGINCLUDEDIR)" ; then \
$(MKDIR) -p $(DESTDIR)/$(pkgincludedir)/; \
- $(INSTALL) -m 444 $$file $(DESTDIR)/$(pkgincludedir)/; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)/$(pkgincludedir)/; \
fi; \
done
--
1.5.0.rc4.g85b1