Package list ibutils / ce7f0c8
Imported Debian patch 1.5.7-1 Roland Dreier authored 8 years ago Ana Guerrero López committed 7 years ago
11 changed file(s) with 158 addition(s) and 126 deletion(s). Raw diff Collapse all Expand all
0 ibutils (1.5.7-1) experimental; urgency=low
1
2 * Acknowledge NMU. (Closes: #690603)
3 * Convert to minimized rules file.
4
5 -- Roland Dreier <rbd@debian.org> Mon, 03 Dec 2012 11:45:32 -0800
6
07 ibutils (1.5.7-0.1) experimental; urgency=low
18
29 * Non-maintainer upload.
22 Priority: extra
33 Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel@lists.alioth.debian.org>
44 Uploaders: Benoit Mortier <benoit.mortier@opensides.be>, Guy Coates <gmpc@sanger.ac.uk>, Mario Lang <mlang@debian.org>
5 Build-Depends: debhelper (>= 9), autotools-dev, chrpath, swig, graphviz, libibumad-dev, tcl-dev, tk-dev, libopensm-dev (>= 3.3.15)
5 Build-Depends: debhelper (>= 9), dh-autoreconf, swig, graphviz, libibumad-dev, tcl-dev, tk-dev, libopensm-dev (>= 3.3.15)
66 Standards-Version: 3.9.4
77 Homepage: http://www.openfabrics.org
88
1515
1616 Package: libibdm1
1717 Architecture: i386 ia64 amd64 powerpc
18 Pre-Depends: ${misc:Pre-Depends}
1819 Depends: ${shlibs:Depends}, ${misc:Depends}
1920 Description: InfiniBand network diagnostic library
2021 This package contains a library for building tools useful
77 usr/bin/ibis
88 usr/bin/ibnlparse
99 usr/bin/ibtopodiff
10
00 usr/include
1 usr/lib/lib*.a
2 usr/lib/lib*.so
3
1 usr/lib/*/lib*.a
2 usr/lib/*/lib*.so
0 usr/lib/lib*.so.*
1 usr/lib/ibis1.5.7
2 usr/lib/ibdiagnet1.5.7
3 usr/lib/ibdiagpath1.5.7
4 usr/lib/ibdm1.5.7
5 usr/lib/ibdiagui1.5.7
6 usr/share/lintian/overrides/libibdm1
0 usr/lib/*/lib*.so.*
1 usr/lib/*/ibis1.5.7
2 usr/lib/*/ibdiagnet1.5.7
3 usr/lib/*/ibdiagpath1.5.7
4 usr/lib/*/ibdm1.5.7
5 usr/lib/*/ibdiagui1.5.7
+0
-3
debian/libibdm1.lintian-overrides less more
0 libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
1 libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
2
0 Description: Copy fix from main osm.m4 to avoid overwriting $with_osm_libs
1 Author: Roland Dreier <rbd@debian.org>
2
3 --- a/ibis/config/osm.m4
4 +++ b/ibis/config/osm.m4
5 @@ -103,8 +103,8 @@
6 else
7 osm_lib_dir=lib
8 fi
9 + with_osm_libs=$with_osm/$osm_lib_dir
10 fi
11 - with_osm_libs=$with_osm/$osm_lib_dir
12
13 dnl check what build we have gen1 or gen2
14 if test -d $with_osm/include/infiniband; then
15 --- a/ibmgtsim/config/osm.m4
16 +++ b/ibmgtsim/config/osm.m4
17 @@ -103,8 +103,8 @@
18 else
19 osm_lib_dir=lib
20 fi
21 + with_osm_libs=$with_osm/$osm_lib_dir
22 fi
23 - with_osm_libs=$with_osm/$osm_lib_dir
24
25 dnl check what build we have gen1 or gen2
26 if test -d $with_osm/include/infiniband; then
0 Description: Fix gcc "-Werror=format-security" errors
1 Fix log calls to use format "%s" to output string buffers.
2 Author: Roland Dreier <rbd@debian.org>
3
4 --- a/ibis/src/ibis_wrap.c
5 +++ b/ibis/src/ibis_wrap.c
6 @@ -3186,7 +3186,7 @@
7 }
8
9 int ibis_puts( osm_log_level_t verbosity, char *msg) {
10 - osm_log(&(IbisObj.log), verbosity, msg );
11 + osm_log(&(IbisObj.log), verbosity, "%s", msg );
12 return TCL_OK;
13 }
14
15 --- a/ibis/src/ibis.i
16 +++ b/ibis/src/ibis.i
17 @@ -362,7 +362,7 @@
18 }
19
20 int ibis_puts( osm_log_level_t verbosity, char *msg) {
21 - osm_log(&(IbisObj.log), verbosity, msg );
22 + osm_log(&(IbisObj.log), verbosity, "%s", msg );
23 return TCL_OK;
24 }
25
26 --- a/ibis/src/ibissh_wrap.cpp
27 +++ b/ibis/src/ibissh_wrap.cpp
28 @@ -3186,7 +3186,7 @@
29 }
30
31 int ibis_puts( osm_log_level_t verbosity, char *msg) {
32 - osm_log(&(IbisObj.log), verbosity, msg );
33 + osm_log(&(IbisObj.log), verbosity, "%s", msg );
34 return TCL_OK;
35 }
36
0 Description: Patch autotools files to avoid unecessary rpaths in executables
1 Author: Roland Dreier <rbd@debian.org>
2
3 --- a/config/osm.m4
4 +++ b/config/osm.m4
5 @@ -114,7 +114,7 @@
6 fi
7 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
8
9 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
10 + OSM_LDFLAGS="-L$with_osm_libs"
11 dnl based on the with_osm dir and the libs available
12 dnl we can try and decide what vendor was used:
13 if test $OSM_BUILD = openib; then
14 --- a/ibis/config/osm.m4
15 +++ b/ibis/config/osm.m4
16 @@ -114,7 +114,7 @@
17 fi
18 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
19
20 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
21 + OSM_LDFLAGS="-L$with_osm_libs"
22 dnl based on the with_osm dir and the libs available
23 dnl we can try and decide what vendor was used:
24 if test $OSM_BUILD = openib; then
25 --- a/ibmgtsim/config/osm.m4
26 +++ b/ibmgtsim/config/osm.m4
27 @@ -114,7 +114,7 @@
28 fi
29 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
30
31 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
32 + OSM_LDFLAGS="-L$with_osm_libs"
33 dnl based on the with_osm dir and the libs available
34 dnl we can try and decide what vendor was used:
35 if test $OSM_BUILD = openib; then
36 --- a/ibdm/ibdm/Makefile.am
37 +++ b/ibdm/ibdm/Makefile.am
38 @@ -80,12 +80,12 @@
39
40 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES)
41 libibdm_la_LIBADD = $(TCL_LIBS)
42 -libibdm_la_LDFLAGS = -Wl,-rpath -Wl,$(TCL_PREFIX)/lib -version-info $(LIB_VER_TRIPLET) -no-undefined
43 +libibdm_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET) -no-undefined
44
45 bin_PROGRAMS = ibdmsh
46 ibdmsh_SOURCES = ibdmsh_wrap.cpp
47 ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
48 -ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
49 +ibdmsh_LDFLAGS = -static
50 ibdmsh_DEPENDENCIES=$(lib_LTLIBRARIES)
51
52 $(srcdir)/Fabric.cpp: $(srcdir)/git_version.h
53 --- a/ibmgtsim/src/Makefile.am
54 +++ b/ibmgtsim/src/Makefile.am
55 @@ -76,8 +76,7 @@
56 ibmssh_SOURCES = sim.cpp server.cpp node.cpp dispatcher.cpp \
57 ibmssh_wrap.cpp sma.cpp pma.cpp vsa.cpp randmgr.cpp
58
59 -ibmssh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib \
60 - -Wl,-rpath -Wl,$(IBDM_PREFIX)/lib
61 +ibmssh_LDFLAGS = -static
62
63 ibmssh_LDADD = -libmscli $(IBDM_LIB) $(TCL_LIBS) -lpthread
64
0 01-fix-with_osm_libs.patch
1 02-fix-format-warning.patch
2 03-remove-rpath.patch
00 #!/usr/bin/make -f
11 # -*- makefile -*-
2 # Sample debian/rules that uses debhelper.
3 # This file was originally written by Joey Hess and Craig Small.
4 # As a special exception, when this file is copied by dh-make into a
5 # dh-make output file, you may use that output file without restriction.
6 # This special exception was added by Craig Small in version 0.37 of dh-make.
72
8 # Uncomment this to turn on verbose mode.
9 #export DH_VERBOSE=1
3 %:
4 dh $@ --with autoreconf
105
6 override_dh_autoreconf:
7 dh_autoreconf autoreconf -- -f -i -I config
118
12 # These are used for cross-compiling and for saving the configure script
13 # from having to guess our platform (since we know it already)
14 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
15 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
16 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
17 CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
18 else
19 CROSS= --build $(DEB_BUILD_GNU_TYPE)
20 endif
9 override_dh_auto_configure:
10 dh_auto_configure -- --with-osm=/usr --with-osm-libs=/usr/lib/$(DEB_HOST_MULTIARCH)
2111
22
23
24 config.status: configure
25 dh_testdir
26 # Add here commands to configure the package.
27 cp -f /usr/share/misc/config.sub config.sub
28 cp -f /usr/share/misc/config.guess config.guess
29 ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
30 --sysconfdir=/etc --with-graphviz-lib=/usr/lib/graphbiz/tcl
31
32 build-arch: build
33 build-indep: build
34
35 build: build-stamp
36
37 build-stamp: config.status
38 dh_testdir
39
40 # Add here commands to compile the package.
41 $(MAKE)
42 #docbook-to-man debian/ibutils.sgml > ibutils.1
43
44 touch $@
45
46 clean:
47 dh_testdir
48 dh_testroot
49 rm -f build-stamp config.guess config.sub
50 find . -type d -name .libs \
51 | xargs --no-run-if-empty rm -rf
52 # Add here commands to clean up after the build process.
53 [ ! -f Makefile ] || $(MAKE) clean
54 find . -type f \
55 -name Makefile \
56 -o -name libtool \
57 -o -name "*.[ao]" \
58 -o -name "*.l[ao]" \
59 | xargs --no-run-if-empty rm -f
60 rm -f \
61 ibdiag/src/ibdiagnet \
62 ibdiag/src/ibdiagpath \
63 ibdiag/src/ibdiagui \
64 ibdm/ibdm/ibdmsh \
65 ibdm/src/ibdmchk \
66 ibdm/src/ibdmtr \
67 ibdm/src/ibnlparse \
68 ibdm/src/ibtopodiff \
69 ibis/src/ibis
70 rm -f config.sub config.guess config.status config.log ibutils.spec
71 rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log
72 dh_clean
73
74 install: build
75 dh_testdir
76 dh_testroot
77 dh_prep
78 dh_installdirs
79
80 # Add here commands to install the package into debian/ibutils.
81 $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
82
83 install -D -m 644 debian/libibdm1.lintian-overrides $(CURDIR)/debian/tmp/usr/share/lintian/overrides/libibdm1
84
85 chrpath -d $(CURDIR)/debian/tmp/usr/bin/ibis
86 chrpath -d $(CURDIR)/debian/tmp/usr/bin/ibdmsh
87 chrpath -d $(CURDIR)/debian/tmp/usr/lib/ibdm1.5.7/libibdm.so.1.5.7
88 chrpath -d $(CURDIR)/debian/tmp/usr/lib/ibis1.5.7/libibis.so.1.5.7
89 chrpath -d $(CURDIR)/debian/tmp/usr/lib/libibdm.so.1.1.1
90
91 # Build architecture-independent files here.
92 binary-indep: install
93 # We have nothing to do by default.
94
95 # Build architecture-dependent files here.
96 binary-arch: install
97 dh_testdir
98 dh_testroot
99 dh_installchangelogs --exclude=ChangeLog
100 dh_installdocs
101 dh_installexamples
102 dh_install --list-missing
103 dh_installman
104 dh_link
105 dh_strip
106 dh_compress
107 dh_fixperms
108 dh_makeshlibs
109 dh_installdeb
110 dh_shlibdeps
111 dh_gencontrol
112 dh_md5sums
113 dh_builddeb
114
115 binary: binary-indep binary-arch
116 .PHONY: build clean binary-indep binary-arch binary install
12 override_dh_auto_install:
13 dh_auto_install
14 chmod ogu-x debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ibdm1.5.7/ibnl/*.ibnl