[Pkg-ofed-commits] [infiniband-diags] 06/07: Imported Debian patch 1.6.1-0.1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:17:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository infiniband-diags.
commit 4b1dadda6916a9739ec167c7c3fef66011532ec7
Merge: 1f1dbdd bcea6f9
Author: Roland Dreier <rbd at debian.org>
Date: Mon Oct 15 11:06:51 2012 -0700
Imported Debian patch 1.6.1-0.1
AUTHORS | 4 +
COPYING | 12 +-
ChangeLog | 7219 ++++++++++++++++-
Makefile.am | 196 +-
Makefile.in | 1669 ++--
README | 568 +-
aclocal.m4 | 8252 +-------------------
autogen.sh | 6 +
config.h.in | 19 +-
config/compile | 142 +
config/config.guess | 753 +-
config/config.sub | 329 +-
config/depcomp | 93 +-
config/install-sh | 514 +-
aclocal.m4 => config/libtool.m4 | 1530 +---
config/ltmain.sh | 75 +-
config/ltoptions.m4 | 368 +
config/ltsugar.m4 | 123 +
config/ltversion.m4 | 23 +
config/lt~obsolete.m4 | 92 +
config/missing | 61 +-
configure | 1142 ++-
configure.in | 171 +-
debian/README.source | 2 +
debian/changelog | 36 +-
debian/control | 34 +-
debian/infiniband-diags.install | 2 +
debian/infiniband-diags.manpages | 2 -
debian/libibnetdisc-dev.install | 3 +
debian/libibnetdisc5.install | 1 +
debian/patches/00-remove-rpath.patch | 38 -
debian/patches/02-remove-rpath-makefile.in.patch | 44 -
debian/patches/06-ibcheckerrs-bashisms.patch | 6 +-
debian/patches/30-ibhosts-bashisms.patch | 8 +-
debian/patches/32-ibrouters-bashisms.patch | 8 +-
debian/patches/34-ibswitches-bashisms.patch | 8 +-
debian/patches/35-set_nodedesc-bashisms.patch | 30 -
debian/patches/series | 3 -
debian/rules | 33 +-
debian/set_nodedesc.8 | 28 -
doc/README.rst | 105 +
doc/generate | 30 +
doc/man/check_lft_balance.8 | 73 +
doc/man/check_lft_balance.8.in | 73 +
doc/man/dump_lfts.8 | 177 +
doc/man/dump_lfts.8.in | 177 +
doc/man/dump_mfts.8 | 170 +
doc/man/dump_mfts.8.in | 170 +
doc/man/ibaddr.8 | 207 +
doc/man/ibaddr.8.in | 207 +
doc/man/ibcacheedit.8 | 86 +
doc/man/ibcacheedit.8.in | 86 +
doc/man/ibccconfig.8 | 197 +
doc/man/ibccconfig.8.in | 197 +
doc/man/ibccquery.8 | 194 +
doc/man/ibccquery.8.in | 194 +
doc/man/ibclearcounters.8.in | 101 +
doc/man/ibfindnodesusing.8 | 123 +
doc/man/ibfindnodesusing.8.in | 123 +
doc/man/ibhosts.8 | 169 +
doc/man/ibhosts.8.in | 169 +
doc/man/ibidsverify.8 | 82 +
doc/man/ibidsverify.8.in | 82 +
doc/man/iblinkinfo.8 | 315 +
doc/man/iblinkinfo.8.in | 315 +
doc/man/ibnetdiscover.8 | 393 +
doc/man/ibnetdiscover.8.in | 393 +
doc/man/ibnodes.8 | 169 +
doc/man/ibnodes.8.in | 169 +
doc/man/ibping.8 | 178 +
doc/man/ibping.8.in | 178 +
doc/man/ibportstate.8 | 259 +
doc/man/ibportstate.8.in | 259 +
doc/man/ibqueryerrors.8 | 327 +
doc/man/ibqueryerrors.8.in | 327 +
doc/man/ibroute.8 | 235 +
doc/man/ibroute.8.in | 235 +
doc/man/ibrouters.8 | 169 +
doc/man/ibrouters.8.in | 169 +
doc/man/ibstat.8 | 129 +
doc/man/ibstat.8.in | 129 +
doc/man/ibstatus.8 | 78 +
doc/man/ibstatus.8.in | 78 +
doc/man/ibswitches.8 | 169 +
doc/man/ibswitches.8.in | 169 +
doc/man/ibsysstat.8 | 184 +
doc/man/ibsysstat.8.in | 184 +
doc/man/ibtracert.8 | 268 +
doc/man/ibtracert.8.in | 268 +
doc/man/infiniband-diags.8 | 447 ++
doc/man/infiniband-diags.8.in | 447 ++
doc/man/perfquery.8 | 305 +
doc/man/perfquery.8.in | 305 +
doc/man/saquery.8 | 387 +
doc/man/saquery.8.in | 387 +
doc/man/sminfo.8 | 218 +
doc/man/sminfo.8.in | 218 +
doc/man/smpdump.8 | 213 +
doc/man/smpdump.8.in | 213 +
doc/man/smpquery.8 | 292 +
doc/man/smpquery.8.in | 292 +
doc/man/vendstat.8 | 231 +
doc/man/vendstat.8.in | 231 +
doc/rst/check_lft_balance.8.in.rst | 52 +
doc/rst/common/opt_C.rst | 4 +
doc/rst/common/opt_D.rst | 14 +
doc/rst/common/opt_D_with_param.rst | 14 +
doc/rst/common/opt_G.rst | 4 +
doc/rst/common/opt_G_with_param.rst | 4 +
doc/rst/common/opt_K.rst | 4 +
doc/rst/common/opt_L.rst | 4 +
doc/rst/common/opt_P.rst | 4 +
doc/rst/common/opt_V.rst | 4 +
doc/rst/common/opt_cache.rst | 7 +
doc/rst/common/opt_d.rst | 6 +
doc/rst/common/opt_diff.rst | 9 +
doc/rst/common/opt_diffcheck.rst | 13 +
doc/rst/common/opt_e.rst | 3 +
doc/rst/common/opt_h.rst | 4 +
doc/rst/common/opt_load-cache.rst | 8 +
doc/rst/common/opt_node_name_map.rst | 6 +
doc/rst/common/opt_o-outstanding_smps.rst | 7 +
doc/rst/common/opt_s.rst | 4 +
doc/rst/common/opt_t.rst | 4 +
doc/rst/common/opt_v.rst | 6 +
doc/rst/common/opt_y.rst | 6 +
doc/rst/common/opt_z-config.rst | 6 +
doc/rst/common/sec_config-file.rst | 10 +
doc/rst/common/sec_node-name-map.rst | 43 +
doc/rst/common/sec_portselection.rst | 24 +
doc/rst/common/sec_topology-file.rst | 89 +
doc/rst/dump_lfts.8.in.rst | 73 +
doc/rst/dump_mfts.8.in.rst | 64 +
doc/rst/ibaddr.8.in.rst | 101 +
doc/rst/ibcacheedit.8.in.rst | 59 +
doc/rst/ibccconfig.8.in.rst | 94 +
doc/rst/ibccquery.8.in.rst | 90 +
doc/rst/ibclearcounters.8.in.rst | 51 +
doc/rst/ibfindnodesusing.8.in.rst | 54 +
doc/rst/ibhosts.8.in.rst | 56 +
doc/rst/ibidsverify.8.in.rst | 63 +
doc/rst/iblinkinfo.8.in.rst | 132 +
doc/rst/ibnetdiscover.8.in.rst | 115 +
doc/rst/ibnodes.8.in.rst | 58 +
doc/rst/ibping.8.in.rst | 86 +
doc/rst/ibportstate.8.in.rst | 125 +
doc/rst/ibqueryerrors.8.in.rst | 156 +
doc/rst/ibqueryerrors.8.in.rst.orig | 153 +
doc/rst/ibroute.8.in.rst | 109 +
doc/rst/ibrouters.8.in.rst | 57 +
doc/rst/ibstat.8.in.rst | 83 +
doc/rst/ibstatus.8.in.rst | 54 +
doc/rst/ibswitches.8.in.rst | 55 +
doc/rst/ibsysstat.8.in.rst | 87 +
doc/rst/ibtracert.8.in.rst | 108 +
doc/rst/infiniband-diags.8.in.rst | 166 +
doc/rst/perfquery.8.in.rst | 177 +
doc/rst/saquery.8.in.rst | 207 +
doc/rst/sminfo.8.in.rst | 102 +
doc/rst/smpdump.8.in.rst | 104 +
doc/rst/smpquery.8.in.rst | 115 +
doc/rst/vendstat.8.in.rst | 120 +
etc/error_thresholds | 16 +
etc/ibdiag.conf | 22 +
include/ibdiag_common.h | 132 +-
include/ibdiag_version.h | 2 +-
include/ibnetdiscover.h | 107 -
infiniband-diags.spec | 145 +-
infiniband-diags.spec.in | 139 +-
libibnetdisc/Makefile.am | 52 +
libibnetdisc/Makefile.in | 755 ++
libibnetdisc/include/infiniband/ibnetdisc.h | 253 +
.../include/infiniband/ibnetdisc_osd.h | 21 +-
libibnetdisc/libibnetdisc.ver | 9 +
libibnetdisc/man/ibnd_debug.3 | 2 +
libibnetdisc/man/ibnd_destroy_fabric.3 | 2 +
libibnetdisc/man/ibnd_discover_fabric.3 | 65 +
libibnetdisc/man/ibnd_find_node_dr.3 | 2 +
libibnetdisc/man/ibnd_find_node_guid.3 | 21 +
libibnetdisc/man/ibnd_iter_nodes.3 | 20 +
libibnetdisc/man/ibnd_iter_nodes_type.3 | 2 +
libibnetdisc/man/ibnd_show_progress.3 | 2 +
libibnetdisc/src/chassis.c | 1344 ++++
include/grouping.h => libibnetdisc/src/chassis.h | 62 +-
libibnetdisc/src/ibnetdisc.c | 904 +++
libibnetdisc/src/ibnetdisc_cache.c | 954 +++
libibnetdisc/src/internal.h | 108 +
libibnetdisc/src/libibnetdisc.map | 21 +
libibnetdisc/src/query_smp.c | 288 +
libibnetdisc/test/testleaks.c | 174 +
man/check_lft_balance.8 | 42 -
man/dump_lfts.8 | 50 -
man/dump_mfts.8 | 45 -
man/ibaddr.8 | 109 -
man/ibcheckportwidth.8 | 2 +-
man/ibdatacounters.8 | 3 +-
man/ibfindnodesusing.8 | 30 -
man/ibhosts.8 | 31 -
man/ibidsverify.8 | 36 -
man/iblinkinfo.8 | 52 -
man/ibnetdiscover.8 | 233 -
man/ibnodes.8 | 31 -
man/ibping.8 | 84 -
man/ibportstate.8 | 113 -
man/ibprintrt.8 | 3 +-
man/ibprintswitch.8 | 15 +-
man/ibqueryerrors.8 | 63 -
man/ibroute.8 | 119 -
man/ibrouters.8 | 31 -
man/ibstat.8 | 110 -
man/ibstatus.8 | 41 -
man/ibswitches.8 | 31 -
man/ibswportwatch.8 | 8 +-
man/ibsysstat.8 | 83 -
man/ibtracert.8 | 112 -
man/perfquery.8 | 124 -
man/saquery.8 | 132 -
man/sminfo.8 | 105 -
man/smpdump.8 | 98 -
man/smpquery.8 | 113 -
man/vendstat.8 | 84 -
scripts/IBswcountlimits.pm | 56 +-
scripts/check_lft_balance.pl | 162 +-
scripts/dump_lfts.sh | 6 +-
scripts/dump_mfts.sh | 10 +-
scripts/ibcheckerrors | 9 +-
scripts/ibcheckerrors.in | 9 +-
scripts/ibcheckerrs | 84 +-
scripts/ibcheckerrs.in | 84 +-
scripts/ibchecknet | 11 +-
scripts/ibchecknet.in | 11 +-
scripts/ibchecknode | 10 +-
scripts/ibchecknode.in | 10 +-
scripts/ibcheckport | 21 +-
scripts/ibcheckport.in | 21 +-
scripts/ibcheckportstate | 10 +-
scripts/ibcheckportstate.in | 10 +-
scripts/ibcheckportwidth | 12 +-
scripts/ibcheckportwidth.in | 12 +-
scripts/ibcheckstate | 8 +-
scripts/ibcheckstate.in | 8 +-
scripts/ibcheckwidth | 7 +-
scripts/ibcheckwidth.in | 7 +-
scripts/ibclearcounters | 3 +-
scripts/ibclearcounters.in | 3 +-
scripts/ibclearerrors | 3 +-
scripts/ibclearerrors.in | 3 +-
scripts/ibdatacounters | 10 +-
scripts/ibdatacounters.in | 10 +-
scripts/ibdatacounts | 12 +-
scripts/ibdatacounts.in | 12 +-
scripts/ibdiscover.pl | 9 +
scripts/ibhosts | 8 +-
scripts/ibhosts.in | 8 +-
scripts/ibidsverify.pl | 50 +-
scripts/iblinkinfo.pl | 295 +-
scripts/iblinkinfo.pl.in | 42 +
scripts/ibnodes | 2 +-
scripts/ibnodes.in | 2 +-
scripts/ibprintca.pl | 9 +
scripts/ibprintrt.pl | 2 +
scripts/ibprintswitch.pl | 2 +
scripts/ibqueryerrors.pl | 199 +-
scripts/ibqueryerrors.pl.in | 41 +
scripts/ibrouters | 8 +-
scripts/ibrouters.in | 8 +-
scripts/ibstatus | 3 +-
scripts/ibswitches | 12 +-
scripts/ibswitches.in | 12 +-
scripts/set_nodedesc.sh | 5 +-
src/grouping.c | 787 --
src/ibaddr.c | 181 +-
src/ibcacheedit.c | 356 +
src/ibccconfig.c | 643 ++
src/ibccquery.c | 427 +
src/ibdiag_common.c | 964 ++-
src/iblinkinfo.c | 765 ++
src/ibnetdiscover.c | 1636 ++--
src/ibping.c | 245 +-
src/ibportstate.c | 914 ++-
src/ibqueryerrors.c | 1014 +++
src/ibroute.c | 336 +-
src/ibsendtrap.c | 199 +-
src/ibstat.c | 233 +-
src/ibsysstat.c | 306 +-
src/ibtracert.c | 445 +-
src/mcm_rereg_test.c | 232 +-
src/perfquery.c | 831 +-
src/saquery.c | 2151 +++--
src/sminfo.c | 170 +-
src/smpdump.c | 262 +-
src/smpquery.c | 392 +-
src/vendstat.c | 472 +-
293 files changed, 41914 insertions(+), 21363 deletions(-)
diff --cc debian/README.source
index 0000000,0000000..48b599a
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,2 @@@
++/usr/share/doc/dpatch/README.source.gz
++
diff --cc debian/changelog
index 3ca35cf,0000000..5b28f1d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,0 +1,54 @@@
- infiniband-diags (1.4.4-20090314-1.2) unstable; urgency=medium
++infiniband-diags (1.6.1-0.1) experimental; urgency=low
+
+ * Non-maintainer upload.
- * Fix bashisms in scripts/set_nodedesc.sh (closes: #581113).
++ * Acknowledge NMU.
++ * New upstream release.
++ * Bump Standards-Version to 3.9.4 (no changes).
+
- -- Michael Gilbert <mgilbert at debian.org> Mon, 22 Oct 2012 17:47:02 -0400
++ -- Roland Dreier <rbd at debian.org> Mon, 15 Oct 2012 11:06:51 -0700
++
++infiniband-diags (1.5.12-1) unstable; urgency=low
++
++ * New upstream release. OFED 1.5.4.
++
++ -- Ana Guerrero <ana at debian.org> Wed, 14 Mar 2012 09:51:17 +0100
++
++infiniband-diags (1.5.7-OFED-1.5.2-1) experimental; urgency=low
++
++ * New OFED release.
++ * debian/rules:
++ + Kill iblinkinfo.pl now that iblinkinfo is a binary.
++ + Kill rpath in iblinkinfo.
++ + Kill useless lintian overrides.
++ * debian/control:
++ + Bump Standards-Version to 3.9.1 (no changes).
++ + Move libopensm2-dev build-dep to libopensm-dev.
++ + Bump libibmad-dev and libibumad-dev build-deps.
++ + Remove automake build-dep.
++ + libibnetdisc3 -> libibnetdisc5 due to soname bump.
++
++ -- Julien BLACHE <jblache at debian.org> Thu, 04 Nov 2010 15:29:00 +0100
++
++infiniband-diags (1.5.5-1) unstable; urgency=low
++
++ * New upstream release (OFED 1.5)
++
++ -- Guy Coates <gmpc at sanger.ac.uk> Wed, 10 Feb 2010 11:30:07 +0000
+
+infiniband-diags (1.4.4-20090314-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Add new patch 02 to prevent using --rpath (Policy); renumber all patches
+ * Delete debian/lintian-overrides which is no longer neeeded (--rpath).
+ * Fix extended-description-is-probably-too-short (Lintian).
+
+ -- Jari Aalto <jari.aalto at cante.net> Thu, 19 Apr 2012 19:18:49 +0300
+
+infiniband-diags (1.4.4-20090314-1) unstable; urgency=low
+
+ * Initial release (Closes: #539803)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Wed, 21 Oct 2009 11:23:00 +0100
diff --cc debian/control
index 0be84f3,0000000..2b62ab1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,48 @@@
+Source: infiniband-diags
+Section: net
+Priority: extra
+Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
+Uploaders: Benoit Mortier <benoit.mortier at opensides.be>, Guy Coates <gmpc at sanger.ac.uk>, Mario Lang <mlang at debian.org>
- Build-Depends: debhelper (>= 9), autotools-dev, automake, chrpath, libibcommon-dev, libibumad-dev, libibmad-dev, libopensm2-dev (>=3.2.5)
- Standards-Version: 3.9.3.1
++Build-Depends: debhelper (>= 9), autotools-dev, automake, chrpath, libibumad-dev (>= 1.3.7-OFED-1.5.4), libibmad-dev (>= 1.3.8-OFED-1.5.4), libopensm-dev (>= 3.3.12-OFED-1.5.4)
++Standards-Version: 3.9.4
+Homepage: http://www.openfabrics.org
++DM-Upload-Allowed: yes
+
+Package: infiniband-diags
+Architecture: i386 ia64 amd64 powerpc
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libibnetdisc5 (= ${binary:Version})
+Description: InfiniBand diagnostic programs
+ InfiniBand is a switched fabric communications link used in
+ high-performance computing and enterprise data centers. Its features
+ include high throughput, low latency, quality of service and
+ failover, and it is designed to be scalable.
+ .
+ This package provides diagnostic programs and scripts needed to
+ diagnose an InfiniBand subnet.
++
++Package: libibnetdisc5
++Architecture: i386 ia64 amd64 powerpc
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: Infiniband diagnostics library
++ InfiniBand is a switched fabric communications link used in
++ high-performance computing and enterprise data centers. Its features
++ include high throughput, low latency, quality of service and
++ failover, and it is designed to be scalable.
++ .
++ This package provides libraries required by the InfiniBand
++ diagnostic programs.
++
++Package: libibnetdisc-dev
++Section: libdevel
++Architecture: i386 ia64 amd64 powerpc
++Depends: libibnetdisc5 (= ${binary:Version}), ${misc:Depends}
++Description: Infiniband diagnostics library headers
++ InfiniBand is a switched fabric communications link used in
++ high-performance computing and enterprise data centers. Its features
++ include high throughput, low latency, quality of service and
++ failover, and it is designed to be scalable.
++ .
++ This package provides development files required to build
++ applications aginast the libibnetdisc5 InfiniBand diagnostic
++ libraries.
++
diff --cc debian/infiniband-diags.install
index 0000000,0000000..e2523d7
new file mode 100644
--- /dev/null
+++ b/debian/infiniband-diags.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/sbin
++usr/share
diff --cc debian/libibnetdisc-dev.install
index 0000000,0000000..d1bffed
new file mode 100644
--- /dev/null
+++ b/debian/libibnetdisc-dev.install
@@@ -1,0 -1,0 +1,3 @@@
++usr/include/*
++usr/lib/lib*.a
++usr/lib/lib*.so
diff --cc debian/libibnetdisc5.install
index 0000000,0000000..d0dbfd1
new file mode 100644
--- /dev/null
+++ b/debian/libibnetdisc5.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib/lib*.so.*
diff --cc debian/patches/06-ibcheckerrs-bashisms.patch
index 1c50e5c,0000000..bce5c02
mode 100644,000000..100644
--- a/debian/patches/06-ibcheckerrs-bashisms.patch
+++ b/debian/patches/06-ibcheckerrs-bashisms.patch
@@@ -1,56 -1,0 +1,56 @@@
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckerrs script
+
+
+--- trunk/scripts/ibcheckerrs.in 2009-07-29 14:58:00.000000000 +0200
++++ trunk/scripts/ibcheckerrs.in.new 2009-12-20 19:13:14.000000000 +0100
+@@ -2,14 +2,14 @@
+
+ IBPATH=${IBPATH:- at IBSCRIPTPATH@}
+
+-function usage() {
++usage() {
+ echo Usage: `basename $0` "[-h] [-b] [-v] [-G] [-T <threshold_file>]" \
+ "[-s(how_thresholds)] [-N \| -nocolor] [-C ca_name] [-P ca_port]" \
+ "[-t(imeout) timeout_ms] <lid|guid> [<port>]"
+ exit -1
+ }
+
+-function green() {
++green() {
+ if [ "$bw" = "yes" ]; then
+ if [ "$verbose" = "yes" ]; then
+ echo $1
+@@ -17,19 +17,19 @@
+ return
+ fi
+ if [ "$verbose" = "yes" ]; then
+- echo -e "\\033[1;032m" $1 "\\033[0;39m"
++ printf "\\033[1;032m" $1 "\\033[0;39m"
+ fi
+ }
+
+-function red() {
++red() {
+ if [ "$bw" = "yes" ]; then
+ echo $1
+ return
+ fi
+- echo -e "\\033[1;031m" $1 "\\033[0;39m"
++ printf "\\033[1;031m" $1 "\\033[0;39m"
+ }
+
+-function show_thresholds() {
++show_thresholds() {
- echo "SymbolErrors=$SymbolErrors"
- echo "LinkRecovers=$LinkRecovers"
- echo "LinkDowned=$LinkDowned"
++ echo "SymbolErrorCounter=$SymbolErrorCounter"
++ echo "LinkErrorRecoveryCounter=$LinkErrorRecoveryCounter"
++ echo "LinkDownedCounter=$LinkDownedCounter"
+@@ -44,7 +44,7 @@
+ echo "VL15Dropped=$VL15Dropped"
+ }
+
+-function get_thresholds() {
++get_thresholds() {
+ . $1
+ }
+
diff --cc debian/patches/30-ibhosts-bashisms.patch
index d17fd71,0000000..ec061a4
mode 100644,000000..100644
--- a/debian/patches/30-ibhosts-bashisms.patch
+++ b/debian/patches/30-ibhosts-bashisms.patch
@@@ -1,15 -1,0 +1,17 @@@
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibhosts script
+
+
- --- trunk/scripts/ibhosts.in 2009-07-29 14:58:00.000000000 +0200
- +++ trunk/scripts/ibhosts.in.new 2009-12-20 19:28:45.000000000 +0100
++Index: infiniband-diags-1.6.1/scripts/ibhosts.in
++===================================================================
++--- infiniband-diags-1.6.1.orig/scripts/ibhosts.in 2012-07-24 11:15:56.000000000 -0700
+++++ infiniband-diags-1.6.1/scripts/ibhosts.in 2012-10-15 14:11:53.274491379 -0700
+@@ -2,7 +2,7 @@
+
+ IBPATH=${IBPATH:- at IBSCRIPTPATH@}
+
+-function usage() {
++usage() {
+ echo Usage: `basename $0` "[-h] [<topology-file> | -C ca_name" \
- "-P ca_port -t(imeout) timeout_ms]"
++ "-P ca_port -t timeout_ms]"
+ exit -1
diff --cc debian/patches/32-ibrouters-bashisms.patch
index 0809d59,0000000..1d86e18
mode 100644,000000..100644
--- a/debian/patches/32-ibrouters-bashisms.patch
+++ b/debian/patches/32-ibrouters-bashisms.patch
@@@ -1,15 -1,0 +1,17 @@@
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibrouters script
+
+
- --- trunk/scripts/ibrouters.in 2009-07-29 14:58:00.000000000 +0200
- +++ trunk/scripts/ibrouters.in.new 2009-12-20 19:29:52.000000000 +0100
++Index: infiniband-diags-1.6.1/scripts/ibrouters.in
++===================================================================
++--- infiniband-diags-1.6.1.orig/scripts/ibrouters.in 2012-07-24 11:15:56.000000000 -0700
+++++ infiniband-diags-1.6.1/scripts/ibrouters.in 2012-10-15 14:11:56.962491493 -0700
+@@ -2,7 +2,7 @@
+
+ IBPATH=${IBPATH:- at IBSCRIPTPATH@}
+
+-function usage() {
++usage() {
+ echo Usage: `basename $0` "[-h] [<topology-file> | -C ca_name" \
- "-P ca_port -t(imeout) timeout_ms]"
++ "-P ca_port -t timeout_ms]"
+ exit -1
diff --cc debian/patches/34-ibswitches-bashisms.patch
index 9059149,0000000..a908731
mode 100644,000000..100644
--- a/debian/patches/34-ibswitches-bashisms.patch
+++ b/debian/patches/34-ibswitches-bashisms.patch
@@@ -1,15 -1,0 +1,17 @@@
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibswitches script
+
+
- --- trunk/scripts/ibswitches.in 2009-07-29 14:58:00.000000000 +0200
- +++ trunk/scripts/ibswitches.in.new 2009-12-20 19:34:04.000000000 +0100
++Index: infiniband-diags-1.6.1/scripts/ibswitches.in
++===================================================================
++--- infiniband-diags-1.6.1.orig/scripts/ibswitches.in 2012-07-24 11:15:56.000000000 -0700
+++++ infiniband-diags-1.6.1/scripts/ibswitches.in 2012-10-15 14:12:00.594491605 -0700
+@@ -2,7 +2,7 @@
+
+ IBPATH=${IBPATH:- at IBSCRIPTPATH@}
+
+-function usage() {
++usage() {
+ echo Usage: `basename $0` "[-h] [<topology-file> | -C ca_name" \
- "-P ca_port -t(imeout) timeout_ms]"
++ "-P ca_port -t timeout_ms]"
+ exit -1
diff --cc debian/patches/series
index a647909,0000000..74a86ff
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,16 @@@
- 00-remove-rpath.patch
- 02-remove-rpath-makefile.in.patch
+04-ibcheckerrors-bashisms.patch
+06-ibcheckerrs-bashisms.patch
+08-ibchecknet-bashisms.patch
+10-ibchecknode-bashisms.patch
+12-ibcheckport-bashisms.patch
+14-ibcheckportstate-bashisms.patch
+16-ibcheckportwidth-bashisms.patch
+18-ibcheckstate-bashisms.patch
+20-ibcheckwidth-bashisms.patch
+22-ibclearcounters-bashisms.patch
+24-ibclearerrors-bashisms.patch
+26-ibdatacounters-bashisms.patch
+28-ibdatacounts-bashisms.patch
+30-ibhosts-bashisms.patch
+32-ibrouters-bashisms.patch
+34-ibswitches-bashisms.patch
- 35-set_nodedesc-bashisms.patch
diff --cc debian/rules
index 8863ac1,0000000..556abd0
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,130 -1,0 +1,127 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+# Modified by build process
+KEEP_FILES = \
+ include/ibdiag_version.h \
+ infiniband-diags.spec \
+ scripts/ibcheckerrors \
+ scripts/ibcheckerrs \
+ scripts/ibchecknet \
+ scripts/ibchecknode \
+ scripts/ibcheckport \
+ scripts/ibcheckportstate \
+ scripts/ibcheckportwidth \
+ scripts/ibcheckstate \
+ scripts/ibcheckwidth \
+ scripts/ibclearcounters \
+ scripts/ibclearerrors \
+ scripts/ibdatacounters \
+ scripts/ibdatacounts \
+ scripts/ibhosts \
+ scripts/ibnodes \
+ scripts/ibrouters \
+ scripts/ibswitches
+
+config.status: configure
+ dh_testdir
+ for f in $(KEEP_FILES); do [ -f $$f.save ] || cp -a $$f $$f.save ; done
+ # Add here commands to configure the package.
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
+ ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --with-perl-installdir=/usr/share/perl5 --sbindir=/usr/sbin
+
+
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ #docbook-to-man debian/infiniband-diags.sgml > infiniband-diags.1
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f build-stamp config.sub config.guess
+
+ dh_clean
+ for f in $(KEEP_FILES); do [ ! -f $$f.save ] || mv $$f.save $$f; done
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ # Add here commands to install the package into debian/infiniband-diags.
- $(MAKE) DESTDIR=$(CURDIR)/debian/infiniband-diags install
- mv debian/infiniband-diags/usr/sbin/ibdiscover.pl debian/infiniband-diags/usr/sbin/ibdiscover
- mv debian/infiniband-diags/usr/sbin/ibqueryerrors.pl debian/infiniband-diags/usr/sbin/ibqueryerrors
- mv debian/infiniband-diags/usr/sbin/ibswportwatch.pl debian/infiniband-diags/usr/sbin/ibswportwatch
- mv debian/infiniband-diags/usr/sbin/iblinkinfo.pl debian/infiniband-diags/usr/sbin/iblinkinfo
- mv debian/infiniband-diags/usr/sbin/ibprintswitch.pl debian/infiniband-diags/usr/sbin/ibprintswitch
- mv debian/infiniband-diags/usr/sbin/ibprintca.pl debian/infiniband-diags/usr/sbin/ibprintca
- mv debian/infiniband-diags/usr/sbin/ibprintrt.pl debian/infiniband-diags/usr/sbin/ibprintrt
- mv debian/infiniband-diags/usr/sbin/ibfindnodesusing.pl debian/infiniband-diags/usr/sbin/ibfindnodesusing
- mv debian/infiniband-diags/usr/sbin/ibidsverify.pl debian/infiniband-diags/usr/sbin/ibidsverify
- mv debian/infiniband-diags/usr/sbin/check_lft_balance.pl debian/infiniband-diags/usr/sbin/check_lft_balance
- mv debian/infiniband-diags/usr/sbin/dump_lfts.sh debian/infiniband-diags/usr/sbin/dump_lfts
- mv debian/infiniband-diags/usr/sbin/dump_mfts.sh debian/infiniband-diags/usr/sbin/dump_mfts
- mv debian/infiniband-diags/usr/sbin/set_nodedesc.sh debian/infiniband-diags/usr/sbin/set_nodedesc
- chrpath -d debian/infiniband-diags/usr/sbin/ibtracert
- chrpath -d debian/infiniband-diags/usr/sbin/saquery
- chrpath -d debian/infiniband-diags/usr/sbin/smpquery
++ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
++
++ rm -f debian/tmp/usr/lib/lib*.la
++
++ mv debian/tmp/usr/sbin/ibfindnodesusing.pl debian/tmp/usr/sbin/ibfindnodesusing
++ mv debian/tmp/usr/sbin/ibidsverify.pl debian/tmp/usr/sbin/ibidsverify
++ mv debian/tmp/usr/sbin/check_lft_balance.pl debian/tmp/usr/sbin/check_lft_balance
++ mv debian/tmp/usr/sbin/dump_lfts.sh debian/tmp/usr/sbin/dump_lfts
++ mv debian/tmp/usr/sbin/dump_mfts.sh debian/tmp/usr/sbin/dump_mfts
++ chrpath -d debian/tmp/usr/sbin/ibtracert
++ chrpath -d debian/tmp/usr/sbin/saquery
++ chrpath -d debian/tmp/usr/sbin/smpquery
++ chrpath -d debian/tmp/usr/sbin/iblinkinfo
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
- dh_install --list-missing --sourcedir=debian/infiniband-diags
++ dh_install --list-missing
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_perl
++ dh_makeshlibs -V
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infiniband-diags.git
More information about the Pkg-ofed-commits
mailing list