[Pkg-ofed-commits] [ibutils] 01/08: Imported Debian patch 1.2-OFED-1.4.2-1

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Tue Jul 1 07:17:29 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 46f04ea5f5511bc57c8e07cd35d7de205936f5bd
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date:   Mon Jan 11 22:22:00 2010 +0100

    Imported Debian patch 1.2-OFED-1.4.2-1
---
 debian/README.source                    |   2 +
 debian/changelog                        |   7 ++
 debian/compat                           |   1 +
 debian/control                          |  31 +++++++++
 debian/copyright                        |  49 ++++++++++++++
 debian/dirs                             |   1 +
 debian/docs                             |   2 +
 debian/ibnlparse.1                      |  21 ++++++
 debian/ibutils.docs                     |   4 ++
 debian/ibutils.install                  |  11 ++++
 debian/ibutils.manpages                 |   1 +
 debian/libibdm-dev.install              |   4 ++
 debian/libibdm1.install                 |   7 ++
 debian/libibdm1.lintian-overrides       |   3 +
 debian/patches/00list                   |   3 +
 debian/patches/01_topomatch_diff.dpatch |  20 ++++++
 debian/patches/02_sysdef_diff.dpatch    |  19 ++++++
 debian/rules                            | 112 ++++++++++++++++++++++++++++++++
 18 files changed, 298 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..48b599a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+/usr/share/doc/dpatch/README.source.gz
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e7968de
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+ibutils (1.2-OFED-1.4.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #539801)
+  * Removed ibnlfile.pdf because we have no source
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Mon, 11 Jan 2010 22:22:00 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..648e008
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,31 @@
+Source: ibutils
+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 (>= 7), autotools-dev, dpatch, chrpath, swig1.3, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
+Standards-Version: 3.8.3
+Homepage: http://www.openfabrics.org
+
+Package: ibutils
+Architecture: i386 ia64 amd64 powerpc
+Depends: ${shlibs:Depends}, ${misc:Depends}, libibdm1
+Description: InfiniBand network utilities
+ This package contains a set of utilities useful for 
+ diagnosing and testing InfiniBand based networks.
+
+Package: libibdm1
+Architecture: i386 ia64 amd64 powerpc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: InfiniBand network diagnostic library
+ This package contains a library for building tools useful
+ for diagnosing and testing InfiniBand based networks.
+
+Package: libibdm-dev
+Section: libdevel
+Architecture: i386 ia64 amd64 powerpc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Development files for the libibdm library
+ This package contains header files for building applications
+ against  libibdm, a library for building tools for 
+ diagnosing and testing InfiniBand based networks.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0d15135
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,49 @@
+This package was debianized by Guy Coates <gmpc at sanger.ac.uk> on
+Thu, 08 Jan 2009 16:53:41 +0000.
+
+It was downloaded from http://www.openfabrics.org/downloads/OFED/ofed-1.4-daily/OFED-1.4-20090108-0600.tgz
+
+Upstream Author:
+
+ Eitan Zahavi <eitan at mellanox.co.il>
+ Nimrod Gindi <nimrodg at mellanox.co.il>
+
+Copyright:
+
+Copyright (c) 2004, 2008 Mellanox Technologies LTD. All rights reserved.
+
+License:
+
+ This software is available to you under a choice of one of two
+ licenses.  You may choose to be licensed under the terms of the GNU
+ General Public License (GPL) Version 2, available from the file
+ /usr/share/common-licenses/GPL-2 on your debian system or the 
+ OpenIB.org BSD license below:
+
+     Redistribution and use in source and binary forms, with or
+     without modification, are permitted provided that the following
+     conditions are met:
+
+      - Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the following
+        disclaimer.
+
+      - Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+
+The Debian packaging is Copyright (C) 2009 Genome Research Ltd and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..50bd824
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/ibnlparse.1 b/debian/ibnlparse.1
new file mode 100644
index 0000000..85b00de
--- /dev/null
+++ b/debian/ibnlparse.1
@@ -0,0 +1,21 @@
+.TH ibnlparse 1 "January 26, 2008" "ibutils" "User Commands"
+
+.SH NAME
+ibnlparse \- simple IB extensions test utility.
+
+.SH SYNOPSIS
+.B ibnlparse
+
+.SH DESCRIPTION
+.PP
+This program does not currently have any documentation. This manpage
+is a placeholder. Please see the package documentation in 
+/usr/share/doc/
+
+.SH AUTHOR
+.TP
+Guy Coates  < gmpc at sanger.ac.uk >
+
+
+
+
diff --git a/debian/ibutils.docs b/debian/ibutils.docs
new file mode 100644
index 0000000..85dc36d
--- /dev/null
+++ b/debian/ibutils.docs
@@ -0,0 +1,4 @@
+ibdiag/doc/ibdiag_release_notes.txt
+ibdiag/doc/ibutils_release_notes_ofed1_4.txt
+README
+NEWS
diff --git a/debian/ibutils.install b/debian/ibutils.install
new file mode 100644
index 0000000..1740284
--- /dev/null
+++ b/debian/ibutils.install
@@ -0,0 +1,11 @@
+usr/share/man/man1
+usr/bin/ibdiagnet
+usr/bin/ibdiagpath
+usr/bin/ibdiagui
+usr/bin/ibdmchk
+usr/bin/ibdmsh
+usr/bin/ibdmtr
+usr/bin/ibis
+usr/bin/ibnlparse
+usr/bin/ibtopodiff
+
diff --git a/debian/ibutils.manpages b/debian/ibutils.manpages
new file mode 100644
index 0000000..9185512
--- /dev/null
+++ b/debian/ibutils.manpages
@@ -0,0 +1 @@
+debian/ibnlparse.1 
diff --git a/debian/libibdm-dev.install b/debian/libibdm-dev.install
new file mode 100644
index 0000000..3d2e10e
--- /dev/null
+++ b/debian/libibdm-dev.install
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/lib*.la
diff --git a/debian/libibdm1.install b/debian/libibdm1.install
new file mode 100644
index 0000000..6fd8640
--- /dev/null
+++ b/debian/libibdm1.install
@@ -0,0 +1,7 @@
+usr/lib/lib*.so.*
+usr/lib/ibis1.2
+usr/lib/ibdiagnet1.2
+usr/lib/ibdiagpath1.2
+usr/lib/ibdm1.2
+usr/lib/ibdiagui1.2
+usr/share/lintian/overrides/libibdm1
diff --git a/debian/libibdm1.lintian-overrides b/debian/libibdm1.lintian-overrides
new file mode 100644
index 0000000..6e4e097
--- /dev/null
+++ b/debian/libibdm1.lintian-overrides
@@ -0,0 +1,3 @@
+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/00list b/debian/patches/00list
new file mode 100644
index 0000000..146e41b
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,3 @@
+01_topomatch_diff
+02_sysdef_diff
+
diff --git a/debian/patches/01_topomatch_diff.dpatch b/debian/patches/01_topomatch_diff.dpatch
new file mode 100644
index 0000000..7d9ca87
--- /dev/null
+++ b/debian/patches/01_topomatch_diff.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_topomatch_diff.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix char * problem
+
+ at DPATCH@
+
+--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp
++++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp
+@@ -676,7 +676,7 @@
+   IBSystem *p_system = p_node->p_system;
+
+   // we always mark the board of the node by examining all but the "UXXX"
+-  char *p_lastSlash = rindex(p_node->name.c_str(), '/');
++  const char *p_lastSlash = rindex(p_node->name.c_str(), '/');
+   char nodeBoardName[512];
+   int  boardNameLength;
+   if (!p_lastSlash) {
+
diff --git a/debian/patches/02_sysdef_diff.dpatch b/debian/patches/02_sysdef_diff.dpatch
new file mode 100644
index 0000000..810dfc4
--- /dev/null
+++ b/debian/patches/02_sysdef_diff.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_sysdef_diff.dpatch by  <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix char * problem
+
+ at DPATCH@
+
+--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp
++++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp
+@@ -79,7 +79,7 @@
+
+       // the device number should be embedded in the master name of
+       // the node: MT23108 ...
+-      char *p_digit;
++      const char *p_digit;
+       if ((p_digit = strpbrk(p_inst->master.c_str(), "0123456789")) != NULL)
+         sscanf(p_digit,"%u", &p_node->devId);
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..526f0db
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,112 @@
+#!/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
+
+
+
+config.status: patch configure
+	dh_testdir
+	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
+	 --sysconfdir=/etc  --with-graphviz-lib=/usr/lib/graphbiz/tcl
+
+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: clean-patched unpatch
+clean-patched: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) clean
+
+	rm -f config.sub config.guess config.status config.log Makefile
+	rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log
+	dh_clean 
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+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.2/libibdm.so.1.2
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/ibis1.2/libibis.so.1.2
+	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 

-- 
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