[PATCH] Makefile: Remove version from /usr/share/makedumpfile
Version specific paths doesn't make sense at /usr/share/makedumpfile. This assumes you will have only one version installed which on a normal system it makes sense and devs can always specify different DESTDIR per versions. Fixes: #10 Signed-off-by: Leonidas Spyropoulos --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 548e5b7..f6ecbe2 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,6 @@ install: install -m 755 -t ${DESTDIR}/usr/sbin makedumpfile $(VPATH)makedumpfile-R.pl install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8 install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5 - mkdir -p ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts - install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/usr/share/makedumpfile-${VERSION}/makedumpfile.conf.sample - install -m 644 -t ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts/ $(VPATH)eppic_scripts/* + mkdir -p ${DESTDIR}/usr/share/makedumpfile/eppic_scripts + install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/usr/share/makedumpfile/makedumpfile.conf.sample + install -m 644 -t ${DESTDIR}/usr/share/makedumpfile/eppic_scripts/ $(VPATH)eppic_scripts/* -- 2.38.1 ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
Re: [ANNOUNCE] makedumpfile 1.7.1
On 18/04/2022 06:03, HAGIO KAZUHITO(萩尾 一仁) wrote: Hi, I'm pleased to announce the release of makedumpfile 1.7.1. Thank you everyone for your help to maintain this tool. Download: The latest makedumpfile can be downloaded from the following URL. https://github.com/makedumpfile/makedumpfile/releases Hi Hagio, I maintain the package in Arch Linux and noticed that you are signing the git tag but not the commit message. Would you be able to sign both next time so I can switch to validate the source using your public key? Arch Linux packaging tool (pacman) supports this natively and it would help maintain the chain of trust. It would also be useful to mention your public key in the README (along with other's PGP keys who might be tagging releases) Cheers, -- Leonidas Spyropoulos PGP: 59E43E106B247368 OpenPGP_0x59E43E106B247368.asc Description: OpenPGP public key OpenPGP_signature Description: OpenPGP digital signature ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
[PATCH v2 1/1] Simplify the generation of man pages
Use `sed` to simplify the man pages generation. Keep the .in files intact during make and generate the actual man pages with sed. Additionally package tools already gz the man pages during install so it doesn't really need to do that during make and it breaks reproducibility of the package due to timestamps on files. Motivation: https://reproducible-builds.org Signed-off-by: Leonidas Spyropoulos --- Makefile | 20 +-- makedumpfile.8 => makedumpfile.8.in | 2 +- makedumpfile.conf.5 => makedumpfile.conf.5.in | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) rename makedumpfile.8 => makedumpfile.8.in (99%) rename makedumpfile.conf.5 => makedumpfile.conf.5.in (99%) diff --git a/Makefile b/Makefile index 9f9fd22..f118b31 100644 --- a/Makefile +++ b/Makefile @@ -112,26 +112,24 @@ $(OBJ_ARCH): $(SRC_ARCH) makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) - echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 - grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 - mv temp.8 makedumpfile.8 - gzip -c ./makedumpfile.8 > ./makedumpfile.8.gz - echo .TH MAKEDUMPFILE.CONF 5 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.5 - grep -v "^.TH MAKEDUMPFILE.CONF 5" $(VPATH)makedumpfile.conf.5 >> temp.5 - mv temp.5 makedumpfile.conf.5 - gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz + @sed -e "s/@DATE@/$(DATE)/" \ +-e "s/@VERSION@/$(VERSION)/" \ +$(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8 + @sed -e "s/@DATE@/$(DATE)/" \ +-e "s/@VERSION@/$(VERSION)/" \ +$(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5 eppic_makedumpfile.so: extension_eppic.c $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo clean: - rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz + rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5 install: install -m 755 -d ${DESTDIR}/usr/sbin ${DESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man/man8 ${DESTDIR}/etc install -m 755 -t ${DESTDIR}/usr/sbin makedumpfile $(VPATH)makedumpfile-R.pl - install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8.gz - install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5.gz + install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8 + install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5 install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/etc/makedumpfile.conf.sample mkdir -p ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts install -m 644 -t ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts/ $(VPATH)eppic_scripts/* diff --git a/makedumpfile.8 b/makedumpfile.8.in similarity index 99% rename from makedumpfile.8 rename to makedumpfile.8.in index ce8c700..d22588e 100644 --- a/makedumpfile.8 +++ b/makedumpfile.8.in @@ -1,4 +1,4 @@ -.TH MAKEDUMPFILE 8 "8 Nov 2021" "makedumpfile v1.7.0++" "Linux System Administrator's Manual" +.TH MAKEDUMPFILE 8 "@DATE@" "makedumpfile v@VERSION@" "Linux System Administrator's Manual" .SH NAME makedumpfile \- make a small dumpfile of kdump .SH SYNOPSIS diff --git a/makedumpfile.conf.5 b/makedumpfile.conf.5.in similarity index 99% rename from makedumpfile.conf.5 rename to makedumpfile.conf.5.in index 0f1a49b..54e1be8 100644 --- a/makedumpfile.conf.5 +++ b/makedumpfile.conf.5.in @@ -1,4 +1,4 @@ -.TH MAKEDUMPFILE.CONF 5 "8 Nov 2021" "makedumpfile v1.7.0++" "Linux System Administrator's Manual" +.TH MAKEDUMPFILE.CONF 5 "@DATE@" "makedumpfile v@VERSION@" "Linux System Administrator's Manual" .SH NAME makedumpfile.conf \- The filter configuration file for makedumpfile(8). .SH DESCRIPTION -- 2.35.1 ___ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
[PATCH 1/1] Simplify the generation of man pages
Use `sed` to simplify the man pages generation. Keep the .in files intact during make and generate the actual man pages with sed. Additionally package tools already gz the man pages during install so it doesn't really need to do that during make and it breaks reproducibility of the package due to timestamps on files. Motivation: https://reproducible-builds.org Signed-off-by: Leonidas Spyropoulos --- Makefile | 20 +- makedumpfile.8.in | 692 + makedumpfile.conf.5.in | 419 + 3 files changed, 1120 insertions(+), 11 deletions(-) create mode 100644 makedumpfile.8.in create mode 100644 makedumpfile.conf.5.in diff --git a/Makefile b/Makefile index 9f9fd22..f118b31 100644 --- a/Makefile +++ b/Makefile @@ -112,26 +112,24 @@ $(OBJ_ARCH): $(SRC_ARCH) makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS) - echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 - grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 - mv temp.8 makedumpfile.8 - gzip -c ./makedumpfile.8 > ./makedumpfile.8.gz - echo .TH MAKEDUMPFILE.CONF 5 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.5 - grep -v "^.TH MAKEDUMPFILE.CONF 5" $(VPATH)makedumpfile.conf.5 >> temp.5 - mv temp.5 makedumpfile.conf.5 - gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz + @sed -e "s/@DATE@/$(DATE)/" \ +-e "s/@VERSION@/$(VERSION)/" \ +$(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8 + @sed -e "s/@DATE@/$(DATE)/" \ +-e "s/@VERSION@/$(VERSION)/" \ +$(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5 eppic_makedumpfile.so: extension_eppic.c $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo clean: - rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz + rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5 install: install -m 755 -d ${DESTDIR}/usr/sbin ${DESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man/man8 ${DESTDIR}/etc install -m 755 -t ${DESTDIR}/usr/sbin makedumpfile $(VPATH)makedumpfile-R.pl - install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8.gz - install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5.gz + install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8 + install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5 install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/etc/makedumpfile.conf.sample mkdir -p ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts install -m 644 -t ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts/ $(VPATH)eppic_scripts/* diff --git a/makedumpfile.8.in b/makedumpfile.8.in new file mode 100644 index 000..d22588e --- /dev/null +++ b/makedumpfile.8.in @@ -0,0 +1,692 @@ +.TH MAKEDUMPFILE 8 "@DATE@" "makedumpfile v@VERSION@" "Linux System Administrator's Manual" +.SH NAME +makedumpfile \- make a small dumpfile of kdump +.SH SYNOPSIS +\fBmakedumpfile\fR[\fIOPTION\fR] [\-x \fIVMLINUX\fR|\-i \fIVMCOREINFO\fR] \fIVMCORE\fR \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-F [\fIOPTION\fR] [\-x \fIVMLINUX\fR|\-i \fIVMCOREINFO\fR] \fIVMCORE\fR +.br +\fBmakedumpfile\fR [\fIOPTION\fR] \-x \fIVMLINUX\fR [\-\-config \fIFILTERCONFIGFILE\fR] [\-\-eppic \fIEPPICMACRO\fR] \fIVMCORE\fR \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-R \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-\-split [\fIOPTION\fR] [\-x \fIVMLINUX\fR|\-i \fIVMCOREINFO\fR] \fIVMCORE\fR \fIDUMPFILE1\fR \fIDUMPFILE2\fR [\fIDUMPFILE3\fR ..] +.br +\fBmakedumpfile\fR [\fIOPTION\fR] [\-x \fIVMLINUX\fR|\-i \fIVMCOREINFO\fR] \-\-num\-threads \fITHREADNUM\fR \fIVMCORE\fR \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-\-reassemble \fIDUMPFILE1\fR \fIDUMPFILE2\fR [\fIDUMPFILE3\fR ..] \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-g \fIVMCOREINFO\fR \-x \fIVMLINUX\fR +.br +\fBmakedumpfile\fR[\fIOPTION\fR] [\-\-xen-syms \fIXEN-SYMS\fR|\-\-xen-vmcoreinfo \fIVMCOREINFO\fR] \fIVMCORE\fR \fIDUMPFILE\fR +.br +\fBmakedumpfile\fR \-\-dump-dmesg [\-\-partial-dmesg] [\-x \fIVMLINUX\fR|\-i \fIVMCOREINFO\fR] \fIVMCORE\fR \fILOGFILE\fR +.br +\fBmakedumpfile\fR[\fIOPTION\fR] \-x \fIVMLINUX\fR \-\-diskset=\fIVMCORE1\fR \-\-diskset=\fIVMCORE2\fR [\-\-diskset=\fIVMCORE3\fR ..] \fIDUMPFILE\fR +.br +.B makedumpfile +\-h +.br +.B makedumpfile +\-v +.br +.SH DESCRIPTION +.PP +With kdump, the memory image of the first kernel (called "panicked kernel