[Pkg-ofed-commits] [opensm] 03/07: Imported Debian patch 3.2.6-20090317-2
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:19:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository opensm.
commit db09ff7cd9555bee420eef1eed246568ebb70c96
Author: Benoit Mortier <benoit.mortier at opensides.be>
Date: Sun Dec 20 00:00:26 2009 +0100
Imported Debian patch 3.2.6-20090317-2
---
debian/README.source | 1 +
debian/changelog | 8 ++++++++
debian/control | 14 +++++++-------
debian/opensm-boot.init | 2 +-
debian/opensm.postinst | 7 +++++--
debian/opensm.postrm | 4 +++-
debian/patches/00list | 1 +
debian/patches/01_gcc_4.4_else_in_place_elif.dpatch | 19 +++++++++++++++++++
debian/rules | 18 ++++++++++++++----
9 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..1c919f0
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1 @@
+/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 2bb303f..e412fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opensm (3.2.6-20090317-2) unstable; urgency=low
+
+ * Depends on unavailable infiniband-diags (Closes: #558829)
+ * FTBFS: ../include/vendor/osm_vendor.h:68:6: error: #elif with no
+ expression is not supported by gcc => 4.4 (Closes: #560537)
+
+ -- Benoit Mortier <benoit.mortier at opensides.be> Sun, 20 Dec 2009 00:00:26 +0100
+
opensm (3.2.6-20090317-1) unstable; urgency=low
* Initial release (Closes: #521418)
diff --git a/debian/control b/debian/control
index e5013b2..c5264ed 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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, flex, bison, libibumad-dev, libibcommon-dev
+Build-Depends: debhelper (>= 7), autotools-dev, dpatch, flex, bison, libibumad-dev, libibcommon-dev
Standards-Version: 3.8.3
Homepage: http://www.openfabrics.org
Package: opensm
-Architecture: any
+Architecture: i386 ia64 amd64 powerpc
Depends: ${misc:Depends}, libopensm2 (= ${binary:Version}), ${shlibs:Depends}, infiniband-diags
Description: An Infiniband subnet manager
OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
@@ -17,13 +17,13 @@ Description: An Infiniband subnet manager
Package: opensm-doc
Section: doc
-Architecture: all
+Architecture: i386 ia64 amd64 powerpc
Depends: ${misc:Depends}
Description: Documentation for opensm
Documentation for the opensm Infiniband subnet manager.
Package: libopensm2
-Architecture: any
+Architecture: i386 ia64 amd64 powerpc
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Infiniband subnet manager libraries
OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
@@ -35,9 +35,9 @@ Description: Infiniband subnet manager libraries
Package: libopensm2-dev
Section: libdevel
-Architecture: any
-Depends: libopensm2 (= ${binary:Version}), ${misc:Depends}
-Description: Header files for compiling against libopensm
+Architecture: i386 ia64 amd64 powerpc
+Depends: libopensm2 (= ${binary:Version}), ${misc:Depends}
+Description: Header files for compiling against libopensm
OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
Administrator (SA). One Subnet Manager is required to run on each Infiniband
subnet in order to initialize the Infiniband hardware.
diff --git a/debian/opensm-boot.init b/debian/opensm-boot.init
index 93f32c4..164af9b 100644
--- a/debian/opensm-boot.init
+++ b/debian/opensm-boot.init
@@ -1,6 +1,6 @@
#!/bin/sh
### BEGIN INIT INFO
-# Provides: opensm
+# Provides: opensm-boot
# Required-Start: $syslog
# Required-Stop: $syslog
# Default-Start: 2 3 4 5
diff --git a/debian/opensm.postinst b/debian/opensm.postinst
index e46c3f4..4596cc6 100644
--- a/debian/opensm.postinst
+++ b/debian/opensm.postinst
@@ -1,8 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
. /usr/share/debconf/confmodule
if [ -x "/etc/init.d/opensm-boot" ]; then
-update-rc.d opensm-boot start 24 S .
+update-rc.d opensm-boot start 24 S . > /dev/null
fi
#DEBHELPER#
diff --git a/debian/opensm.postrm b/debian/opensm.postrm
index f62ed19..f8f789e 100644
--- a/debian/opensm.postrm
+++ b/debian/opensm.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if [ "$1" = "purge" ] ; then
update-rc.d opensm-boot remove >/dev/null || exit $?
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..bab3561
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_gcc_4.4_else_in_place_elif
diff --git a/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch b/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch
new file mode 100644
index 0000000..e687120
--- /dev/null
+++ b/debian/patches/01_gcc_4.4_else_in_place_elif.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc_4.4_else_in_place_elif.dpatch by <benoit.mortier at opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: replace solo elif by else for gcc => 4.4
+
+ at DPATCH@
+
+--- trunk/include/vendor/osm_vendor.h 2009-12-21 11:16:55.000000000 +0100
++++ trunk/include/vendor/osm_vendor.h.new 2009-12-21 11:23:38.000000000 +0100
+@@ -65,7 +65,7 @@
+ #include <vendor/osm_vendor_ibumad.h>
+ #elif defined( OSM_VENDOR_INTF_AL )
+ #include <vendor/osm_vendor_al.h>
+-#elif
++#else
+ #error No MAD Interface selected!
+ #error Choose an interface in osm_config.h
+ #endif
diff --git a/debian/rules b/debian/rules
index a43e058..026af99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ endif
-config.status: configure
+config.status: patch configure
dh_testdir
# Add here commands to configure the package.
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
@@ -39,7 +39,8 @@ build-stamp: config.status
touch $@
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -48,16 +49,25 @@ clean:
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.sub config.guess
+ -find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \;
+
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
- -find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \; >/dev/null 2>&1
-
# Add here commands to install the package into debian/opensm.
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
cp $(CURDIR)/debian/opensm-boot.init $(CURDIR)/debian/tmp/etc/init.d/opensm-boot
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/opensm.git
More information about the Pkg-ofed-commits
mailing list