Re: [Crash-utility] [PATCH] Fix errors when rebuild with updated gdb-10.2.patch

On Thu, Feb 10, 2022 at 12:43 PM HAGIO KAZUHITO(萩尾　一仁) <k-hagio-ab(a)nec.com <mailto:k-hagio-ab@nec.com> > wrote: Hi Lianbo, -----Original Message----- > Hi, Kazu > Thank you for the fix. > On Thu, Jan 27, 2022 at 3:07 PM HAGIO KAZUHITO(萩尾　一仁) <k-hagio-ab(a)nec.com <mailto:k-hagio-ab@nec.com> <mailto:k-hagio-ab@nec.com <mailto:k-hagio-ab@nec.com> > > > wrote: > > > The gdb-10.2.patch forgot the role that acts as a shell script that > restores gdb files to its original state and exits. Without the patch, > the following errors are emitted when rebuiding crash with an updated > gdb-10.2.patch. > > $ make warn > TARGET: X86_64 > CRASH: 8.0.0++ > GDB: 10.2 > > + --- gdb-10.2/Makefile.in.orig > gdb-10.2.patch: line 11: ---: command not found > + +++ gdb-10.2/Makefile.in > gdb-10.2.patch: line 12: +++: command not found > + @@ -340,6 +340,9 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ > gdb-10.2.patch: line 13: @@: command not found > + AS_FOR_BUILD = @AS_FOR_BUILD@ > gdb-10.2.patch: line 14: AS_FOR_BUILD: command not found > + CC_FOR_BUILD = @CC_FOR_BUILD@ > gdb-10.2.patch: line 15: CC_FOR_BUILD: command not found > + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ > gdb-10.2.patch: line 16: CFLAGS_FOR_BUILD: command not found > gdb-10.2.patch: line 17: syntax error near unexpected token > `${CRASH_TARGET},' > gdb-10.2.patch: line 17: `+ifeq (${CRASH_TARGET}, PPC64)' > > Signed-off-by: Kazuhito Hagio <k-hagio-ab(a)nec.com <mailto:k-hagio-ab@nec.com> <mailto:k-hagio-ab@nec.com <mailto:k-hagio-ab@nec.com> > > > --- > gdb-10.2.patch | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/gdb-10.2.patch b/gdb-10.2.patch > index f5e4c06e6f97..c5aa0bf79691 100644 > --- a/gdb-10.2.patch > +++ b/gdb-10.2.patch > @@ -8,6 +8,11 @@ > # shell script that can restore any gdb file to its original state prior > # to all subsequent patch applications. > > +#tar xvzmf gdb-10.2.tar.gz \ > +# gdb-10.2/gdb/symtab.c > > > > The above code has been commented out, do you have any concerns? Thanks for the review. That is a template for the time we need it. We don't need the tar command so far, as there is no gdb file modified multiple times: Got it, thank you for the explanation, Kazu. I would suggest merging this patch after Sven's patch, the gdb-10.2/gdb/Makefile.in may be the best choice, and then your patch would look like this: +tar xvzmf gdb-10.2.tar.gz \ + gdb-10.2/gdb/Makefile.in + +exit 0 + $ grep ^+++ gdb-10.2.patch | sort | uniq -c 1 +++ gdb-10.2/gdb/ada-lang.c 1 +++ gdb-10.2/gdb/cli/cli-cmds.c 1 +++ gdb-10.2/gdb/completer.c 1 +++ gdb-10.2/gdb/defs.h 1 +++ gdb-10.2/gdb/dwarf2/read.c 1 +++ gdb-10.2/gdb/main.c 2 +++ gdb-10.2/gdb/Makefile.in 1 +++ gdb-10.2/gdb/objfiles.h 1 +++ gdb-10.2/gdb/printcmd.c 1 +++ gdb-10.2/gdb/psymtab.c 1 +++ gdb-10.2/gdb/symfile.c 1 +++ gdb-10.2/gdb/symtab.c 1 +++ gdb-10.2/gdb/ui-file.h 1 +++ gdb-10.2/gdb/xml-syscall.c 1 +++ gdb-10.2/libiberty/Makefile.in 1 +++ gdb-10.2/Makefile.in 1 +++ gdb-10.2/opcodes/i386-dis.c 1 +++ gdb-10.2/readline/readline/misc.c 1 +++ gdb-10.2/readline/readline/readline.h 1 +++ gdb-10.2/readline/readline/rltypedefs.h 1 +++ gdb-10.2/readline/readline/util.c What do you think?

Thanks. Lianbo $ grep ^+++ gdb-10.2.patch | sort | uniq -c 1 +++ gdb-10.2/gdb/ada-lang.c 1 +++ gdb-10.2/gdb/cli/cli-cmds.c 1 +++ gdb-10.2/gdb/completer.c 1 +++ gdb-10.2/gdb/defs.h 1 +++ gdb-10.2/gdb/dwarf2/read.c 1 +++ gdb-10.2/gdb/main.c 1 +++ gdb-10.2/gdb/Makefile.in 1 +++ gdb-10.2/gdb/objfiles.h 1 +++ gdb-10.2/gdb/printcmd.c 1 +++ gdb-10.2/gdb/psymtab.c 1 +++ gdb-10.2/gdb/symfile.c 1 +++ gdb-10.2/gdb/symtab.c 1 +++ gdb-10.2/gdb/ui-file.h 1 +++ gdb-10.2/gdb/xml-syscall.c 1 +++ gdb-10.2/libiberty/Makefile.in 1 +++ gdb-10.2/Makefile.in 1 +++ gdb-10.2/opcodes/i386-dis.c 1 +++ gdb-10.2/readline/readline/misc.c 1 +++ gdb-10.2/readline/readline/readline.h 1 +++ gdb-10.2/readline/readline/rltypedefs.h 1 +++ gdb-10.2/readline/readline/util.c Thanks, Kazu > > Thanks. > Lianbo > > > + > +exit 0 > + > --- gdb-10.2/Makefile.in.orig > +++ gdb-10.2/Makefile.in > @@ -340,6 +340,9 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ > -- > 2.27.0 > >