rpms/crash/devel crash.patch,1.7,1.8 crash.spec,1.10,1.11
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon May 15 20:09:37 UTC 2006
Author: anderson
Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20705
Modified Files:
crash.patch crash.spec
Log Message:
Updated crash.patch to bring it up to 4.0-2.26, which should
address BZ #191719 - "crash fails to build in mock"
crash.patch:
Makefile | 62 +
README | 36 -
alpha.c | 2
cmdline.c | 13
configure.c | 2
defs.h | 359 +++++++++-
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 | 104 ++
gdb-6.1.patch | 9
gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++++++++++++++++
gdb_interface.c | 12
help.c | 125 ++-
ia64.c | 18
kernel.c | 332 ++++++++-
lkcd_common.c | 81 ++
lkcd_dump_v5.h | 2
lkcd_dump_v7.h | 2
lkcd_v7.c | 6
lkcd_v8.c | 14
lkcd_x86_trace.c | 261 +++++++
main.c | 93 ++
memory.c | 1424 +++++++++++++++++++++++++++++++++++----
net.c | 220 +++++-
netdump.c | 536 ++++++++++++---
netdump.h | 11
ppc.c | 7
ppc64.c | 413 +++++++++++
s390.c | 2
s390x.c | 2
symbols.c | 65 +
task.c | 565 ++++++++++++---
tools.c | 54 +
unwind.c | 19
va_server.c | 4
x86.c | 760 ++++++++++++++++++++-
x86_64.c | 1217 ++++++++++++++++++++++++++++++++--
xendump.c | 1167 ++++++++++++++++++++++++++++++++
xendump.h | 97 ++
44 files changed, 10612 insertions(+), 793 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 crash.patch
Index: crash.patch
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crash.patch 4 Jan 2006 19:34:09 -0000 1.7
+++ crash.patch 15 May 2006 20:09:33 -0000 1.8
@@ -1,4 +1,4 @@
---- crash/extensions/Makefile.orig 2006-01-04 14:18:28.000000000 -0500
+--- crash/extensions/Makefile.orig 2006-05-11 11:25:04.000000000 -0400
+++ crash/extensions/Makefile 2005-11-08 11:38:21.000000000 -0500
@@ -0,0 +1,41 @@
+#
@@ -42,7 +42,7 @@
+dminfo.so: ../defs.h dminfo.c
+ gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET)
+
---- crash/extensions/echo.c.orig 2006-01-04 14:18:28.000000000 -0500
+--- crash/extensions/echo.c.orig 2006-05-11 11:25:04.000000000 -0400
+++ crash/extensions/echo.c 2005-11-10 16:12:50.000000000 -0500
@@ -0,0 +1,105 @@
+/* echo.c - simple example of a crash extension
@@ -150,7 +150,7 @@
+};
+
+
---- crash/extensions/dminfo.c.orig 2006-01-04 14:18:28.000000000 -0500
+--- crash/extensions/dminfo.c.orig 2006-05-11 11:25:04.000000000 -0400
+++ crash/extensions/dminfo.c 2005-11-10 16:12:50.000000000 -0500
@@ -0,0 +1,1531 @@
+/* dminfo.c - crash extension module for device-mapper analysis
@@ -1684,7 +1684,7 @@
+{
+ return 0;
+}
---- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig 2006-01-04 14:18:28.000000000 -0500
+--- crash/gdb-6.1/gdb/ppc-linux-tdep.c.orig 2006-05-11 11:25:04.000000000 -0400
+++ crash/gdb-6.1/gdb/ppc-linux-tdep.c 2005-11-04 17:37:54.000000000 -0500
@@ -0,0 +1,1116 @@
+/* Target-dependent code for GDB, the GNU debugger.
@@ -2803,9 +2803,23 @@
+ ppc_linux_init_abi);
+ add_core_fns (&ppc_linux_regset_core_fns);
+}
---- crash/main.c.orig 2006-01-04 14:18:28.000000000 -0500
-+++ crash/main.c 2005-11-18 10:41:07.000000000 -0500
-@@ -55,7 +55,7 @@
+--- crash/main.c.orig 2006-05-11 11:25:03.000000000 -0400
++++ crash/main.c 2006-04-26 15:41:04.000000000 -0400
+@@ -35,11 +35,13 @@
+ {"no_data_debug", 0, 0, 0},
+ {"no_crashrc", 0, 0, 0},
+ {"no_kmem_cache", 0, 0, 0},
++ {"kmem_cache_delay", 0, 0, 0},
+ {"readnow", 0, 0, 0},
+ {"smp", 0, 0, 0},
+ {"machdep", 1, 0, 0},
+ {"version", 0, 0, 0},
+ {"buildinfo", 0, 0, 0},
++ {"shadow_page_tables", 0, 0, 0},
+ {0, 0, 0, 0}
+ };
+
+@@ -55,7 +57,7 @@
*/
opterr = 0;
optind = 0;
@@ -2814,7 +2828,29 @@
long_options, &option_index)) != -1) {
switch (c)
{
-@@ -193,6 +193,10 @@
+@@ -98,6 +100,10 @@
+ vt->flags |= KMEM_CACHE_UNAVAIL;
+
+ if (STREQ(long_options[option_index].name,
++ "kmem_cache_delay"))
++ vt->flags |= KMEM_CACHE_DELAY;
++
++ if (STREQ(long_options[option_index].name,
+ "readnow"))
+ pc->flags |= READNOW;
+
+@@ -123,6 +129,10 @@
+ clean_exit(0);
+ }
+
++ if (STREQ(long_options[option_index].name,
++ "shadow_page_tables"))
++ kt->xen_flags |= SHADOW_PAGE_TABLES;
++
+ break;
+
+ case 'f':
+@@ -193,6 +203,10 @@
set_vas_debug(pc->debug);
break;
@@ -2825,7 +2861,7 @@
default:
if (STREQ(argv[optind-1], "-h"))
program_usage(LONG_FORM);
-@@ -264,6 +268,17 @@
+@@ -264,6 +278,28 @@
pc->readmem = read_netdump;
pc->writemem = write_netdump;
@@ -2840,10 +2876,41 @@
+ pc->readmem = read_kdump;
+ pc->writemem = write_kdump;
+
++ } else if (is_xendump(argv[optind])) {
++ if (pc->flags & MEMORY_SOURCES) {
++ error(INFO,
++ "too many dumpfile arguments\n");
++ program_usage(SHORT_FORM);
++ }
++ pc->flags |= XENDUMP;
++ pc->dumpfile = argv[optind];
++ pc->readmem = read_xendump;
++ pc->writemem = write_xendump;
++
} else if (is_diskdump(argv[optind])) {
if (pc->flags & MEMORY_SOURCES) {
error(INFO,
-@@ -591,6 +606,8 @@
+@@ -335,8 +371,8 @@
+ machdep_init(PRE_SYMTAB);
+ symtab_init();
+ machdep_init(PRE_GDB);
+- kernel_init(PRE_GDB);
+- verify_version();
++// kernel_init(PRE_GDB);
++// verify_version();
+ datatype_init();
+
+ /*
+@@ -361,6 +397,8 @@
+ {
+ if (!(pc->flags & GDB_INIT)) {
+ gdb_session_init();
++ kernel_init(PRE_GDB);
++ verify_version();
+ kernel_init(POST_GDB);
+ machdep_init(POST_GDB);
+ vm_init();
+@@ -591,6 +629,8 @@
int i;
char *p1;
char buf[BUFSIZE];
@@ -2852,7 +2919,7 @@
FILE *afp;
char *program;
-@@ -685,11 +702,11 @@
+@@ -685,11 +725,11 @@
pc->home = "(unknown)";
} else
strcpy(pc->home, p1);
@@ -2868,7 +2935,7 @@
else {
while (fgets(buf, BUFSIZE, afp))
resolve_rc_cmd(buf, ALIAS_RCHOME);
-@@ -698,11 +715,12 @@
+@@ -698,11 +738,12 @@
}
}
@@ -2885,7 +2952,7 @@
else {
while (fgets(buf, BUFSIZE, afp))
resolve_rc_cmd(buf, ALIAS_RCLOCAL);
-@@ -840,13 +858,19 @@
+@@ -840,13 +881,22 @@
if (pc->flags & REM_S390D)
sprintf(&buf[strlen(buf)],
"%sREM_S390D", others++ ? "|" : "");
@@ -2893,6 +2960,9 @@
+ if (pc->flags & NETDUMP)
sprintf(&buf[strlen(buf)],
"%sNETDUMP", others++ ? "|" : "");
++ if (pc->flags & XENDUMP)
++ sprintf(&buf[strlen(buf)],
++ "%sXENDUMP", others++ ? "|" : "");
+ if (pc->flags & KDUMP)
+ sprintf(&buf[strlen(buf)],
+ "%sKDUMP", others++ ? "|" : "");
@@ -2907,7 +2977,7 @@
sprintf(&buf[strlen(buf)],
"%sDISKDUMP", others++ ? "|" : "");
if (pc->flags & SYSMAP)
-@@ -855,21 +879,24 @@
+@@ -855,21 +905,24 @@
if (pc->flags & SYSMAP_ARG)
sprintf(&buf[strlen(buf)],
"%sSYSMAP_ARG", others++ ? "|" : "");
@@ -2937,7 +3007,7 @@
if (pc->flags)
[...13137 lines suppressed...]
++#define MFN_NOT_FOUND (-1)
++#define PFN_NOT_FOUND (-1)
+--- crash/lkcd_dump_v5.h.orig 2006-05-11 11:25:04.000000000 -0400
++++ crash/lkcd_dump_v5.h 2006-03-22 08:45:35.000000000 -0500
+@@ -35,7 +35,7 @@
+ #ifndef _DUMP_H
+ #define _DUMP_H
+
+-#include <linux/list.h>
++//#include <linux/list.h>
+
+ /* define TRUE and FALSE for use in our dump modules */
+ #ifndef FALSE
+--- crash/lkcd_dump_v7.h.orig 2006-05-11 11:25:04.000000000 -0400
++++ crash/lkcd_dump_v7.h 2006-03-22 08:45:57.000000000 -0500
+@@ -35,7 +35,7 @@
+ #ifndef _DUMP_H
+ #define _DUMP_H
+
+-#include <linux/list.h>
++//#include <linux/list.h>
+
+ /* define TRUE and FALSE for use in our dump modules */
+ #ifndef FALSE
+--- crash/Makefile.orig 2006-05-11 11:25:04.000000000 -0400
++++ crash/Makefile 2006-05-11 11:25:03.000000000 -0400
+@@ -3,8 +3,8 @@
+ # Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc.
+ # www.missioncriticallinux.com, info at missioncriticallinux.com
+ #
+-# Copyright (C) 2002, 2003, 2004, 2005 David Anderson
+-# Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. All rights reserved.
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 David Anderson
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. All rights reserved.
+ #
+ # 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=
GDB_OFILES=
@@ -8741,8 +15331,30 @@
#
# Default installation directory
#
-@@ -89,6 +91,15 @@
- lkcd_fix_mem.o s390_dump.o netdump.o diskdump.o \
+@@ -62,7 +64,7 @@
+
+ GENERIC_HFILES=defs.h
+ MCORE_HFILES=va_server.h vas_crash.h
+-REDHAT_HFILES=netdump.h diskdump.h
++REDHAT_HFILES=netdump.h diskdump.h xendump.h
+ 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 @@
+ 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 \
+- netdump.c diskdump.c unwind.c unwind_decoder.c
++ netdump.c diskdump.c xendump.c unwind.c unwind_decoder.c
+
+ 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 \
+ 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 \
++ lkcd_fix_mem.o s390_dump.o netdump.o diskdump.o xendump.o \
lkcd_x86_trace.o unwind_v1.o unwind_v2.o unwind_v3.o
+# These are the current set of crash extensions sources. They are not built
@@ -8807,7 +15419,26 @@
library: make_build_data ${OBJECT_FILES}
ar -rs ${PROGRAM}lib.a ${OBJECT_FILES}
-@@ -393,13 +415,13 @@
+@@ -318,7 +340,7 @@
+ remote_daemon.o: ${GENERIC_HFILES} remote.c
+ cc -c ${CFLAGS} -DDAEMON remote.c -o remote_daemon.o ${WARNING_OPTIONS} ${WARNING_ERROR}
+
+-x86.o: ${GENERIC_HFILES} x86.c
++x86.o: ${GENERIC_HFILES} ${REDHAT_HFILES} x86.c
+ cc -c ${CFLAGS} -DMCLX x86.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
+ alpha.o: ${GENERIC_HFILES} alpha.c
+@@ -353,6 +375,9 @@
+ diskdump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} diskdump.c
+ cc -c ${CFLAGS} diskdump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
++xendump.o: ${GENERIC_HFILES} ${REDHAT_HFILES} xendump.c
++ cc -c ${CFLAGS} xendump.c ${WARNING_OPTIONS} ${WARNING_ERROR}
++
+ extensions.o: ${GENERIC_HFILES} extensions.c
+ cc -c ${CFLAGS} extensions.c ${WARNING_OPTIONS} ${WARNING_ERROR}
+
+@@ -393,13 +418,13 @@
gdb_files: make_configure
@./configure -q -b
@@ -8824,7 +15455,7 @@
ctags:
ctags ${SOURCE_FILES}
-@@ -411,7 +433,7 @@
+@@ -411,7 +436,7 @@
do_tar:
@if [ -f ${PROGRAM} ]; then \
./${PROGRAM} --no_crashrc -h README > README; fi
@@ -8833,7 +15464,7 @@
@echo; ls -l ${PROGRAM}.tar.gz
# To create a base tar file for Red Hat RPM packaging, pass the base RPM
-@@ -446,8 +468,8 @@
+@@ -446,8 +471,8 @@
@rm -f ${PROGRAM}-${RELEASE}.tar.gz
@rm -f ${PROGRAM}-${RELEASE}.src.rpm
@chown root ./RELDIR/${PROGRAM}-${RELEASE}
@@ -8844,7 +15475,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 +510,10 @@
+@@ -488,3 +513,10 @@
dis:
objdump --disassemble --line-numbers ${PROGRAM} > ${PROGRAM}.dis
@@ -8855,7 +15486,7 @@
+
+do_extensions:
+ @(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET))
---- crash/gdb-6.1.patch.orig 2006-01-04 14:18:28.000000000 -0500
+--- crash/gdb-6.1.patch.orig 2006-05-11 11:25:04.000000000 -0400
+++ crash/gdb-6.1.patch 2006-01-03 13:36:25.000000000 -0500
@@ -0,0 +1,11 @@
+--- gdb-6.1/bfd/coff-alpha.c.orig
@@ -8869,14 +15500,14 @@
+ }
+
+ if (lita_sec_data->gp != 0)
---- crash/README.orig 2006-01-04 14:18:28.000000000 -0500
-+++ crash/README 2006-01-04 14:18:26.000000000 -0500
+--- crash/README.orig 2006-05-11 11:25:04.000000000 -0400
++++ crash/README 2006-05-11 11:25:02.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-2.18
++ To build this utility, simply uncompress the tar file, enter the crash-4.0-2.26
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
@@ -8888,7 +15519,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-2.18
++ crash 4.0-2.26
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+ Copyright (C) 2004, 2005, 2006 IBM Corporation
+ Copyright (C) 1999-2006 Hewlett-Packard Co
@@ -8902,7 +15533,7 @@
DUMPFILE: /dev/mem
CPUS: 1
- DATE: Wed Jul 13 13:26:00 2005
-+ DATE: Wed Jan 4 14:18:26 2006
++ DATE: Thu May 11 11:25:02 2006
UPTIME: 10 days, 22:55:18
LOAD AVERAGE: 0.08, 0.03, 0.01
TASKS: 42
@@ -8911,7 +15542,7 @@
extend mach repeat timer
- crash version: 4.0 gdb version: 6.1
-+ crash version: 4.0-2.18 gdb version: 6.1
++ crash version: 4.0-2.26 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".
@@ -8923,7 +15554,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-2.18
++ crash 4.0-2.26
+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+ Copyright (C) 2004, 2005, 2006 IBM Corporation
+ Copyright (C) 1999-2006 Hewlett-Packard Co
@@ -8940,7 +15571,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-2.18
++ crash 4.0-2.26
+ 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- crash.spec 7 Feb 2006 11:18:14 -0000 1.10
+++ crash.spec 15 May 2006 20:09:33 -0000 1.11
@@ -4,11 +4,11 @@
Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
Name: crash
Version: 4.0
-Release: 2.18.1
+Release: 2.26.1
License: GPL
Group: Development/Debuggers
Source: %{name}-%{version}.tar.gz
-URL: ftp://people.redhat.com/anderson/%{name}-%{version}.tar.gz
+URL: http://people.redhat.com/anderson
ExclusiveOS: Linux
ExclusiveArch: i386 ia64 x86_64 ppc64
Buildroot: %{_tmppath}/%{name}-root
@@ -45,6 +45,10 @@
%doc README
%changelog
+* Mon May 15 2006 Dave Anderson <anderson at redhat.com> - 4.0-2.26.1
+- Updated crash.patch to bring it up to 4.0-2.26, which should
+ address BZ #191719 - "crash fails to build in mock"
+
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0-2.18.1
- rebuilt for new gcc4.1 snapshot and glibc changes
More information about the fedora-cvs-commits
mailing list