diff --git a/kexec-help.diff b/kexec-help.diff deleted file mode 100644 index 9a2e8be..0000000 --- a/kexec-help.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- kexec/kexec.c -+++ kexec/kexec.c -@@ -733,22 +733,22 @@ - "\n" - " -h, --help Print this help.\n" - " -v, --version Print the version of kexec.\n" -- " -f, --force Force an immediate kexec," -+ " -f, --force Force an immediate kexec,\n" - " don't call shutdown.\n" - " -x, --no-ifdown Don't bring down network interfaces.\n" -- " (if used, must be last option" -+ " (if used, must be last option\n" - " specified)\n" -- " -l, --load Load the new kernel into the" -+ " -l, --load Load the new kernel into the\n" - " current kernel.\n" - " -p, --load-panic Load the new kernel for use on panic.\n" - " -u, --unload Unload the current kexec target kernel.\n" -- " If capture kernel is being unloaded" -+ " If capture kernel is being unloaded\n" - " specify -p with -u.\n" - " -e, --exec Execute a currently loaded kernel.\n" - " -t, --type=TYPE Specify the new kernel is of this type.\n" -- " --mem-min= Specify the lowest memory address to" -+ " --mem-min= Specify the lowest memory address to\n" - " load code into.\n" -- " --mem-max= Specify the highest memory address to" -+ " --mem-max= Specify the highest memory address to\n" - " load code into.\n" - "\n" - "Supported kernel file types and options: \n"); diff --git a/kexec-tools-add-alignment-parameter.diff b/kexec-tools-add-alignment-parameter.diff deleted file mode 100644 index 626a0d1..0000000 --- a/kexec-tools-add-alignment-parameter.diff +++ /dev/null @@ -1,158 +0,0 @@ -Subject: kexec-tools: Add alignment parameter to crash_create_XXX_headers -From: Simon Horman -To: fastboot@lists.osdl.org, Linux-IA64 -Cc: Cc: Bernhard Walle , - Magnus Damm , - Zou, Nanhai - -crash_create_XXX_headers assumes that all arhitectures need an alignment of -1024bytes. But on ia64 at least this is not true. This patch adds an -alignment parameter to crash_create_XXX_headers, and calls passes -a value of 1024 for all architectures except ia64, where EFI_PAGE_SIZE (4096) -is passed. - -If there are problems with alignment on other architectures hopefully -this facility will work for them too. - -Cc: Bernhard Walle -Cc: Magnus Damm -Cc: Zou, Nanhai -Signed-off-by: Simon Horman - - - kexec/arch/i386/crashdump-x86.c | 4 ++-- - kexec/arch/ia64/crashdump-ia64.c | 5 +++-- - kexec/arch/ppc64/crashdump-ppc64.c | 4 ++-- - kexec/arch/x86_64/crashdump-x86_64.c | 2 +- - kexec/crashdump-elf.c | 11 ++--------- - kexec/crashdump.h | 6 ++++-- - 6 files changed, 14 insertions(+), 18 deletions(-) - -Index: kexec-tools-bw/kexec/arch/i386/crashdump-x86.c -=================================================================== ---- kexec-tools-bw.orig/kexec/arch/i386/crashdump-x86.c 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/arch/i386/crashdump-x86.c 2007-02-13 17:39:26.000000000 +0900 -@@ -524,13 +524,13 @@ - if (arch_options.core_header_type == CORE_TYPE_ELF64) { - if (crash_create_elf64_headers(info, &elf_info64, - crash_memory_range, nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, 1024) < 0) - return -1; - } - else { - if (crash_create_elf32_headers(info, &elf_info32, - crash_memory_range, nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, 1024) < 0) - return -1; - } - -Index: kexec-tools-bw/kexec/arch/ia64/crashdump-ia64.c -=================================================================== ---- kexec-tools-bw.orig/kexec/arch/ia64/crashdump-ia64.c 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/arch/ia64/crashdump-ia64.c 2007-02-13 18:09:44.000000000 +0900 -@@ -232,13 +232,14 @@ - if (crash_create_elf64_headers(info, &elf_info, - crash_memory_range, - nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, -+ 4096) < 0) - return -1; - - elfcorehdr = add_buffer(info, tmp, sz, sz, EFI_PAGE_SIZE, min_base, - max_addr, -1); - loaded_segments[loaded_segments_num].start = elfcorehdr; -- loaded_segments[loaded_segments_num].end = elfcorehdr + size; -+ loaded_segments[loaded_segments_num].end = elfcorehdr + sz; - loaded_segments[loaded_segments_num].reserved = 1; - loaded_segments_num++; - cmdline_add_elfcorehdr(cmdline, elfcorehdr); -Index: kexec-tools-bw/kexec/arch/ppc64/crashdump-ppc64.c -=================================================================== ---- kexec-tools-bw.orig/kexec/arch/ppc64/crashdump-ppc64.c 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/arch/ppc64/crashdump-ppc64.c 2007-02-13 17:39:26.000000000 +0900 -@@ -344,13 +344,13 @@ - if (arch_options.core_header_type == CORE_TYPE_ELF64) { - if (crash_create_elf64_headers(info, &elf_info64, - crash_memory_range, nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, 1024) < 0) - return -1; - } - else { - if (crash_create_elf32_headers(info, &elf_info32, - crash_memory_range, nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, 1024) < 0) - return -1; - } - -Index: kexec-tools-bw/kexec/arch/x86_64/crashdump-x86_64.c -=================================================================== ---- kexec-tools-bw.orig/kexec/arch/x86_64/crashdump-x86_64.c 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/arch/x86_64/crashdump-x86_64.c 2007-02-13 17:39:26.000000000 +0900 -@@ -607,7 +607,7 @@ - /* Create elf header segment and store crash image data. */ - if (crash_create_elf64_headers(info, &elf_info, - crash_memory_range, nr_ranges, -- &tmp, &sz) < 0) -+ &tmp, &sz, 1024) < 0) - return -1; - - /* Hack: With some ld versions (GNU ld version 2.14.90.0.4 20030523), -Index: kexec-tools-bw/kexec/crashdump-elf.c -=================================================================== ---- kexec-tools-bw.orig/kexec/crashdump-elf.c 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/crashdump-elf.c 2007-02-13 17:39:26.000000000 +0900 -@@ -27,11 +27,11 @@ - int FUNC(struct kexec_info *info, - struct crash_elf_info *elf_info, - struct memory_range *range, int ranges, -- void **buf, unsigned long *size) -+ void **buf, unsigned long *size, unsigned long align) - { - EHDR *elf; - PHDR *phdr; -- int i, sz, align; -+ int i, sz; - char *bufp; - long int nr_cpus = 0; - uint64_t notes_addr, notes_len; -@@ -72,13 +72,6 @@ - sz += sizeof(PHDR); - } - -- /* -- * The kernel command line option memmap= requires 1k granularity, -- * therefore we align the size to 1024 here. -- */ -- -- align = 1024; -- - sz += align - 1; - sz &= ~(align - 1); - -Index: kexec-tools-bw/kexec/crashdump.h -=================================================================== ---- kexec-tools-bw.orig/kexec/crashdump.h 2007-02-13 17:39:18.000000000 +0900 -+++ kexec-tools-bw/kexec/crashdump.h 2007-02-13 17:39:26.000000000 +0900 -@@ -27,12 +27,14 @@ - int crash_create_elf32_headers(struct kexec_info *info, - struct crash_elf_info *elf_info, - struct memory_range *range, int ranges, -- void **buf, unsigned long *size); -+ void **buf, unsigned long *size, -+ unsigned long align); - - int crash_create_elf64_headers(struct kexec_info *info, - struct crash_elf_info *elf_info, - struct memory_range *range, int ranges, -- void **buf, unsigned long *size); -+ void **buf, unsigned long *size, -+ unsigned long align); - - int xen_present(void); - int xen_get_nr_phys_cpus(void); - diff --git a/kexec-tools-testing-20070205.tar.bz2 b/kexec-tools-testing-20070205.tar.bz2 deleted file mode 100644 index 3e7b2f5..0000000 --- a/kexec-tools-testing-20070205.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a6db77bc82e051ee0a77d5152124402d279f41e0f4bb98cdd5c54ee7d912e6b -size 179664 diff --git a/kexec-tools-testing-20070319-rc.tar.bz2 b/kexec-tools-testing-20070319-rc.tar.bz2 new file mode 100644 index 0000000..69d3080 --- /dev/null +++ b/kexec-tools-testing-20070319-rc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ba1eeeda36d06864aa83b24083e82fa6c8fc350d2789af91dd7455b8c164ee0 +size 210304 diff --git a/kexec-tools.changes b/kexec-tools.changes index 9b27171..bef5bb5 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 19 10:58:10 CET 2007 - bwalle@suse.de + +- upgrade to latest snapshot + o [IA64] Use EFI_LOADER_DATA for ELF core header (-> needed + because kernel was updated to 2.6.21 on STABLE) + o include latest fixes + ------------------------------------------------------------------- Wed Mar 14 18:45:27 CET 2007 - tiwai@suse.de diff --git a/kexec-tools.spec b/kexec-tools.spec index 2d633f5..522e528 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -12,14 +12,14 @@ Name: kexec-tools %define helperversion 0.1.1 -%define package_version testing-20070205 +%define package_version testing-20070319-rc License: GNU General Public License (GPL) Group: System/Kernel Requires: %insserv_prereq %fillup_prereq Autoreqprov: on Summary: Tools for fast kernel loading Version: 1.101 -Release: 84 +Release: 85 Source: %{name}-%{package_version}.tar.bz2 Source1: kdump Source2: sysconfig.kdump @@ -28,8 +28,6 @@ Source4: gdb-kdump Source5: README.SUSE Source6: kdump-helper-%{helperversion}.tar.bz2 Patch1: kexec-longer-cmdline.diff -Patch2: kexec-help.diff -Patch3: kexec-tools-add-alignment-parameter.diff URL: http://www.xmission.com/~ebiederm/files/kexec/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libelf @@ -52,10 +50,8 @@ Authors: Tim Deegan %prep -%setup -q -n kexec-tools -b 6 +%setup -q -n kexec-tools-%{package_version} -b 6 %patch1 -p1 -%patch2 -%patch3 -p1 %{?suse_update_config -f} cp %{SOURCE5} . @@ -128,6 +124,11 @@ true # ignore errors %{_sbindir}/kdump-helper %changelog +* Mon Mar 19 2007 - bwalle@suse.de +- upgrade to latest snapshot + o [IA64] Use EFI_LOADER_DATA for ELF core header (-> needed + because kernel was updated to 2.6.21 on STABLE) + o include latest fixes * Wed Mar 14 2007 - tiwai@suse.de - add detailed description about dump triggering methods to README.SUSE (#250134)