diff --git a/debian/patches/Always-update-man-pages-if-needed.patch b/debian/patches/Always-update-man-pages-if-needed.patch new file mode 100644 index 0000000..32047c3 --- /dev/null +++ b/debian/patches/Always-update-man-pages-if-needed.patch @@ -0,0 +1,65 @@ +From e4b6018e5237bbfb545adee251e531f4a5ef2d45 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Wed, 11 Nov 2020 11:56:40 +0100 +Subject: Always update man pages if needed + +Removing the man pages and not activating the automake maintainer mode +let the build fail: + +``` +make[4]: Entering directory '/<>/ibis/doc' +./ibis_pod2man ibis.1 +Usage ./ibis_pod2man podFile [outFile] +Given podFile:ibis.1 extension != .pod +make[4]: *** [Makefile:568: ibis.1] Error 1 +``` + +So always update the man pages if needed. + +Signed-off-by: Benjamin Drung +--- + ibdm/doc/Makefile.am | 2 +- + ibis/doc/Makefile.am | 2 +- + ibmgtsim/doc/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ibdm/doc/Makefile.am b/ibdm/doc/Makefile.am +index bc28a03..e651510 100644 +--- a/ibdm/doc/Makefile.am ++++ b/ibdm/doc/Makefile.am +@@ -46,7 +46,7 @@ EXTRA_DIST = \ + ibtopodiff.pod ibtopodiff.1 \ + ibdm_pod2man + +-%.1: @MAINTAINER_MODE_TRUE@ %.pod ++%.1: %.pod + $(srcdir)/ibdm_pod2man $< $@ + if test ! $@ -ef $(srcdir)/$@ ; then cp -f $@ $(srcdir)/$@; fi + +diff --git a/ibis/doc/Makefile.am b/ibis/doc/Makefile.am +index 5509865..24dc392 100644 +--- a/ibis/doc/Makefile.am ++++ b/ibis/doc/Makefile.am +@@ -34,6 +34,6 @@ man_MANS = ibis.1 + + EXTRA_DIST = ibis.pod ibis.1 + +-%.1: @MAINTAINER_MODE_TRUE@ %.pod ++%.1: %.pod + $(srcdir)/ibis_pod2man $< $@ + if test ! $@ -ef $(srcdir)/$@ ; then cp -f $@ $(srcdir)/$@; fi +diff --git a/ibmgtsim/doc/Makefile.am b/ibmgtsim/doc/Makefile.am +index a9c0237..b7a6969 100644 +--- a/ibmgtsim/doc/Makefile.am ++++ b/ibmgtsim/doc/Makefile.am +@@ -37,6 +37,6 @@ EXTRA_DIST = \ + IBMgtSim.pod RunSimTest.pod ibmsquit.pod mkSimNodeDir.pod ibmssh.pod \ + ibmgtsim_pod2man + +-%.1: @MAINTAINER_MODE_TRUE@ %.pod ++%.1: %.pod + $(srcdir)/ibmgtsim_pod2man $< $@ + if test ! $@ -ef $(srcdir)/$@ ; then cp -f $@ $(srcdir)/$@; fi +-- +2.25.1 + diff --git a/debian/patches/Fix-generating-man-pages-in-place.patch b/debian/patches/Fix-generating-man-pages-in-place.patch new file mode 100644 index 0000000..510216a --- /dev/null +++ b/debian/patches/Fix-generating-man-pages-in-place.patch @@ -0,0 +1,44 @@ +From 59f28cd388c156b2eb450d0195d7a7a6570caa9e Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Wed, 11 Nov 2020 12:33:29 +0100 +Subject: Fix generating man pages in place + +Building the man pages fail in place: + +``` +make[4]: Entering directory '/<>/ibis/doc' +./ibis_pod2man ibis.pod ibis.1 +cp -f ibis.1 ./ibis.1 +cp: 'ibis.1' and './ibis.1' are the same file +make[4]: *** [Makefile:569: ibis.1] Error 1 +``` + +Signed-off-by: Benjamin Drung +--- + ibis/doc/Makefile.am | 2 +- + ibmgtsim/doc/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ibis/doc/Makefile.am b/ibis/doc/Makefile.am +index 9f75692..5509865 100644 +--- a/ibis/doc/Makefile.am ++++ b/ibis/doc/Makefile.am +@@ -36,4 +36,4 @@ EXTRA_DIST = ibis.pod ibis.1 + + %.1: @MAINTAINER_MODE_TRUE@ %.pod + $(srcdir)/ibis_pod2man $< $@ +- cp -f $@ $(srcdir)/$@ ++ if test ! $@ -ef $(srcdir)/$@ ; then cp -f $@ $(srcdir)/$@; fi +diff --git a/ibmgtsim/doc/Makefile.am b/ibmgtsim/doc/Makefile.am +index 24b411c..a9c0237 100644 +--- a/ibmgtsim/doc/Makefile.am ++++ b/ibmgtsim/doc/Makefile.am +@@ -39,4 +39,4 @@ EXTRA_DIST = \ + + %.1: @MAINTAINER_MODE_TRUE@ %.pod + $(srcdir)/ibmgtsim_pod2man $< $@ +- cp -f $@ $(srcdir)/$@ ++ if test ! $@ -ef $(srcdir)/$@ ; then cp -f $@ $(srcdir)/$@; fi +-- +2.25.1 + diff --git a/debian/patches/do_not_use_tmp.patch b/debian/patches/do_not_use_tmp.patch index 686b86b..e76a442 100644 --- a/debian/patches/do_not_use_tmp.patch +++ b/debian/patches/do_not_use_tmp.patch @@ -10,7 +10,6 @@ ibdiag/doc/ibdiagpath.pod | 3 ++- ibdiag/src/ibdebug_if.tcl | 2 +- ibdiag/src/ibdiagui.tcl | 2 +- - ibdm/doc/ibdmchk.1 | 8 ++++---- ibdm/doc/ibdmchk.pod | 8 ++++---- ibdm/ibdm/LinkCover.cpp | 6 +++--- ibdm/ibdm/SubnMgt.cpp | 8 ++++---- @@ -20,7 +19,6 @@ ibis/src/ibis_wrap.c | 2 +- ibis/src/ibissh_wrap.cpp | 2 +- ibis/tests/ibcr_test.tcl | 2 +- - ibmgtsim/doc/IBMgtSim.1 | 2 +- ibmgtsim/doc/IBMgtSim.pod | 2 +- ibmgtsim/src/client.cpp | 2 +- ibmgtsim/src/sim.cpp | 4 ++-- @@ -29,7 +27,7 @@ ibmgtsim/tests/init.test.tcl | 8 ++++---- ibmgtsim/utils/IBMgtSim | 4 ++-- ibmgtsim/utils/RunSimTest | 2 +- - 26 files changed, 62 insertions(+), 61 deletions(-) + 24 files changed, 57 insertions(+), 56 deletions(-) diff --git a/ibdiag/demo/sm-single-master.tcl b/ibdiag/demo/sm-single-master.tcl index 5b414c8..3dd5c65 100644 @@ -146,38 +144,6 @@ set r "" LogAppend "-I-Invoking ibdiagnet ...." # puts "-I- Invoking ibdiagnet ...." -diff --git a/ibdm/doc/ibdmchk.1 b/ibdm/doc/ibdmchk.1 -index 7537473..b725702 100644 ---- a/ibdm/doc/ibdmchk.1 -+++ b/ibdm/doc/ibdmchk.1 -@@ -186,7 +186,7 @@ Use enhanced routing algorithm when \s-1LMC\s0 > 0 and report the resulting path - .IX Item "-r|--roots A file with all the roots node names (one on each line)." - .SH "VERIFICATION MODE DESCRIPTION" - .IX Header "VERIFICATION MODE DESCRIPTION" --After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /tmp in older OpenSM versions). ibdiagnet is also producing the same files in its output directory. -+After the cluster is built and OpenSM is run (using flag \-D 0x43) it reports the subnet and \s-1FDB\s0 tables into the files osm\-subnet.lst, osm.fdbs and osm.fdbs in /var/log/ (or subnet.lst, osm.fdbs and osm.mcfdbs into /var/cache/ibutils in older OpenSM versions). ibdiagnet is also producing the same files in its output directory. - Based on these files the utility checks all \s-1CA\s0 to \s-1CA\s0 connectivity. Further analysis for credit deadlock potential is performed and reported. - In case of an \s-1LMC\s0 > 0 it reports histograms for how many systems and nodes are common between the different paths for the same port pairs. - .SH "ARGUMENTS" -@@ -208,15 +208,15 @@ Provides this help message - .RE - .IP "\-s|\-\-subnet " - .IX Item "-s|--subnet " --OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /tmp/subnet.lst) -+OpenSM subnet.lst file (default is /var/log/osm\-subnet.lst or /var/cache/ibutils/subnet.lst) - .RE - .IP "\-f|\-\-fdb " - .IX Item "-f|--fdb " --OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /tmp/osm.fdbs). -+OpenSM dump of Ucast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.fdbs or /var/cache/ibutils/osm.fdbs). - .RE - .IP "\-m|\-\-mcfdb " - .IX Item "-m|--mcfdb " --OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /tmp/osm.mcfdbs). -+OpenSM dump of Multicast \s-1LFDB\s0. Use \-D 0x41 to generate it (default is /var/log/osm.mcfdbs or /var/cache/ibutils/osm.mcfdbs). - .RE - .IP "\-c|\-\-psl " - .IX Item "-c|--psl " diff --git a/ibdm/doc/ibdmchk.pod b/ibdm/doc/ibdmchk.pod index dabfafa..ed85818 100644 --- a/ibdm/doc/ibdmchk.pod @@ -430,19 +396,6 @@ ibis_init set availPorts [ibis_get_local_ports_info] -diff --git a/ibmgtsim/doc/IBMgtSim.1 b/ibmgtsim/doc/IBMgtSim.1 -index e8ac646..626b956 100644 ---- a/ibmgtsim/doc/IBMgtSim.1 -+++ b/ibmgtsim/doc/IBMgtSim.1 -@@ -158,7 +158,7 @@ A tcl file to be sourced after the fabric is setup. - .RE - .IP "\-l log-file" - .IX Item "-l log-file" --Set the log file of the simulator (default is /tmp/ibsim.log) -+Set the log file of the simulator (default is /var/cache/ibutils/ibsim.log) - .RE - .IP "\-p server-port" - .IX Item "-p server-port" diff --git a/ibmgtsim/doc/IBMgtSim.pod b/ibmgtsim/doc/IBMgtSim.pod index f9b422f..ee3e2a8 100644 --- a/ibmgtsim/doc/IBMgtSim.pod diff --git a/debian/patches/series b/debian/patches/series index be6c79d..1a0577b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,5 @@ makefile_dependencies.patch cross.patch gcc-10.patch +Fix-generating-man-pages-in-place.patch +Always-update-man-pages-if-needed.patch diff --git a/debian/rules b/debian/rules index d0c104f..f294081 100755 --- a/debian/rules +++ b/debian/rules @@ -16,3 +16,7 @@ override_dh_auto_install: dh_auto_install chmod ogu-x debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ibdm1.5.7/ibnl/*.ibnl + +override_dh_auto_clean: + dh_auto_clean + rm -f $(shell find -name '*.pod' | sed 's/\.pod/.1/')