rpms/kexec-tools/devel kexec-tools-1.101-kdump.patch, 1.2, 1.3 kexec-tools.spec, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 2 10:13:31 UTC 2006
- Previous message (by thread): rpms/kde-i18n/devel kde-i18n.spec,1.52,1.53
- Next message (by thread): rpms/kdenetwork/FC-4 .cvsignore, 1.31, 1.32 kdenetwork.spec, 1.56, 1.57 sources, 1.35, 1.36 admin-visibility.patch, 1.3, NONE kdenetwork-3.3.0-ksirc.patch, 1.1, NONE kdenetwork-3.4.0-xmms.patch, 1.1, NONE post-3.4.1-kdenetwork-libgadu.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tgraf
Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7251
Modified Files:
kexec-tools-1.101-kdump.patch kexec-tools.spec
Log Message:
- New kdump patch to support s390 arch + various fixes
- Include kdump in x86_64 builds
kexec-tools-1.101-kdump.patch:
configure | 14
configure.ac | 14
kexec/Makefile | 1
kexec/arch/i386/Makefile | 1
kexec/arch/i386/crashdump-x86.c | 724 +++++++++++++++++++++++++++++
kexec/arch/i386/crashdump-x86.h | 21
kexec/arch/i386/include/arch/options.h | 6
kexec/arch/i386/kexec-bzImage.c | 2
kexec/arch/i386/kexec-elf-x86.c | 48 +
kexec/arch/i386/kexec-multiboot-x86.c | 3
kexec/arch/i386/kexec-x86.c | 52 +-
kexec/arch/i386/kexec-x86.h | 13
kexec/arch/i386/x86-linux-setup.c | 7
kexec/arch/i386/x86-linux-setup.h | 3
kexec/arch/ia64/kexec-ia64.c | 12
kexec/arch/ppc/kexec-ppc.c | 8
kexec/arch/ppc64/Makefile | 6
kexec/arch/ppc64/crashdump-ppc64.c | 511 ++++++++++++++++++++
kexec/arch/ppc64/crashdump-ppc64.h | 33 +
kexec/arch/ppc64/fs2dt.c | 435 +++++++++++++++++
kexec/arch/ppc64/include/arch/options.h | 2
kexec/arch/ppc64/kexec-elf-ppc64.c | 290 ++++++++++-
kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 43 +
kexec/arch/ppc64/kexec-ppc64.c | 640 +++++++++++++++++++++++++
kexec/arch/ppc64/kexec-ppc64.h | 37 +
kexec/arch/ppc64/kexec-zImage-ppc64.c | 3
kexec/arch/s390/Makefile | 6
kexec/arch/s390/include/arch/options.h | 11
kexec/arch/s390/kexec-elf-rel-s390.c | 23
kexec/arch/s390/kexec-image.c | 137 +++++
kexec/arch/s390/kexec-s390.c | 104 ++++
kexec/arch/s390/kexec-s390.h | 25 +
kexec/arch/x86_64/Makefile | 1
kexec/arch/x86_64/crashdump-x86_64.c | 770 +++++++++++++++++++++++++++++++
kexec/arch/x86_64/crashdump-x86_64.h | 24
kexec/arch/x86_64/include/arch/options.h | 6
kexec/arch/x86_64/kexec-elf-x86_64.c | 37 +
kexec/arch/x86_64/kexec-x86_64.c | 45 +
kexec/crashdump.c | 65 ++
kexec/crashdump.h | 9
kexec/kexec-elf-rel.c | 39 +
kexec/kexec-elf.c | 88 +--
kexec/kexec-syscall.h | 9
kexec/kexec.c | 24
kexec/kexec.h | 10
purgatory/Makefile | 9
purgatory/arch/i386/Makefile | 1
purgatory/arch/i386/crashdump_backup.c | 46 +
purgatory/arch/i386/purgatory-x86.c | 7
purgatory/arch/i386/purgatory-x86.h | 1
purgatory/arch/ia64/purgatory-ia64.c | 6
purgatory/arch/ppc/purgatory-ppc.c | 6
purgatory/arch/ppc64/Makefile | 7
purgatory/arch/ppc64/console-ppc64.c | 27 +
purgatory/arch/ppc64/crashdump_backup.c | 41 +
purgatory/arch/ppc64/purgatory-ppc64.c | 41 +
purgatory/arch/ppc64/purgatory-ppc64.h | 6
purgatory/arch/ppc64/v2wrap.S | 128 +++++
purgatory/arch/s390/Makefile | 7
purgatory/arch/s390/include/limits.h | 54 ++
purgatory/arch/s390/include/stdint.h | 24
purgatory/arch/x86_64/Makefile | 1
purgatory/arch/x86_64/purgatory-x86_64.c | 7
purgatory/include/purgatory.h | 1
purgatory/purgatory.c | 1
65 files changed, 4609 insertions(+), 174 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 kexec-tools-1.101-kdump.patch
Index: kexec-tools-1.101-kdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-kdump.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kexec-tools-1.101-kdump.patch 30 Jan 2006 20:02:21 -0000 1.2
+++ kexec-tools-1.101-kdump.patch 2 Feb 2006 10:13:27 -0000 1.3
@@ -1,6 +1,6 @@
diff -urNp -X dontdiff kexec-tools-1.101/configure kexec-tools-1.101-kdump/configure
--- kexec-tools-1.101/configure 2005-02-16 18:07:44.000000000 +0530
-+++ kexec-tools-1.101-kdump/configure 2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/configure 2006-02-01 14:28:15.497259392 +0530
@@ -1384,12 +1384,18 @@ case $host_cpu in
powerpc )
host_cpu="ppc"
@@ -21,20 +21,65 @@
;;
* )
{ { echo "$as_me:$LINENO: error: unsupported architecture $host_cpu" >&5
-@@ -1421,6 +1427,10 @@ if test "${with_gamecube+set}" = set; th
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1"
- fi;
+@@ -1406,6 +1412,11 @@ if test "${host_alias}" ; then
+ fi
+ EXTRA_CFLAGS=""
+# Check whether ppc64. Add -m64 for building 64-bit binary
+if test "$ARCH" = ppc64; then
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
+fi;
++
+ # Check whether --with-objdir or --without-objdir was given.
+ if test "${with_objdir+set}" = set; then
+ withval="$with_objdir"
+@@ -1421,7 +1432,6 @@ if test "${with_gamecube+set}" = set; th
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1"
+ fi;
+-
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
+ withval="$with_zlib"
+diff -urNp -X dontdiff kexec-tools-1.101/configure.ac kexec-tools-1.101-kdump/configure.ac
+--- kexec-tools-1.101/configure.ac 2005-01-09 07:06:57.000000000 +0530
++++ kexec-tools-1.101-kdump/configure.ac 2006-02-01 14:28:15.498259240 +0530
+@@ -25,12 +25,18 @@ case $host_cpu in
+ powerpc )
+ host_cpu="ppc"
+ ;;
++ powerpc64 )
++ host_cpu="ppc64"
++ ;;
++ s390x )
++ host_cpu="s390"
++ ;;
+ * )
+ host_cpu="$host_cpu"
+ ;;
+ esac
+ case $host_cpu in
+- i386|ppc|x86_64|alpha|ppc64|ia64)
++ i386|ppc|x86_64|alpha|ppc64|ia64|s390)
+ ;;
+ * )
+ AC_MSG_ERROR([ unsupported architecture $host_cpu])
+@@ -45,6 +51,12 @@ if test "${host_alias}" ; then
+ OBJDIR="$OBJDIR-${host_alias}"
+ fi
+ EXTRA_CFLAGS=""
++
++# Check whether ppc64. Add -m64 for building 64-bit binary
++if test "$ARCH" = ppc64; then
++ EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
++fi;
++
+ AC_ARG_WITH([objdir], AC_HELP_STRING([--with-objdir=<dir>],[select directory for object files]),
+ [ OBJDIR="$withval" ], [ OBJDIR="$OBJDIR" ])
+
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c
--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c 2005-12-15 16:51:43.720392560 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c 2006-01-19 18:19:07.000000000 +0530
@@ -0,0 +1,724 @@
+/*
+ * kexec: Linux boots Linux
@@ -762,7 +807,7 @@
+}
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.h kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h
--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.h 1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h 2005-12-14 15:57:17.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h 2006-01-19 11:41:30.000000000 +0530
@@ -0,0 +1,21 @@
+#ifndef CRASHDUMP_X86_H
+#define CRASHDUMP_X86_H
@@ -787,7 +832,7 @@
+#endif /* CRASHDUMP_X86_H */
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/include/arch/options.h kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h
--- kexec-tools-1.101/kexec/arch/i386/include/arch/options.h 2004-12-22 02:23:37.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h 2005-12-14 16:00:38.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h 2006-01-19 11:41:36.000000000 +0530
@@ -6,7 +6,9 @@
#define OPT_SERIAL_BAUD (OPT_MAX+2)
#define OPT_CONSOLE_VGA (OPT_MAX+3)
@@ -810,7 +855,7 @@
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c
--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2005-01-13 19:02:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c 2006-01-19 11:41:27.000000000 +0530
@@ -214,7 +214,7 @@ int do_bzImage_load(struct kexec_info *i
/* Fill in the information BIOS calls would normally provide. */
@@ -822,7 +867,7 @@
return 0;
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c
--- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2005-01-13 19:29:19.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c 2005-12-14 15:57:18.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c 2006-01-19 11:41:32.000000000 +0530
@@ -32,10 +32,12 @@
#include <elf.h>
#include <x86/x86-linux.h>
@@ -931,7 +976,7 @@
elf_rel_get_symbol(&info->rhdr, "entry32_regs", ®s, sizeof(regs));
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c
--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2005-01-25 01:28:04.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c 2006-01-19 11:41:27.000000000 +0530
@@ -246,7 +246,8 @@ int multiboot_x86_load(int argc, char **
mbi->boot_loader_name = sizeof(*mbi) + command_line_len;
@@ -944,7 +989,7 @@
}
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c
--- kexec-tools-1.101/kexec/arch/i386/kexec-x86.c 2005-02-06 04:54:35.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c 2005-12-15 11:55:22.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c 2006-01-19 18:19:07.000000000 +0530
@@ -30,14 +30,14 @@
#include "../../kexec-elf.h"
#include "../../kexec-syscall.h"
@@ -1069,7 +1114,7 @@
}
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-x86.h kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h
--- kexec-tools-1.101/kexec/arch/i386/kexec-x86.h 2005-02-06 04:41:32.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h 2005-12-14 15:57:16.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h 2006-01-19 11:41:29.000000000 +0530
@@ -1,6 +1,10 @@
#ifndef KEXEC_X86_H
#define KEXEC_X86_H
@@ -1099,7 +1144,7 @@
struct kexec_info *info);
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/Makefile kexec-tools-1.101-kdump/kexec/arch/i386/Makefile
--- kexec-tools-1.101/kexec/arch/i386/Makefile 2005-02-06 04:53:58.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/Makefile 2005-12-14 15:57:16.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/Makefile 2006-01-19 11:41:29.000000000 +0530
@@ -9,3 +9,4 @@ KEXEC_C_SRCS+= kexec/arch/i386/kexec-mul
KEXEC_C_SRCS+= kexec/arch/i386/kexec-beoboot-x86.c
KEXEC_C_SRCS+= kexec/arch/i386/kexec-nbi.c
@@ -1107,7 +1152,7 @@
+KEXEC_C_SRCS+= kexec/arch/i386/crashdump-x86.c
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c
--- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2005-01-13 18:40:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c 2006-02-01 14:41:09.489594672 +0530
@@ -94,7 +94,8 @@ void setup_linux_bootloader_parameters(
cmdline_ptr[cmdline_len - 1] = '\0';
}
@@ -1127,9 +1172,18 @@
die("Cannot get memory information\n");
}
if (ranges > E820MAX) {
+@@ -164,7 +165,7 @@ void setup_linux_system_parameters(struc
+ if (range[i].type != RANGE_RAM)
+ continue;
+ if ((range[i].start <= 0x100000) && range[i].end > 0x100000) {
+- unsigned long long mem_k = (range[i].end >> 10) - 0x100000;
++ unsigned long long mem_k = (range[i].end >> 10) - 0x400;
+ real_mode->ext_mem_k = mem_k;
+ real_mode->alt_mem_k = mem_k;
+ if (mem_k > 0xfc00) {
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.h kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h
--- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.h 2004-12-20 17:50:22.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h 2006-01-19 11:41:27.000000000 +0530
@@ -7,7 +7,8 @@ void setup_linux_bootloader_parameters(
unsigned long real_mode_base, unsigned long cmdline_offset,
const char *cmdline, off_t cmdline_len,
@@ -1142,7 +1196,7 @@
#define SETUP_BASE 0x90000
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c
--- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c 2005-01-11 11:58:36.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c 2005-12-15 11:55:22.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c 2006-01-19 18:19:07.000000000 +0530
@@ -34,11 +34,11 @@
#include <arch/options.h>
@@ -1195,7 +1249,7 @@
fprintf(stderr, "Unsupported machine type: %s\n",
diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c kexec-tools-1.101-kdump/kexec/arch/ppc/kexec-ppc.c
--- kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c 2005-01-11 11:58:03.000000000 +0530
[...2725 lines suppressed...]
+ isync
-+ mr 5,3 # save cpu id to r5
-+ addi 3,4,0x100 # r3 = boot param block
-+ lwz 6,20(3) # fetch version number
-+ cmpwi 0,6,2 # v2 ?
-+ blt 80f
-+ stw 5,28(3) # save my cpu number as boot_cpu_phys
-+80: b 81f
-+
-+ .org 0x60 # ABI: slaves start at 60 with r3=phys
-+slave: ld 4,secondary_hold at l(0);
-+ cmpdi 0,4,0
-+ beq slave
-+
-+ # ahh, master told us where he is running from
-+ # jump into our copy of the code up there so this code can change
-+ addi 5,4,1f-start
-+ mtctr 5
-+ bctr
++ mr 17,3 # save cpu id to r17
++ mr 15,4 # save physical address in reg15
+
-+ # ok, now wait for the master to tell is to go back to the new block
-+1: ld 5,copied at l(4)
-+ cmpdi 0,5,0
-+ beq 1b
-+ ba 0x60
++ LOADADDR(6,my_toc)
++ ld 2,0(6) #setup toc
+
++ LOADADDR(6,stack)
++ ld 1,0(6) #setup stack
+
++ subi 1,1,112
++ bl .purgatory
++ nop
++
++ b 81f
++ .org purgatory_start + 0x60 # ABI: slaves start at 60 with r3=phys
++slave:
++ # load slave spin code address and branch into that
++ LOADADDR(6,slave_spin)
++ ld 4,0(6)
++ mtctr 4
++ bctr
+
-+ .long 0 # just an eye-catcher, delete if space needed
-+ .long 0 # just an eye-catcher, delete if space needed
++spin: .long 1
++slave_spin_code:
++ lis 5,spin at ha
++ lwz 5,spin at l(5)
++ cmpwi 0,5,0
++ bne slave_spin_code
++ ba 0x60
+
+81: # master continues here
+ or 3,3,3 # ok back to high, lets boot
@@ -4297,7 +5789,17 @@
+ mtctr 6 # delay a bit for slaves to catch up
+83: bdnz 83b # before we overwrite 0-100 again
+
-+ ld 4,-8(3) # kernel pointer is at -8(bb) by loader
++ LOADADDR(16, dt_offset)
++ ld 3,0(16) # load device-tree address
++ mr 16,3 # save dt address in reg16
++ lwz 6,20(3) # fetch version number
++ cmpwi 0,6,2 # v2 ?
++ blt 80f
++ stw 17,28(3) # save my cpu number as boot_cpu_phys
++80:
++ LOADADDR(6,kernel)
++ ld 4,0(6) # load the kernel address
++
+ addi 5,4,-8 # prepare copy with update form instructions
+ li 6,0x100/8
+ mtctr 6
@@ -4315,18 +5817,18 @@
+ icbi 0,6
+ sync
+ isync
-+ std 6,-16(3) # send slaves back down
++ lis 6,spin at ha
++ li 0,0
++ stw 0,spin at l(6)
++ mr 3,16 # restore dt address
++
+ bctr # start kernel
+
-+ .org 0xf0
-+copied: .llong 0
-+kernel: .llong 0
-+ .org 0x100
-+__end_stub:
-+ .equ boot_block, . - start
++slave_spin: .llong slave_spin_code
++
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/limits.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h
--- kexec-tools-1.101/purgatory/arch/s390/include/limits.h 1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h 2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h 2006-01-19 11:41:37.000000000 +0530
@@ -0,0 +1,54 @@
+#ifndef _LIMITS_H_
+#define _LIMITS_H_
@@ -4384,7 +5886,7 @@
+#endif /* !_LIMITS_H_ */
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/stdint.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h
--- kexec-tools-1.101/purgatory/arch/s390/include/stdint.h 1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h 2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h 2006-01-19 11:41:37.000000000 +0530
@@ -0,0 +1,24 @@
+#ifndef _STDINT_H
+#define _STDINT_H
@@ -4412,7 +5914,7 @@
+#endif
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/Makefile kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile
--- kexec-tools-1.101/purgatory/arch/s390/Makefile 1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile 2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile 2006-01-19 11:41:37.000000000 +0530
@@ -0,0 +1,7 @@
+#
+# Purgatory s390
@@ -4423,7 +5925,7 @@
+
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/Makefile kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile
--- kexec-tools-1.101/purgatory/arch/x86_64/Makefile 2004-12-21 12:43:53.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile 2005-12-14 16:00:56.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile 2006-01-19 11:41:41.000000000 +0530
@@ -9,6 +9,7 @@ PURGATORY_S_SRCS+= purgatory/arch/x86_64
PURGATORY_S_SRCS+= purgatory/arch/x86_64/setup-x86_64.S
PURGATORY_S_SRCS+= purgatory/arch/x86_64/stack.S
@@ -4434,7 +5936,7 @@
PURGATORY_C_SRCS+= purgatory/arch/i386/pic.c
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c
--- kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c 2004-12-21 22:07:41.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c 2005-12-14 16:00:56.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c 2006-01-19 11:41:41.000000000 +0530
@@ -4,9 +4,16 @@
uint8_t reset_vga = 0;
@@ -4454,7 +5956,7 @@
+}
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/include/purgatory.h kexec-tools-1.101-kdump/purgatory/include/purgatory.h
--- kexec-tools-1.101/purgatory/include/purgatory.h 2004-12-18 18:42:15.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h 2006-01-19 11:41:27.000000000 +0530
@@ -4,5 +4,6 @@
void putchar(int ch);
void printf(const char *fmt, ...);
@@ -4464,7 +5966,7 @@
#endif /* PURGATORY_H */
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/Makefile kexec-tools-1.101-kdump/purgatory/Makefile
--- kexec-tools-1.101/purgatory/Makefile 2005-01-09 04:06:32.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/Makefile 2005-12-14 15:57:19.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/Makefile 2006-01-19 18:20:08.000000000 +0530
@@ -6,6 +6,11 @@
# There is probably a cleaner way to do this but for now this
# should keep us from accidentially include unsafe library functions
@@ -4477,34 +5979,23 @@
PCFLAGS:=-Wall -Os \
-I$(shell $(CC) -print-file-name=include) \
-Ipurgatory/include -Ipurgatory/arch/$(ARCH)/include \
-@@ -17,9 +22,11 @@ PCFLAGS += $(call cc-option, -fnostdinc)
+@@ -16,11 +21,11 @@ PCFLAGS += $(call cc-option, -fnobuiltin
+ PCFLAGS += $(call cc-option, -fnostdinc)
PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss)
- PURGATORY_C_SRCS:=
-+ifneq ($(ARCH),ppc64)
+-PURGATORY_C_SRCS:=
++PURGATORY_C_SRCS:=
PURGATORY_C_SRCS += purgatory/purgatory.c
PURGATORY_C_SRCS += purgatory/printf.c
PURGATORY_C_SRCS += purgatory/string.c
-+endif
- PURGATORY_S_OBJS:=
+-PURGATORY_S_OBJS:=
++PURGATORY_S_OBJS:=
include purgatory/arch/$(ARCH)/Makefile
-@@ -54,7 +61,12 @@ $(PURGATORY_S_OBJS): $(OBJDIR)/%.o: %.S
-
- $(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB)
- $(MKDIR) -p $(@D)
-+ifneq ($(ARCH),ppc64)
- $(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
-+else
-+ $(LD) -Ttext=0 -e 0 -o $(OBJDIR)/purgatory/v2wrap.elf $(PURGATORY_OBJS)
-+ objcopy -O binary $(OBJDIR)/purgatory/v2wrap.elf $@
-+endif
- echo::
- @echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)"
diff -urNp -X dontdiff kexec-tools-1.101/purgatory/purgatory.c kexec-tools-1.101-kdump/purgatory/purgatory.c
--- kexec-tools-1.101/purgatory/purgatory.c 2004-12-22 00:21:03.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/purgatory.c 2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/purgatory.c 2006-01-19 11:41:27.000000000 +0530
@@ -44,4 +44,5 @@ void purgatory(void)
printf("I'm in purgatory\n");
setup_arch();
Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kexec-tools.spec 30 Jan 2006 20:02:36 -0000 1.6
+++ kexec-tools.spec 2 Feb 2006 10:13:27 -0000 1.7
@@ -1,6 +1,6 @@
Name: kexec-tools
Version: 1.101
-Release: 6
+Release: 7
License: GPL
Group: Applications/System
Summary: The kexec/kdump userspace component.
@@ -10,13 +10,6 @@
Source2: kdump.sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%define kdump 0
-
-%ifarch %{ix86}
-%define kdump 1
-%endif
-
-
#
# Patches 0 through 100 are meant for x86 kexec-tools enablement
#
@@ -48,10 +41,8 @@
%patch1 -p1
%patch101 -p1
-%if %{kdump}
cp $RPM_SOURCE_DIR/kdump.init .
cp $RPM_SOURCE_DIR/kdump.sysconfig .
-%endif
%build
%configure
@@ -63,18 +54,14 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
-%if %{kdump}
install -m 644 kdump.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kdump
install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post
-%if %{kdump}
chkconfig --add kdump
-%endif
%postun
@@ -92,11 +79,9 @@
%files
%defattr(-,root,root,-)
%{_sbindir}/kexec
-%if %{kdump}
%{_sbindir}/kdump
%config(noreplace,missingok) /etc/sysconfig/kdump
%config /etc/rc.d/init.d/kdump
-%endif
%{_libdir}/kexec-tools/kexec_test
%doc News
@@ -104,6 +89,9 @@
%doc TODO
%changelog
+* Wed Feb 01 2006 Thomas Graf <tgraf at redhat.com>
+- New kdump patch to support s390 arch + various fixes
+- Include kdump in x86_64 builds
* Mon Jan 30 2006 Thomas Graf <tgraf at redhat.com>
- New kdump patch to support x86_64 userspace
- Previous message (by thread): rpms/kde-i18n/devel kde-i18n.spec,1.52,1.53
- Next message (by thread): rpms/kdenetwork/FC-4 .cvsignore, 1.31, 1.32 kdenetwork.spec, 1.56, 1.57 sources, 1.35, 1.36 admin-visibility.patch, 1.3, NONE kdenetwork-3.3.0-ksirc.patch, 1.1, NONE kdenetwork-3.4.0-xmms.patch, 1.1, NONE post-3.4.1-kdenetwork-libgadu.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list