rpms/crash/devel crash.patch,1.14,1.15 crash.spec,1.18,1.19
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 13 15:16:52 UTC 2006
Author: anderson
Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21574
Modified Files:
crash.patch crash.spec
Log Message:
Updated crash.patch to match upstream version 4.0-3.3.
Support for x86_64 relocatable kernels. BZ #204557
crash.patch:
Makefile | 75 -
README | 36
alpha.c | 5
cmdline.c | 21
configure.c | 6
defs.h | 517 +++++++-
dev.c | 4
diskdump.c | 447 ++++++-
diskdump.h | 58
extensions.c | 7
extensions/Makefile | 41
extensions/dminfo.c | 1531 ++++++++++++++++++++++++
extensions/echo.c | 105 +
filesys.c | 126 +
gdb-6.1.patch | 9
gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++
gdb-6.1/gdb/symfile.c | 7
gdb_interface.c | 20
global_data.c | 3
help.c | 179 +-
ia64.c | 645 ++++++++--
kernel.c | 1264 ++++++++++++++------
lkcd_common.c | 100 +
lkcd_dump_v5.h | 2
lkcd_dump_v7.h | 2
lkcd_v7.c | 6
lkcd_v8.c | 14
lkcd_vmdump_v1.h | 4
lkcd_vmdump_v2_v3.h | 4
lkcd_x86_trace.c | 263 ++++
main.c | 121 +
memory.c | 2714 ++++++++++++++++++++++++++++++++++++++-----
net.c | 220 ++-
netdump.c | 724 +++++++++--
netdump.h | 65 +
ppc.c | 15
ppc64.c | 422 ++++++
s390.c | 73 -
s390_dump.c | 7
s390dbf.c | 1340 +++++++++++++++++++++
s390x.c | 105 -
symbols.c | 82 +
task.c | 689 ++++++++--
tools.c | 74 +
unwind.c | 19
va_server.c | 4
vas_crash.h | 2
x86.c | 1653 ++++++++++++++++++++++++--
x86_64.c | 1683 +++++++++++++++++++++++++-
xendump.c | 1170 ++++++++++++++++++
xendump.h | 97 +
51 files changed, 16226 insertions(+), 1670 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.14 -r 1.15 crash.patch
Index: crash.patch
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- crash.patch 7 Aug 2006 19:00:29 -0000 1.14
+++ crash.patch 13 Sep 2006 15:16:49 -0000 1.15
@@ -1,5 +1,5 @@
---- crash/extensions/Makefile.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/extensions/Makefile 2005-11-08 11:38:21.000000000 -0500
+--- crash/extensions/Makefile.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/extensions/Makefile 2005-11-08 11:39:26.000000000 -0500
@@ -0,0 +1,41 @@
+#
+# Makefile for building crash shared object extensions
@@ -42,8 +42,8 @@
+dminfo.so: ../defs.h dminfo.c
+ gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET)
+
---- crash/extensions/echo.c.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/extensions/echo.c 2006-05-16 15:43:05.000000000 -0400
+--- crash/extensions/echo.c.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/extensions/echo.c 2005-11-08 10:37:53.000000000 -0500
@@ -0,0 +1,105 @@
+/* echo.c - simple example of a crash extension
+ *
@@ -150,8 +150,8 @@
+};
+
+
---- crash/extensions/dminfo.c.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/extensions/dminfo.c 2006-05-16 15:43:05.000000000 -0400
+--- crash/extensions/dminfo.c.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/extensions/dminfo.c 2005-11-08 10:37:53.000000000 -0500
@@ -0,0 +1,1531 @@
+/* dminfo.c - crash extension module for device-mapper analysis
+ *
@@ -1684,8 +1684,24 @@
+{
+ return 0;
+}
---- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/gdb-6.1/gdb/ppc-linux-tdep.c 2005-11-04 17:37:54.000000000 -0500
+--- crash/gdb-6.1/gdb/symfile.c.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/gdb-6.1/gdb/symfile.c 2006-08-23 08:40:53.000000000 -0400
+@@ -3510,6 +3510,13 @@
+ bfd_byte *
+ symfile_relocate_debug_section (bfd *abfd, asection *sectp, bfd_byte *buf)
+ {
++#ifdef CRASH_MERGE
++ /* Executable files have all the relocations already resolved.
++ * Handle files linked with --emit-relocs.
++ * http://sources.redhat.com/ml/gdb/2006-08/msg00137.html */
++ if ((abfd->flags & EXEC_P) != 0)
++ return NULL;
++#endif
+ /* We're only interested in debugging sections with relocation
+ information. */
+ if ((sectp->flags & SEC_RELOC) == 0)
+--- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/gdb-6.1/gdb/ppc-linux-tdep.c 2005-07-14 11:08:17.000000000 -0400
@@ -0,0 +1,1116 @@
+/* Target-dependent code for GDB, the GNU debugger.
+
@@ -2803,8 +2819,8 @@
+ ppc_linux_init_abi);
+ add_core_fns (&ppc_linux_regset_core_fns);
+}
---- crash/main.c.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/main.c 2006-08-03 16:58:32.000000000 -0400
+--- crash/main.c.orig 2006-09-13 11:10:22.000000000 -0400
++++ crash/main.c 2006-08-31 15:56:58.000000000 -0400
@@ -35,11 +35,15 @@
{"no_data_debug", 0, 0, 0},
{"no_crashrc", 0, 0, 0},
@@ -2826,7 +2842,7 @@
opterr = 0;
optind = 0;
- while((c = getopt_long(argc, argv, "LgH:h:e:i:sSvc:d:tf",
-+ while((c = getopt_long(argc, argv, "LgH:h:e:i:sSvc:d:tfp:",
++ while((c = getopt_long(argc, argv, "LgH:h:e:i:sSvc:d:tfp:m:",
long_options, &option_index)) != -1) {
switch (c)
{
@@ -2875,7 +2891,7 @@
break;
case 'L':
-@@ -193,6 +212,10 @@
+@@ -193,6 +212,14 @@
set_vas_debug(pc->debug);
break;
@@ -2883,10 +2899,14 @@
+ force_page_size(optarg);
+ break;
+
++ case 'm':
++ machdep->cmdline_arg = optarg;
++ break;
++
default:
if (STREQ(argv[optind-1], "-h"))
program_usage(LONG_FORM);
-@@ -264,6 +287,28 @@
+@@ -264,6 +291,28 @@
pc->readmem = read_netdump;
pc->writemem = write_netdump;
@@ -2915,26 +2935,36 @@
} else if (is_diskdump(argv[optind])) {
if (pc->flags & MEMORY_SOURCES) {
error(INFO,
-@@ -335,8 +380,7 @@
+@@ -335,8 +384,6 @@
machdep_init(PRE_SYMTAB);
symtab_init();
machdep_init(PRE_GDB);
- kernel_init(PRE_GDB);
- verify_version();
-+ read_in_kernel_config(IKCFG_INIT);
datatype_init();
/*
-@@ -361,6 +405,8 @@
+@@ -361,7 +408,8 @@
{
if (!(pc->flags & GDB_INIT)) {
gdb_session_init();
-+ kernel_init(PRE_GDB);
-+ verify_version();
- kernel_init(POST_GDB);
+- kernel_init(POST_GDB);
++ read_in_kernel_config(IKCFG_INIT);
++ kernel_init();
machdep_init(POST_GDB);
vm_init();
-@@ -591,6 +637,8 @@
+ hq_init();
+@@ -459,6 +507,9 @@
+
+ pc->curcmd = pc->program_name;
+ error(INFO, "command not found: %s\n", args[0]);
++
++ if (pc->curcmd_flags & REPEAT)
++ pc->curcmd_flags &= ~REPEAT;
+ }
+
+
+@@ -591,6 +642,8 @@
int i;
char *p1;
char buf[BUFSIZE];
@@ -2943,7 +2973,7 @@
FILE *afp;
char *program;
-@@ -685,11 +733,11 @@
+@@ -685,11 +738,11 @@
pc->home = "(unknown)";
} else
strcpy(pc->home, p1);
@@ -2959,7 +2989,7 @@
else {
while (fgets(buf, BUFSIZE, afp))
resolve_rc_cmd(buf, ALIAS_RCHOME);
-@@ -698,11 +746,12 @@
+@@ -698,11 +751,12 @@
}
}
@@ -2976,7 +3006,7 @@
else {
while (fgets(buf, BUFSIZE, afp))
resolve_rc_cmd(buf, ALIAS_RCLOCAL);
-@@ -840,13 +889,22 @@
+@@ -840,13 +894,22 @@
if (pc->flags & REM_S390D)
sprintf(&buf[strlen(buf)],
"%sREM_S390D", others++ ? "|" : "");
@@ -3001,7 +3031,7 @@
sprintf(&buf[strlen(buf)],
"%sDISKDUMP", others++ ? "|" : "");
if (pc->flags & SYSMAP)
-@@ -855,21 +913,24 @@
+@@ -855,21 +918,24 @@
if (pc->flags & SYSMAP_ARG)
sprintf(&buf[strlen(buf)],
"%sSYSMAP_ARG", others++ ? "|" : "");
@@ -3031,7 +3061,7 @@
if (pc->flags)
strcat(buf, ")");
-@@ -1017,6 +1078,11 @@
+@@ -1017,6 +1083,13 @@
fprintf(fp, " cur_req: %lx\n", (ulong)pc->cur_req);
fprintf(fp, " cmdgencur: %ld\n", pc->cmdgencur);
fprintf(fp, " cmdgenspec: %ld\n", pc->cmdgenspec);
@@ -3039,11 +3069,13 @@
[...9776 lines suppressed...]
+--- crash/lkcd_dump_v7.h.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/lkcd_dump_v7.h 2006-03-22 09:11:11.000000000 -0500
@@ -35,7 +35,7 @@
#ifndef _DUMP_H
#define _DUMP_H
@@ -18748,8 +23433,8 @@
/* define TRUE and FALSE for use in our dump modules */
#ifndef FALSE
---- crash/Makefile.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/Makefile 2006-08-07 15:00:37.000000000 -0400
+--- crash/Makefile.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/Makefile 2006-09-13 11:10:22.000000000 -0400
@@ -3,8 +3,8 @@
# Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
# www.missioncriticallinux.com, info at missioncriticallinux.com
@@ -18761,8 +23446,14 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-@@ -39,6 +39,8 @@
- GDB_FILES=
+@@ -35,10 +35,12 @@
+ #
+ # GDB, GDB_FILES and GDB_OFILES will be configured automatically by configure
+ #
+-GDB=gdb-6.1
+-GDB_FILES=${GDB_6.1_FILES}
++GDB=
++GDB_FILES=
GDB_OFILES=
+GDB_PATCH_FILES=gdb-6.1.patch
@@ -18779,7 +23470,12 @@
LKCD_DUMP_HFILES=lkcd_vmdump_v1.h lkcd_vmdump_v2_v3.h lkcd_dump_v5.h \
lkcd_dump_v7.h lkcd_dump_v8.h lkcd_fix_mem.h
LKCD_TRACE_HFILES=lkcd_x86_trace.h
-@@ -75,7 +77,7 @@
+@@ -71,11 +73,11 @@
+
+ CFILES=main.c tools.c global_data.c memory.c filesys.c help.c task.c \
+ kernel.c test.c gdb_interface.c configure.c net.c dev.c \
+- alpha.c x86.c ppc.c ia64.c s390.c s390x.c ppc64.c x86_64.c \
++ alpha.c x86.c ppc.c ia64.c s390.c s390x.c s390dbf.c ppc64.c x86_64.c \
extensions.c remote.c va_server.c va_server_v1.c symbols.c cmdline.c \
lkcd_common.c lkcd_v1.c lkcd_v2_v3.c lkcd_v5.c lkcd_v7.c lkcd_v8.c\
lkcd_fix_mem.c s390_dump.c lkcd_x86_trace.c \
@@ -18788,8 +23484,12 @@
SOURCE_FILES=${CFILES} ${GENERIC_HFILES} ${MCORE_HFILES} \
${REDHAT_CFILES} ${REDHAT_HFILES} ${UNWIND_HFILES} \
-@@ -86,9 +88,18 @@
- alpha.o x86.o ppc.o ia64.o s390.o s390x.o ppc64.o x86_64.o \
+@@ -83,12 +85,21 @@
+
+ OBJECT_FILES=main.o tools.o global_data.o memory.o filesys.o help.o task.o \
+ build_data.o kernel.o test.o gdb_interface.o net.o dev.o \
+- alpha.o x86.o ppc.o ia64.o s390.o s390x.o ppc64.o x86_64.o \
++ alpha.o x86.o ppc.o ia64.o s390.o s390x.o s390dbf.o ppc64.o x86_64.o \
extensions.o remote.o va_server.o va_server_v1.o symbols.o cmdline.o \
lkcd_common.o lkcd_v1.o lkcd_v2_v3.o lkcd_v5.o lkcd_v7.o lkcd_v8.o \
- lkcd_fix_mem.o s390_dump.o netdump.o diskdump.o \
@@ -18867,7 +23567,17 @@
cc -c ${CFLAGS} -DMCLX x86.c ${WARNING_OPTIONS} ${WARNING_ERROR}
alpha.o: ${GENERIC_HFILES} alpha.c
-@@ -353,6 +375,9 @@
+@@ -342,6 +364,9 @@
+ s390x.o: ${GENERIC_HFILES} ${IBM_HFILES} s390x.c
+ cc -c ${CFLAGS} s390x.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
++s390dbf.o: ${GENERIC_HFILES} ${IBM_HFILES} s390dbf.c
++ cc -c ${CFLAGS} s390dbf.c ${WARNING_OPTIONS} ${WARNING_ERROR}
++
+ s390_dump.o: ${GENERIC_HFILES} ${IBM_HFILES} s390_dump.c
+ cc -c ${CFLAGS} s390_dump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
+@@ -353,6 +378,9 @@
diskdump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} diskdump.c
cc -c ${CFLAGS} diskdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
@@ -18877,7 +23587,7 @@
extensions.o: ${GENERIC_HFILES} extensions.c
cc -c ${CFLAGS} extensions.c ${WARNING_OPTIONS} ${WARNING_ERROR}
-@@ -393,13 +418,13 @@
+@@ -393,13 +421,13 @@
gdb_files: make_configure
@./configure -q -b
@@ -18894,7 +23604,7 @@
ctags:
ctags ${SOURCE_FILES}
-@@ -411,7 +436,7 @@
+@@ -411,7 +439,7 @@
do_tar:
@if [ -f ${PROGRAM} ]; then \
./${PROGRAM} --no_crashrc -h README > README; fi
@@ -18903,7 +23613,16 @@
@echo; ls -l ${PROGRAM}.tar.gz
# To create a base tar file for Red Hat RPM packaging, pass the base RPM
-@@ -446,8 +471,8 @@
+@@ -421,7 +449,7 @@
+ # spec file will have its own release number, which will in turn get passed
+ # to the "all" target upon the initial build.
+
+-RELEASE=4.0
++RELEASE=
+
+ release: make_configure
+ @if [ "`id --user`" != "0" ]; then \
+@@ -446,8 +474,8 @@
@rm -f ${PROGRAM}-${RELEASE}.tar.gz
@rm -f ${PROGRAM}-${RELEASE}.src.rpm
@chown root ./RELDIR/${PROGRAM}-${RELEASE}
@@ -18914,7 +23633,7 @@
@cp ${GDB}.tar.gz ./RELDIR/${PROGRAM}-${RELEASE}
@./${PROGRAM} --no_crashrc -h README > ./RELDIR/${PROGRAM}-${RELEASE}/README
@(cd ./RELDIR; find . -exec chown root {} ";")
-@@ -488,3 +513,10 @@
+@@ -488,3 +516,10 @@
dis:
objdump --disassemble --line-numbers ${PROGRAM} > ${PROGRAM}.dis
@@ -18925,8 +23644,8 @@
+
+do_extensions:
+ @(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET))
---- crash/gdb-6.1.patch.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/gdb-6.1.patch 2006-01-03 13:36:25.000000000 -0500
+--- crash/gdb-6.1.patch.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/gdb-6.1.patch 2006-01-03 14:48:26.000000000 -0500
@@ -0,0 +1,11 @@
+--- gdb-6.1/bfd/coff-alpha.c.orig
++++ gdb-6.1/bfd/coff-alpha.c
@@ -18939,14 +23658,14 @@
+ }
+
+ if (lita_sec_data->gp != 0)
---- crash/README.orig 2006-08-07 15:00:37.000000000 -0400
-+++ crash/README 2006-08-07 15:00:33.000000000 -0400
+--- crash/README.orig 2006-09-13 11:10:23.000000000 -0400
++++ crash/README 2006-09-13 11:10:21.000000000 -0400
@@ -69,7 +69,7 @@
After the kernel is re-compiled, the uncompressed "vmlinux" kernel
that is created in the top-level kernel build directory must be saved.
- To build this utility, simply uncompress the tar file, enter the crash-4.0
-+ To build this utility, simply uncompress the tar file, enter the crash-4.0-3.1
++ To build this utility, simply uncompress the tar file, enter the crash-4.0-3.3
subdirectory, and type "make". The initial build will take several minutes
because the gdb module must be configured and and built. Alternatively, the
crash source RPM file may be installed and built, and the resultant crash
@@ -18958,7 +23677,7 @@
- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
- Copyright (C) 2004, 2005 IBM Corporation
- Copyright (C) 1999-2005 Hewlett-Packard Co
-+ crash 4.0-3.1
++ crash 4.0-3.3
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+ Copyright (C) 2004, 2005, 2006 IBM Corporation
+ Copyright (C) 1999-2006 Hewlett-Packard Co
@@ -18972,7 +23691,7 @@
DUMPFILE: /dev/mem
CPUS: 1
- DATE: Wed Jul 13 13:26:00 2005
-+ DATE: Mon Aug 7 15:00:33 2006
++ DATE: Wed Sep 13 11:10:21 2006
UPTIME: 10 days, 22:55:18
LOAD AVERAGE: 0.08, 0.03, 0.01
TASKS: 42
@@ -18981,7 +23700,7 @@
extend mach repeat timer
- crash version: 4.0 gdb version: 6.1
-+ crash version: 4.0-3.1 gdb version: 6.1
++ crash version: 4.0-3.3 gdb version: 6.1
For help on any command above, enter "help <command>".
For help on input options, enter "help input".
For help on output options, enter "help output".
@@ -18993,7 +23712,7 @@
- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
- Copyright (C) 2004, 2005 IBM Corporation
- Copyright (C) 1999-2005 Hewlett-Packard Co
-+ crash 4.0-3.1
++ crash 4.0-3.3
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+ Copyright (C) 2004, 2005, 2006 IBM Corporation
+ Copyright (C) 1999-2006 Hewlett-Packard Co
@@ -19010,7 +23729,7 @@
- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
- Copyright (C) 2004, 2005 IBM Corporation
- Copyright (C) 1999-2005 Hewlett-Packard Co
-+ crash 4.0-3.1
++ crash 4.0-3.3
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+ Copyright (C) 2004, 2005, 2006 IBM Corporation
+ Copyright (C) 1999-2006 Hewlett-Packard Co
Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- crash.spec 7 Aug 2006 19:00:29 -0000 1.18
+++ crash.spec 13 Sep 2006 15:16:50 -0000 1.19
@@ -4,7 +4,7 @@
Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
Name: crash
Version: 4.0
-Release: 3.1
+Release: 3.3
License: GPL
Group: Development/Debuggers
Source: %{name}-%{version}.tar.gz
@@ -45,6 +45,10 @@
%doc README
%changelog
+* Wed Sep 13 2006 Dave Anderson <anderson at redhat.com> - 4.0-3.3
+- Updated crash.patch to match upstream version 4.0-3.3.
+- Support for x86_64 relocatable kernels. BZ #204557
+
* Mon Aug 7 2006 Dave Anderson <anderson at redhat.com> - 4.0-3.1
- Updated crash.patch to match upstream version 4.0-3.1.
- Added kdump reference to description.
More information about the fedora-cvs-commits
mailing list