[Pkg-ofed-commits] [ibutils] 08/08: Imported Debian patch 1.5.7-1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:17:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository ibutils.
commit ce7f0c8355ae0335b94cf3562ea85ff16845492c
Author: Roland Dreier <rbd at debian.org>
Date: Mon Dec 3 11:45:32 2012 -0800
Imported Debian patch 1.5.7-1
---
debian/changelog | 7 ++
debian/control | 3 +-
debian/ibutils.install | 1 -
debian/libibdm-dev.install | 5 +-
debian/libibdm1.install | 13 ++--
debian/libibdm1.lintian-overrides | 3 -
debian/patches/01-fix-with_osm_libs.patch | 27 +++++++
debian/patches/02-fix-format-warning.patch | 37 +++++++++
debian/patches/03-remove-rpath.patch | 65 ++++++++++++++++
debian/patches/series | 3 +
debian/rules | 120 +++--------------------------
11 files changed, 158 insertions(+), 126 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b322b8e..6b847c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ibutils (1.5.7-1) experimental; urgency=low
+
+ * Acknowledge NMU. (Closes: #690603)
+ * Convert to minimized rules file.
+
+ -- Roland Dreier <rbd at debian.org> Mon, 03 Dec 2012 11:45:32 -0800
+
ibutils (1.5.7-0.1) experimental; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 1355053..4dfe539 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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, chrpath, swig, graphviz, libibumad-dev, tcl-dev, tk-dev, libopensm-dev (>= 3.3.15)
+Build-Depends: debhelper (>= 9), dh-autoreconf, swig, graphviz, libibumad-dev, tcl-dev, tk-dev, libopensm-dev (>= 3.3.15)
Standards-Version: 3.9.4
Homepage: http://www.openfabrics.org
@@ -16,6 +16,7 @@ Description: InfiniBand network utilities
Package: libibdm1
Architecture: i386 ia64 amd64 powerpc
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: InfiniBand network diagnostic library
This package contains a library for building tools useful
diff --git a/debian/ibutils.install b/debian/ibutils.install
index 1740284..507e547 100644
--- a/debian/ibutils.install
+++ b/debian/ibutils.install
@@ -8,4 +8,3 @@ usr/bin/ibdmtr
usr/bin/ibis
usr/bin/ibnlparse
usr/bin/ibtopodiff
-
diff --git a/debian/libibdm-dev.install b/debian/libibdm-dev.install
index e7a3896..b849e94 100644
--- a/debian/libibdm-dev.install
+++ b/debian/libibdm-dev.install
@@ -1,4 +1,3 @@
usr/include
-usr/lib/lib*.a
-usr/lib/lib*.so
-
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libibdm1.install b/debian/libibdm1.install
index 76cd7b9..1a67165 100644
--- a/debian/libibdm1.install
+++ b/debian/libibdm1.install
@@ -1,7 +1,6 @@
-usr/lib/lib*.so.*
-usr/lib/ibis1.5.7
-usr/lib/ibdiagnet1.5.7
-usr/lib/ibdiagpath1.5.7
-usr/lib/ibdm1.5.7
-usr/lib/ibdiagui1.5.7
-usr/share/lintian/overrides/libibdm1
+usr/lib/*/lib*.so.*
+usr/lib/*/ibis1.5.7
+usr/lib/*/ibdiagnet1.5.7
+usr/lib/*/ibdiagpath1.5.7
+usr/lib/*/ibdm1.5.7
+usr/lib/*/ibdiagui1.5.7
diff --git a/debian/libibdm1.lintian-overrides b/debian/libibdm1.lintian-overrides
deleted file mode 100644
index b65c198..0000000
--- a/debian/libibdm1.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
-libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
-
diff --git a/debian/patches/01-fix-with_osm_libs.patch b/debian/patches/01-fix-with_osm_libs.patch
new file mode 100644
index 0000000..229be2d
--- /dev/null
+++ b/debian/patches/01-fix-with_osm_libs.patch
@@ -0,0 +1,27 @@
+Description: Copy fix from main osm.m4 to avoid overwriting $with_osm_libs
+Author: Roland Dreier <rbd at debian.org>
+
+--- a/ibis/config/osm.m4
++++ b/ibis/config/osm.m4
+@@ -103,8 +103,8 @@
+ else
+ osm_lib_dir=lib
+ fi
++ with_osm_libs=$with_osm/$osm_lib_dir
+ fi
+- with_osm_libs=$with_osm/$osm_lib_dir
+
+ dnl check what build we have gen1 or gen2
+ if test -d $with_osm/include/infiniband; then
+--- a/ibmgtsim/config/osm.m4
++++ b/ibmgtsim/config/osm.m4
+@@ -103,8 +103,8 @@
+ else
+ osm_lib_dir=lib
+ fi
++ with_osm_libs=$with_osm/$osm_lib_dir
+ fi
+- with_osm_libs=$with_osm/$osm_lib_dir
+
+ dnl check what build we have gen1 or gen2
+ if test -d $with_osm/include/infiniband; then
diff --git a/debian/patches/02-fix-format-warning.patch b/debian/patches/02-fix-format-warning.patch
new file mode 100644
index 0000000..ad44885
--- /dev/null
+++ b/debian/patches/02-fix-format-warning.patch
@@ -0,0 +1,37 @@
+Description: Fix gcc "-Werror=format-security" errors
+ Fix log calls to use format "%s" to output string buffers.
+Author: Roland Dreier <rbd at debian.org>
+
+--- a/ibis/src/ibis_wrap.c
++++ b/ibis/src/ibis_wrap.c
+@@ -3186,7 +3186,7 @@
+ }
+
+ int ibis_puts( osm_log_level_t verbosity, char *msg) {
+- osm_log(&(IbisObj.log), verbosity, msg );
++ osm_log(&(IbisObj.log), verbosity, "%s", msg );
+ return TCL_OK;
+ }
+
+--- a/ibis/src/ibis.i
++++ b/ibis/src/ibis.i
+@@ -362,7 +362,7 @@
+ }
+
+ int ibis_puts( osm_log_level_t verbosity, char *msg) {
+- osm_log(&(IbisObj.log), verbosity, msg );
++ osm_log(&(IbisObj.log), verbosity, "%s", msg );
+ return TCL_OK;
+ }
+
+--- a/ibis/src/ibissh_wrap.cpp
++++ b/ibis/src/ibissh_wrap.cpp
+@@ -3186,7 +3186,7 @@
+ }
+
+ int ibis_puts( osm_log_level_t verbosity, char *msg) {
+- osm_log(&(IbisObj.log), verbosity, msg );
++ osm_log(&(IbisObj.log), verbosity, "%s", msg );
+ return TCL_OK;
+ }
+
diff --git a/debian/patches/03-remove-rpath.patch b/debian/patches/03-remove-rpath.patch
new file mode 100644
index 0000000..11e5770
--- /dev/null
+++ b/debian/patches/03-remove-rpath.patch
@@ -0,0 +1,65 @@
+Description: Patch autotools files to avoid unecessary rpaths in executables
+Author: Roland Dreier <rbd at debian.org>
+
+--- a/config/osm.m4
++++ b/config/osm.m4
+@@ -114,7 +114,7 @@
+ fi
+ AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
+
+- OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
++ OSM_LDFLAGS="-L$with_osm_libs"
+ dnl based on the with_osm dir and the libs available
+ dnl we can try and decide what vendor was used:
+ if test $OSM_BUILD = openib; then
+--- a/ibis/config/osm.m4
++++ b/ibis/config/osm.m4
+@@ -114,7 +114,7 @@
+ fi
+ AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
+
+- OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
++ OSM_LDFLAGS="-L$with_osm_libs"
+ dnl based on the with_osm dir and the libs available
+ dnl we can try and decide what vendor was used:
+ if test $OSM_BUILD = openib; then
+--- a/ibmgtsim/config/osm.m4
++++ b/ibmgtsim/config/osm.m4
+@@ -114,7 +114,7 @@
+ fi
+ AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
+
+- OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
++ OSM_LDFLAGS="-L$with_osm_libs"
+ dnl based on the with_osm dir and the libs available
+ dnl we can try and decide what vendor was used:
+ if test $OSM_BUILD = openib; then
+--- a/ibdm/ibdm/Makefile.am
++++ b/ibdm/ibdm/Makefile.am
+@@ -80,12 +80,12 @@
+
+ libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES)
+ libibdm_la_LIBADD = $(TCL_LIBS)
+-libibdm_la_LDFLAGS = -Wl,-rpath -Wl,$(TCL_PREFIX)/lib -version-info $(LIB_VER_TRIPLET) -no-undefined
++libibdm_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET) -no-undefined
+
+ bin_PROGRAMS = ibdmsh
+ ibdmsh_SOURCES = ibdmsh_wrap.cpp
+ ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
+-ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
++ibdmsh_LDFLAGS = -static
+ ibdmsh_DEPENDENCIES=$(lib_LTLIBRARIES)
+
+ $(srcdir)/Fabric.cpp: $(srcdir)/git_version.h
+--- a/ibmgtsim/src/Makefile.am
++++ b/ibmgtsim/src/Makefile.am
+@@ -76,8 +76,7 @@
+ ibmssh_SOURCES = sim.cpp server.cpp node.cpp dispatcher.cpp \
+ ibmssh_wrap.cpp sma.cpp pma.cpp vsa.cpp randmgr.cpp
+
+-ibmssh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib \
+- -Wl,-rpath -Wl,$(IBDM_PREFIX)/lib
++ibmssh_LDFLAGS = -static
+
+ ibmssh_LDADD = -libmscli $(IBDM_LIB) $(TCL_LIBS) -lpthread
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cc19bc6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-fix-with_osm_libs.patch
+02-fix-format-warning.patch
+03-remove-rpath.patch
diff --git a/debian/rules b/debian/rules
index 5332616..3787977 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,117 +1,15 @@
#!/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
+%:
+ dh $@ --with autoreconf
+override_dh_autoreconf:
+ dh_autoreconf autoreconf -- -f -i -I config
-# 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
+override_dh_auto_configure:
+ dh_auto_configure -- --with-osm=/usr --with-osm-libs=/usr/lib/$(DEB_HOST_MULTIARCH)
-
-
-config.status: configure
- dh_testdir
- # 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)" \
- --sysconfdir=/etc --with-graphviz-lib=/usr/lib/graphbiz/tcl
-
-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/ibutils.sgml > ibutils.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp config.guess config.sub
- find . -type d -name .libs \
- | xargs --no-run-if-empty rm -rf
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) clean
- find . -type f \
- -name Makefile \
- -o -name libtool \
- -o -name "*.[ao]" \
- -o -name "*.l[ao]" \
- | xargs --no-run-if-empty rm -f
- rm -f \
- ibdiag/src/ibdiagnet \
- ibdiag/src/ibdiagpath \
- ibdiag/src/ibdiagui \
- ibdm/ibdm/ibdmsh \
- ibdm/src/ibdmchk \
- ibdm/src/ibdmtr \
- ibdm/src/ibnlparse \
- ibdm/src/ibtopodiff \
- ibis/src/ibis
- rm -f config.sub config.guess config.status config.log ibutils.spec
- rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/ibutils.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- install -D -m 644 debian/libibdm1.lintian-overrides $(CURDIR)/debian/tmp/usr/share/lintian/overrides/libibdm1
-
- chrpath -d $(CURDIR)/debian/tmp/usr/bin/ibis
- chrpath -d $(CURDIR)/debian/tmp/usr/bin/ibdmsh
- chrpath -d $(CURDIR)/debian/tmp/usr/lib/ibdm1.5.7/libibdm.so.1.5.7
- chrpath -d $(CURDIR)/debian/tmp/usr/lib/ibis1.5.7/libibis.so.1.5.7
- chrpath -d $(CURDIR)/debian/tmp/usr/lib/libibdm.so.1.1.1
-
-# 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 --exclude=ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install --list-missing
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+ dh_auto_install
+ chmod ogu-x debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ibdm1.5.7/ibnl/*.ibnl
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/ibutils.git
More information about the Pkg-ofed-commits
mailing list