[Pkg-ofed-commits] r527 - in /branches/sid-uploads: ibutils/trunk/debian/ ibutil...
opensides-guest at alioth.debian.org
opensides-guest at alioth.debian.org
Fri Dec 25 22:07:47 UTC 2009
Author: opensides-guest
Date: Fri Dec 25 22:07:46 2009
New Revision: 527
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=527
Log:
- More cleanup and bug fixing
Added:
branches/sid-uploads/ibutils/trunk/debian/README.source
branches/sid-uploads/ibutils/trunk/debian/patches/
branches/sid-uploads/ibutils/trunk/debian/patches/00list
branches/sid-uploads/ibutils/trunk/debian/patches/01_topomatch_diff.dpatch
branches/sid-uploads/ibutils/trunk/debian/patches/02_sysdef_diff.dpatch
branches/sid-uploads/infiniband-diags/trunk/debian/README.source
branches/sid-uploads/infiniband-diags/trunk/debian/lintian-overrides
branches/sid-uploads/ofed-docs/branches/upstream/current/dhcp/0001-Make-DHCP-server-print-HW-info.patch
branches/sid-uploads/ofed-docs/trunk/dhcp/0001-Make-DHCP-server-print-HW-info.patch
Modified:
branches/sid-uploads/ibutils/trunk/debian/control
branches/sid-uploads/ibutils/trunk/debian/rules
Added: branches/sid-uploads/ibutils/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/README.source?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/README.source (added)
+++ branches/sid-uploads/ibutils/trunk/debian/README.source Fri Dec 25 22:07:46 2009
@@ -1,0 +1,2 @@
+/usr/share/doc/dpatch/README.source.gz
+
Modified: branches/sid-uploads/ibutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/control?rev=527&op=diff
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/control (original)
+++ branches/sid-uploads/ibutils/trunk/debian/control Fri Dec 25 22:07:46 2009
@@ -3,7 +3,7 @@
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, chrpath, swig1.3, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
+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
Added: branches/sid-uploads/ibutils/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/patches/00list?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/patches/00list (added)
+++ branches/sid-uploads/ibutils/trunk/debian/patches/00list Fri Dec 25 22:07:46 2009
@@ -1,0 +1,3 @@
+01_topomatch_diff
+02_sysdef_diff
+
Added: branches/sid-uploads/ibutils/trunk/debian/patches/01_topomatch_diff.dpatch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/patches/01_topomatch_diff.dpatch?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/patches/01_topomatch_diff.dpatch (added)
+++ branches/sid-uploads/ibutils/trunk/debian/patches/01_topomatch_diff.dpatch Fri Dec 25 22:07:46 2009
@@ -1,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) {
+
Added: branches/sid-uploads/ibutils/trunk/debian/patches/02_sysdef_diff.dpatch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/patches/02_sysdef_diff.dpatch?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/patches/02_sysdef_diff.dpatch (added)
+++ branches/sid-uploads/ibutils/trunk/debian/patches/02_sysdef_diff.dpatch Fri Dec 25 22:07:46 2009
@@ -1,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);
+
Modified: branches/sid-uploads/ibutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ibutils/trunk/debian/rules?rev=527&op=diff
==============================================================================
--- branches/sid-uploads/ibutils/trunk/debian/rules (original)
+++ branches/sid-uploads/ibutils/trunk/debian/rules Fri Dec 25 22:07:46 2009
@@ -22,7 +22,7 @@
-config.status: configure
+config.status: patch configure
dh_testdir
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -45,7 +45,8 @@
touch $@
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -56,6 +57,15 @@
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
Added: branches/sid-uploads/infiniband-diags/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/infiniband-diags/trunk/debian/README.source?rev=527&op=file
==============================================================================
--- branches/sid-uploads/infiniband-diags/trunk/debian/README.source (added)
+++ branches/sid-uploads/infiniband-diags/trunk/debian/README.source Fri Dec 25 22:07:46 2009
@@ -1,0 +1,2 @@
+/usr/share/doc/dpatch/README.source.gz
+
Added: branches/sid-uploads/infiniband-diags/trunk/debian/lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/infiniband-diags/trunk/debian/lintian-overrides?rev=527&op=file
==============================================================================
--- branches/sid-uploads/infiniband-diags/trunk/debian/lintian-overrides (added)
+++ branches/sid-uploads/infiniband-diags/trunk/debian/lintian-overrides Fri Dec 25 22:07:46 2009
@@ -1,0 +1,1 @@
+infiniband-diags: binary-or-shlib-defines-rpath ./usr/sbin/ibnetdiscover /usr/lib
Added: branches/sid-uploads/ofed-docs/branches/upstream/current/dhcp/0001-Make-DHCP-server-print-HW-info.patch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofed-docs/branches/upstream/current/dhcp/0001-Make-DHCP-server-print-HW-info.patch?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ofed-docs/branches/upstream/current/dhcp/0001-Make-DHCP-server-print-HW-info.patch (added)
+++ branches/sid-uploads/ofed-docs/branches/upstream/current/dhcp/0001-Make-DHCP-server-print-HW-info.patch Fri Dec 25 22:07:46 2009
@@ -1,0 +1,58 @@
+From 37cb19b5b3da9a8c3f61eeb3c4fa5885c70a4375 Mon Sep 17 00:00:00 2001
+From: Eli Cohen <eli at mellanox.co.il>
+Date: Tue, 23 Jun 2009 10:11:55 +0300
+Subject: [PATCH] Make DHCP server print HW info
+
+When the DHCP server gets a request, it prints to the log file the HW address
+which sent the request. Since for IPoIB the HW address is not conveyed on
+messages, this patch will put the client identifer in the HW address. This is
+fine since we put the HW address in the client identifier.
+
+Signed-off-by: Eli Cohen <eli at mellanox.co.il>
+---
+ common/discover.c | 4 ++--
+ server/dhcp.c | 12 ++++++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/common/discover.c b/common/discover.c
+index b0387d0..c4f7200 100644
+--- a/common/discover.c
++++ b/common/discover.c
+@@ -533,9 +533,9 @@ void discover_interfaces (state)
+ #endif
+
+ case ARPHRD_INFINIBAND:
+- tmp -> hw_address.hlen = 1;
++ tmp -> hw_address.hlen = 16;
+ tmp -> hw_address.hbuf [0] = ARPHRD_INFINIBAND;
+- memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 20);
++ memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 16);
+ break;
+
+ default:
+diff --git a/server/dhcp.c b/server/dhcp.c
+index 1c90a6c..b558cfb 100644
+--- a/server/dhcp.c
++++ b/server/dhcp.c
+@@ -262,6 +262,18 @@ void dhcpdiscover (packet, ms_nulltp)
+ #if defined (FAILOVER_PROTOCOL)
+ dhcp_failover_state_t *peer;
+ #endif
++ struct option_cache *oc;
++
++ if (packet->raw->htype == ARPHRD_INFINIBAND) {
++ oc = lookup_option (&dhcp_universe, packet->options, DHO_DHCP_CLIENT_IDENTIFIER);
++ if (oc) {
++ int len;
++
++ len = oc->data.len > 16 ? 16 : oc->data.len;
++ packet->raw->hlen = len;
++ memcpy(packet->raw->chaddr, oc->data.data, len);
++ }
++ }
+
+ find_lease (&lease, packet, packet -> shared_network,
+ 0, &peer_has_leases, (struct lease *)0, MDL);
+--
+1.6.3.2
+
Added: branches/sid-uploads/ofed-docs/trunk/dhcp/0001-Make-DHCP-server-print-HW-info.patch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/sid-uploads/ofed-docs/trunk/dhcp/0001-Make-DHCP-server-print-HW-info.patch?rev=527&op=file
==============================================================================
--- branches/sid-uploads/ofed-docs/trunk/dhcp/0001-Make-DHCP-server-print-HW-info.patch (added)
+++ branches/sid-uploads/ofed-docs/trunk/dhcp/0001-Make-DHCP-server-print-HW-info.patch Fri Dec 25 22:07:46 2009
@@ -1,0 +1,58 @@
+From 37cb19b5b3da9a8c3f61eeb3c4fa5885c70a4375 Mon Sep 17 00:00:00 2001
+From: Eli Cohen <eli at mellanox.co.il>
+Date: Tue, 23 Jun 2009 10:11:55 +0300
+Subject: [PATCH] Make DHCP server print HW info
+
+When the DHCP server gets a request, it prints to the log file the HW address
+which sent the request. Since for IPoIB the HW address is not conveyed on
+messages, this patch will put the client identifer in the HW address. This is
+fine since we put the HW address in the client identifier.
+
+Signed-off-by: Eli Cohen <eli at mellanox.co.il>
+---
+ common/discover.c | 4 ++--
+ server/dhcp.c | 12 ++++++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/common/discover.c b/common/discover.c
+index b0387d0..c4f7200 100644
+--- a/common/discover.c
++++ b/common/discover.c
+@@ -533,9 +533,9 @@ void discover_interfaces (state)
+ #endif
+
+ case ARPHRD_INFINIBAND:
+- tmp -> hw_address.hlen = 1;
++ tmp -> hw_address.hlen = 16;
+ tmp -> hw_address.hbuf [0] = ARPHRD_INFINIBAND;
+- memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 20);
++ memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 16);
+ break;
+
+ default:
+diff --git a/server/dhcp.c b/server/dhcp.c
+index 1c90a6c..b558cfb 100644
+--- a/server/dhcp.c
++++ b/server/dhcp.c
+@@ -262,6 +262,18 @@ void dhcpdiscover (packet, ms_nulltp)
+ #if defined (FAILOVER_PROTOCOL)
+ dhcp_failover_state_t *peer;
+ #endif
++ struct option_cache *oc;
++
++ if (packet->raw->htype == ARPHRD_INFINIBAND) {
++ oc = lookup_option (&dhcp_universe, packet->options, DHO_DHCP_CLIENT_IDENTIFIER);
++ if (oc) {
++ int len;
++
++ len = oc->data.len > 16 ? 16 : oc->data.len;
++ packet->raw->hlen = len;
++ memcpy(packet->raw->chaddr, oc->data.data, len);
++ }
++ }
+
+ find_lease (&lease, packet, packet -> shared_network,
+ 0, &peer_has_leases, (struct lease *)0, MDL);
+--
+1.6.3.2
+
More information about the Pkg-ofed-commits
mailing list