[Pkg-ofed-commits] [opensm] 06/07: Imported Debian patch 3.3.15-0.1

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Tue Jul 1 07:19:53 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 5a37949acc5729c7b01929f30b01c91a546cf7e8
Merge: 243d522 f379871
Author: Roland Dreier <rbd at debian.org>
Date:   Mon Oct 15 09:52:18 2012 -0700

    Imported Debian patch 3.3.15-0.1

 ChangeLog                                          | 11027 ++++++++++++++++++-
 Makefile.am                                        |    15 +-
 Makefile.in                                        |   446 +-
 aclocal.m4                                         |  8934 ++++++++++++++-
 complib/Makefile.am                                |     5 -
 complib/Makefile.in                                |   275 +-
 complib/cl_complib.c                               |     6 +-
 complib/cl_dispatcher.c                            |    48 +-
 complib/cl_event.c                                 |    36 +-
 complib/cl_event_wheel.c                           |    43 +-
 complib/cl_list.c                                  |   125 +-
 complib/cl_log.c                                   |     9 +-
 complib/cl_map.c                                   |   174 +-
 complib/cl_nodenamemap.c                           |    34 +-
 complib/cl_pool.c                                  |   113 +-
 complib/cl_ptr_vector.c                            |    56 +-
 complib/cl_thread.c                                |     8 +-
 complib/cl_threadpool.c                            |    11 +-
 complib/cl_timer.c                                 |    71 +-
 complib/cl_vector.c                                |    85 +-
 complib/libosmcomp.map                             |     1 +
 complib/libosmcomp.ver                             |     2 +-
 config/config.guess                                |   514 +-
 config/config.sub                                  |   249 +-
 config/depcomp                                     |   153 +-
 config/install-sh                                  |    32 +-
 config/libtool.m4                                  |  7370 -------------
 config/ltmain.sh                                   |  4070 ++++---
 config/ltoptions.m4                                |   368 -
 config/ltsugar.m4                                  |   123 -
 config/ltversion.m4                                |    23 -
 config/lt~obsolete.m4                              |    92 -
 config/missing                                     |    94 +-
 config/osmvsel.m4                                  |    39 +-
 config/ylwrap                                      |    41 +-
 configure                                          |  8903 +++++++--------
 configure.in                                       |    29 +-
 debian/README.source                               |     1 -
 debian/changelog                                   |    41 +
 debian/control                                     |    16 +-
 ...ibopensm2-dev.install => libopensm-dev.install} |     0
 debian/{libopensm2.install => libopensm5.install}  |     0
 debian/opensm-boot.init                            |    10 +-
 debian/opensm.init                                 |     6 +-
 debian/opensm.logrotate                            |     2 +-
 debian/opensm.postinst                             |     4 +-
 debian/patches/00list                              |     1 -
 .../patches/01_gcc_4.4_else_in_place_elif.dpatch   |    19 -
 debian/rules                                       |    18 +-
 debian/source/format                               |     1 +
 doc/QoS_management_in_OpenSM.txt                   |     9 +
 doc/opensm-sriov.txt                               |   154 +
 doc/opensm_release_notes-3.2.txt                   |   626 --
 doc/opensm_release_notes-3.3.txt                   |  1164 ++
 doc/partition-config.txt                           |   176 +
 doc/performance-manager-HOWTO.txt                  |    11 +-
 include/Makefile.in                                |   218 +-
 include/complib/cl_atomic.h                        |    12 +-
 include/complib/cl_atomic_osd.h                    |     4 +-
 include/complib/cl_fleximap.h                      |    52 +-
 include/complib/cl_nodenamemap.h                   |     3 +-
 include/complib/cl_passivelock.h                   |    16 +-
 include/complib/cl_ptr_vector.h                    |     2 +-
 include/complib/cl_types.h                         |    63 +-
 include/complib/cl_types_osd.h                     |     7 +-
 include/complib/cl_vector.h                        |     2 +-
 include/config.h.in                                |     9 +
 include/iba/ib_cm_types.h                          |     4 +-
 include/iba/ib_types.h                             |  1802 ++-
 include/opensm/osm_attrib_req.h                    |     2 +-
 include/opensm/osm_base.h                          |   214 +-
 include/opensm/osm_config.h                        |    65 +
 include/opensm/osm_congestion_control.h            |   132 +
 include/opensm/osm_console.h                       |     3 +-
 include/opensm/osm_console_io.h                    |     9 +-
 include/opensm/osm_db.h                            |    24 +-
 include/opensm/osm_db_pack.h                       |   351 +-
 include/opensm/osm_event_plugin.h                  |    23 +-
 include/opensm/osm_file_ids.h                      |   156 +
 include/opensm/{osm_pkey_mgr.h => osm_guid.h}      |    56 +-
 include/opensm/osm_helper.h                        |   546 +-
 include/opensm/osm_inform.h                        |    21 +-
 include/opensm/osm_lid_mgr.h                       |    30 +-
 include/opensm/osm_log.h                           |   174 +-
 include/opensm/osm_mad_pool.h                      |    32 +-
 include/opensm/osm_madw.h                          |   159 +-
 include/opensm/osm_mcast_tbl.h                     |   101 +-
 include/opensm/osm_mcm_info.h                      |   136 -
 include/opensm/osm_mcm_port.h                      |   159 +-
 .../cl_nodenamemap.h => opensm/osm_mesh.h}         |    64 +-
 include/opensm/osm_msgdef.h                        |     5 +-
 include/opensm/osm_mtree.h                         |    18 +-
 include/opensm/osm_multicast.h                     |   258 +-
 include/opensm/osm_node.h                          |    89 +-
 include/opensm/osm_opensm.h                        |    72 +-
 include/opensm/osm_partition.h                     |    32 +-
 include/opensm/osm_path.h                          |    59 +-
 include/opensm/osm_perfmgr.h                       |   117 +-
 include/opensm/osm_perfmgr_db.h                    |    45 +-
 include/opensm/osm_pkey.h                          |   184 +-
 include/opensm/osm_port.h                          |   439 +-
 include/opensm/osm_port_profile.h                  |    13 +-
 include/opensm/osm_qos_policy.h                    |     9 +-
 include/opensm/osm_remote_sm.h                     |    12 +-
 include/opensm/osm_router.h                        |    18 +-
 include/opensm/osm_sa.h                            |    62 +-
 include/opensm/osm_sa_mad_ctrl.h                   |    31 +-
 include/opensm/osm_service.h                       |    21 +-
 include/opensm/osm_sm.h                            |   217 +-
 include/opensm/osm_sm_mad_ctrl.h                   |    34 +-
 include/opensm/osm_subnet.h                        |   633 +-
 include/opensm/osm_switch.h                        |   267 +-
 include/opensm/osm_ucast_cache.h                   |     3 +-
 .../opensm/osm_ucast_lash.h                        |    87 +-
 include/opensm/osm_ucast_mgr.h                     |    32 +-
 .../osm_mcm_info.c => include/opensm/osm_version.h |    49 +-
 include/opensm/osm_vl15intf.h                      |    48 +-
 include/opensm/st.h                                |     3 +-
 include/vendor/osm_vendor.h                        |     4 +-
 include/vendor/osm_vendor_api.h                    |    14 +-
 include/vendor/osm_vendor_ibumad.h                 |    10 +-
 include/vendor/osm_vendor_mlx.h                    |     5 +-
 include/vendor/osm_vendor_mlx_defs.h               |     4 +-
 include/vendor/osm_vendor_mlx_svc.h                |     6 -
 include/vendor/osm_vendor_sa_api.h                 |    14 +-
 libvendor/Makefile.in                              |   327 +-
 libvendor/libosmvendor.ver                         |     2 +-
 libvendor/osm_pkt_randomizer.c                     |    16 +-
 libvendor/osm_vendor_ibumad.c                      |   205 +-
 libvendor/osm_vendor_ibumad_sa.c                   |   180 +-
 libvendor/osm_vendor_mlx.c                         |    12 +-
 libvendor/osm_vendor_mlx_dispatcher.c              |    22 +-
 libvendor/osm_vendor_mlx_hca.c                     |     4 +-
 libvendor/osm_vendor_mlx_hca_sim.c                 |     6 +-
 libvendor/osm_vendor_mlx_rmpp_ctx.c                |     2 +-
 libvendor/osm_vendor_mlx_sa.c                      |   360 +-
 libvendor/osm_vendor_mlx_sender.c                  |     4 +-
 libvendor/osm_vendor_mlx_txn.c                     |    41 +-
 man/{opensm.8.in => opensm.8}                      |   663 +-
 man/opensm.8.in                                    |   647 +-
 man/osmtest.8                                      |     7 +-
 man/torus-2QoS.8                                   |   476 +
 man/torus-2QoS.8.in                                |   476 +
 man/torus-2QoS.conf.5                              |   210 +
 man/torus-2QoS.conf.5.in                           |   210 +
 opensm.spec.in => opensm.spec                      |    26 +-
 opensm.spec.in                                     |    16 +-
 opensm/Makefile.am                                 |    30 +-
 opensm/Makefile.in                                 |   314 +-
 opensm/libopensm.map                               |    41 +-
 opensm/libopensm.ver                               |     2 +-
 opensm/main.c                                      |   440 +-
 opensm/osm_congestion_control.c                    |   746 ++
 opensm/osm_console.c                               |   674 +-
 opensm/osm_console_io.c                            |   146 +-
 opensm/osm_db_files.c                              |   171 +-
 opensm/osm_db_pack.c                               |   228 +-
 opensm/osm_drop_mgr.c                              |   206 +-
 opensm/osm_dump.c                                  |   179 +-
 opensm/osm_event_plugin.c                          |    14 +-
 .../{osm_mcast_fwd_rcv.c => osm_guid_info_rcv.c}   |    97 +-
 opensm/osm_guid_mgr.c                              |   144 +
 opensm/osm_helper.c                                |  2769 +++--
 opensm/osm_inform.c                                |   337 +-
 opensm/osm_lid_mgr.c                               |   702 +-
 opensm/osm_lin_fwd_rcv.c                           |    18 +-
 opensm/osm_link_mgr.c                              |   315 +-
 opensm/osm_log.c                                   |   245 +-
 opensm/osm_mad_pool.c                              |    47 +-
 opensm/osm_mcast_fwd_rcv.c                         |    17 +-
 opensm/osm_mcast_mgr.c                             |   919 +-
 opensm/osm_mcast_tbl.c                             |   174 +-
 opensm/osm_mcm_port.c                              |    50 +-
 opensm/osm_mesh.c                                  |  1736 +++
 ...osm_pkey_rcv.c => osm_mlnx_ext_port_info_rcv.c} |   121 +-
 opensm/osm_mtree.c                                 |    55 +-
 opensm/osm_multicast.c                             |   433 +-
 opensm/osm_node.c                                  |   128 +-
 opensm/osm_node_desc_rcv.c                         |    34 +-
 opensm/osm_node_info_rcv.c                         |   469 +-
 opensm/osm_opensm.c                                |   173 +-
 opensm/osm_perfmgr.c                               |   804 +-
 opensm/osm_perfmgr_db.c                            |   728 +-
 opensm/osm_pkey.c                                  |   325 +-
 opensm/osm_pkey_mgr.c                              |   554 +-
 opensm/osm_pkey_rcv.c                              |    22 +-
 opensm/osm_port.c                                  |   379 +-
 opensm/osm_port_info_rcv.c                         |   227 +-
 opensm/osm_prtn.c                                  |   228 +-
 opensm/osm_prtn_config.c                           |   444 +-
 opensm/osm_qos.c                                   |   473 +-
 opensm/osm_qos_parser_l.c                          |   895 +-
 opensm/osm_qos_parser_l.l                          |    12 +-
 opensm/osm_qos_parser_y.c                          |  2010 ++--
 opensm/osm_qos_parser_y.h                          |    48 +-
 opensm/osm_qos_parser_y.y                          |   136 +-
 opensm/osm_qos_policy.c                            |   189 +-
 opensm/osm_remote_sm.c                             |    22 +-
 opensm/osm_req.c                                   |   260 +-
 opensm/osm_resp.c                                  |    31 +-
 opensm/osm_router.c                                |    16 +-
 opensm/osm_sa.c                                    |   334 +-
 opensm/osm_sa_class_port_info.c                    |    37 +-
 opensm/osm_sa_guidinfo_record.c                    |   596 +-
 opensm/osm_sa_informinfo.c                         |   172 +-
 opensm/osm_sa_lft_record.c                         |    49 +-
 opensm/osm_sa_link_record.c                        |   159 +-
 opensm/osm_sa_mad_ctrl.c                           |   186 +-
 opensm/osm_sa_mcmember_record.c                    |   947 +-
 opensm/osm_sa_mft_record.c                         |    53 +-
 opensm/osm_sa_multipath_record.c                   |   686 +-
 opensm/osm_sa_node_record.c                        |   212 +-
 opensm/osm_sa_path_record.c                        |  1468 +--
 opensm/osm_sa_pkey_record.c                        |   118 +-
 opensm/osm_sa_portinfo_record.c                    |   219 +-
 opensm/osm_sa_service_record.c                     |   251 +-
 opensm/osm_sa_slvl_record.c                        |    75 +-
 opensm/osm_sa_sminfo_record.c                      |   102 +-
 opensm/osm_sa_sw_info_record.c                     |    68 +-
 opensm/osm_sa_vlarb_record.c                       |    90 +-
 opensm/osm_service.c                               |    69 +-
 opensm/osm_slvl_map_rcv.c                          |    93 +-
 opensm/osm_sm.c                                    |   325 +-
 opensm/osm_sm_mad_ctrl.c                           |   390 +-
 opensm/osm_sm_state_mgr.c                          |   154 +-
 opensm/osm_sminfo_rcv.c                            |   156 +-
 opensm/osm_state_mgr.c                             |   508 +-
 opensm/osm_subnet.c                                |  2538 +++--
 opensm/osm_sw_info_rcv.c                           |   252 +-
 opensm/osm_switch.c                                |   453 +-
 opensm/osm_torus.c                                 |  9324 ++++++++++++++++
 opensm/osm_trap_rcv.c                              |   446 +-
 opensm/osm_ucast_cache.c                           |   316 +-
 opensm/osm_ucast_dfsssp.c                          |  2188 ++++
 opensm/osm_ucast_dnup.c                            |   499 +
 opensm/osm_ucast_file.c                            |    61 +-
 opensm/osm_ucast_ftree.c                           |  2301 ++--
 opensm/osm_ucast_lash.c                            |   580 +-
 opensm/osm_ucast_mgr.c                             |   791 +-
 opensm/osm_ucast_updn.c                            |    52 +-
 opensm/osm_vl15intf.c                              |    89 +-
 opensm/osm_vl_arb_rcv.c                            |    27 +-
 opensm/st.c                                        |    11 +-
 osmeventplugin/Makefile.in                         |   174 +-
 osmeventplugin/libosmeventplugin.ver               |     2 +-
 osmeventplugin/src/osmeventplugin.c                |    43 +-
 osmtest/Makefile.in                                |   186 +-
 osmtest/include/osmtest_base.h                     |     7 +-
 osmtest/main.c                                     |    40 +-
 osmtest/osmt_inform.c                              |     4 +-
 osmtest/osmt_mtl_regular_qp.c                      |     7 +-
 osmtest/osmt_multicast.c                           |   890 +-
 osmtest/osmt_service.c                             |    38 +-
 osmtest/osmt_slvl_vl_arb.c                         |    43 +-
 osmtest/osmtest.c                                  |   365 +-
 scripts/{opensm.init.in => opensm.init}            |     9 +-
 scripts/opensm.init.in                             |     1 +
 scripts/redhat-opensm.init                         |   292 +
 scripts/{sldd.sh.in => sldd.sh}                    |   149 +-
 scripts/sldd.sh.in                                 |   143 +-
 260 files changed, 73533 insertions(+), 33642 deletions(-)

diff --cc debian/changelog
index db6a0c3,0000000..7863836
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,0 +1,62 @@@
++opensm (3.3.15-0.1) experimental; urgency=low
++
++  * Non-maintainer upload.
++  * Acknowledge NMU.
++  * New upstream release.
++  * Bump Standards-Version to 3.9.4 (no changes).
++  * Switch to dpkg-source 3.0 (quilt) format.
++  * Don't email root from logrotate just because opensm isn't running.
++  * libopensm4 -> libopensm5 due to soname bump. 
++
++ -- Roland Dreier <rbd at debian.org>  Mon, 15 Oct 2012 09:52:18 -0700
++
++opensm (3.3.12-1) unstable; urgency=low
++
++  * New upstream release. OFED 1.5.4.
++
++ -- Ana Guerrero <ana at debian.org>  Wed, 14 Mar 2012 09:45:52 +0100
++
++opensm (3.3.7-OFED-1.5.2-1) experimental; urgency=low
++
++  * New OFED release.
++  * debian/opensm.postinst:
++    + Update initscript priority only when configuring.
++  * debian/opensm.init:
++  * debian/opensm-boot.init:
++    + Add missing $remote_fs start/stop dependency.
++    + Bring LSB start/stop levels in line with update-rc.d call.
++  * debian/control:
++    + Bump Standards-Version to 3.9.1 (no changes).
++    + Bump libibumad-dev build-dep. 
++    + libopensm2-dev -> libopensm-dev. 
++    + libopensm2 -> libopensm4 due to soname bump. 
++
++ -- Julien BLACHE <jblache at debian.org>  Thu, 04 Nov 2010 15:32:36 +0100
++
++opensm (3.3.5-1) unstable; urgency=low
++
++  * New upstream release (OFED 1.5)
++
++ -- Guy Coates <gmpc at sanger.ac.uk>  Fri, 05 Feb 2010 11:27:52 +0000
++
 +opensm (3.2.6-20090317-2.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Don't ship .la files (Closes: #622537).
 +  * Require $remote_fs in initscripts as /usr is used unconditionally.
 +
 + -- Luk Claes <luk at debian.org>  Sun, 26 Jun 2011 14:40:07 +0200
 +
 +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)
 +
 + -- Benoit Mortier <benoit.mortier at opensides.be>  Wed, 21 Oct 2009 11:31:00 +0100
diff --cc debian/control
index c5264ed,0000000..6e0b4e2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,46 -1,0 +1,50 @@@
 +Source: opensm
 +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, flex, bison, libibumad-dev, libibcommon-dev
- Standards-Version: 3.8.3
++Build-Depends: debhelper (>= 7), autotools-dev, flex, bison, libibumad-dev (>= 1.3.7-OFED-1.5.4)
++Standards-Version: 3.9.4
 +Homepage: http://www.openfabrics.org
++DM-Upload-Allowed: yes
 +
 +Package: opensm
 +Architecture: i386 ia64 amd64 powerpc
- Depends: ${misc:Depends}, libopensm2 (= ${binary:Version}), ${shlibs:Depends}, infiniband-diags
++Depends: ${misc:Depends}, libopensm5 (= ${binary:Version}), ${shlibs:Depends}, infiniband-diags
 +Description: An Infiniband subnet manager
 + 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.
 +
 +Package: opensm-doc
 +Section: doc
 +Architecture: i386 ia64 amd64 powerpc
 +Depends: ${misc:Depends}
 +Description: Documentation for opensm
 + Documentation for the opensm Infiniband subnet manager.
 +
- Package: libopensm2
++Package: libopensm5
 +Architecture: i386 ia64 amd64 powerpc
 +Depends: ${shlibs:Depends}, ${misc:Depends}
++Breaks: libopensm2, libopensm4
 +Description: Infiniband subnet manager libraries
 + 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.
 + .
 + This package contains shared libraries that are part of the opensm package
 + but are also used by other applications.
 +
- Package: libopensm2-dev
++Package: libopensm-dev
 +Section: libdevel
 +Architecture: i386 ia64 amd64 powerpc
- Depends: libopensm2  (= ${binary:Version}), ${misc:Depends}
++Depends: libopensm5 (= ${binary:Version}), ${misc:Depends}
++Conflicts: libopensm2-dev
++Replaces: libopensm2-dev
 +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.
 + .
 + This package contains the header files for compiling applications
 + against libopensm.
diff --cc debian/libopensm-dev.install
index d1bffed,0000000..d1bffed
mode 100644,000000..100644
--- a/debian/libopensm-dev.install
+++ b/debian/libopensm-dev.install
diff --cc debian/libopensm5.install
index d0dbfd1,0000000..d0dbfd1
mode 100644,000000..100644
--- a/debian/libopensm5.install
+++ b/debian/libopensm5.install
diff --cc debian/opensm-boot.init
index 3621806,0000000..6c1bec3
mode 100644,000000..100644
--- a/debian/opensm-boot.init
+++ b/debian/opensm-boot.init
@@@ -1,84 -1,0 +1,84 @@@
 +#!/bin/sh
 +### BEGIN INIT INFO
 +# Provides:          opensm-boot
- # Required-Start:    $syslog $remote_fs
- # Required-Stop:     $syslog $remote_fs
- # Default-Start:     2 3 4 5
- # Default-Stop:      0 1 6
++# Required-Start:    $remote_fs $syslog
++# Required-Stop:     $remote_fs $syslog
++# Default-Start:     S
++# Default-Stop:      
 +# Short-Description: Start opensm subnet manager.
- # Description:       Enable opensm subnet manage.
++# Description:       Enable opensm subnet manager.
 +### END INIT INFO
 +
 +PORTS=""
 +[ -f /etc/default/opensm ] &&  . /etc/default/opensm
 +
 +[ -x /usr/sbin/opensm ] || exit 0
 +
 +if [ ! -f /sys/class/infiniband_mad/abi_version ] ; then
 +echo "No infiniband adapters found."
 +exit 0
 +fi
 +
 +
 +start () {
 +
 +if [ "$PORTS" = "ALL" ]; then
 +PORTS=`/usr/sbin/ibstat -p`
 +fi
 +
 +if [ "$PORTS" = "NONE" ]; then
 +echo "opensm disabled."
 +exit 0
 +fi
 +
 +for PORT in $PORTS ; do
 +    echo -n "Starting opensm on $PORT: "
 +    start-stop-daemon --start --quiet --make-pidfile  --pidfile /var/run/opensm-$PORT --background --exec /usr/sbin/opensm -- -g $PORT -f /var/log/opensm.$PORT.log
 +    RETVAL=$?
 +    echo
 +done
 +}
 +
 +stop () {
 +
 +if [ "$PORTS" = "ALL" ]; then
 +PORTS=`/usr/sbin/ibstat -p`
 +fi
 +
 +if [ "$PORTS" = "NONE" ]; then
 +    echo "opensm disabled."
 +    exit 0
 +fi
 +for PORT in $PORTS ; do
 +    echo -n "Shutting down opensm: "
 +    start-stop-daemon --stop --pidfile /var/run/opensm-$PORT 
 +    RETVAL=$?
 +    echo
 +done
 +}
 +
 +
 +case "$1" in
 +    start)
 +        start
 +        ;;
 +    stop)
 +        stop
 +        ;;
 +    restart | force-reload )
 +        stop
 +	start
 +        ;;
 +    reload)
 +    echo "Reloading opensm configuration..."
 +        killall -HUP opensm
 +	RETVAL=$?
 +	echo "done"
 +        ;;
 +    *)
 +        echo "Usage: $0 {start|stop|restart|reload|force-reload}"
 +        RETVAL=1
 +        ;;
 +esac
 +
 +exit $RETVAL;
diff --cc debian/opensm.init
index 8ca8041,0000000..9b930e5
mode 100644,000000..100644
--- a/debian/opensm.init
+++ b/debian/opensm.init
@@@ -1,84 -1,0 +1,84 @@@
 +#!/bin/sh
 +### BEGIN INIT INFO
 +# Provides:          opensm
- # Required-Start:    $syslog $remote_fs
- # Required-Stop:     $syslog $remote_fs
++# Required-Start:    $remote_fs $syslog
++# Required-Stop:     $remote_fs $syslog
 +# Default-Start:     2 3 4 5
 +# Default-Stop:      0 1 6
 +# Short-Description: Start opensm subnet manager.
- # Description:       Enable opensm subnet manage.
++# Description:       Enable opensm subnet manager.
 +### END INIT INFO
 +
 +PORTS=""
 +[ -f /etc/default/opensm ] &&  . /etc/default/opensm
 +
 +[ -x /usr/sbin/opensm ] || exit 0
 +
 +if [ ! -f /sys/class/infiniband_mad/abi_version ] ; then
 +echo "No infiniband adapters found."
 +exit 0
 +fi
 +
 +
 +start () {
 +
 +if [ "$PORTS" = "ALL" ]; then
 +PORTS=`/usr/sbin/ibstat -p`
 +fi
 +
 +if [ "$PORTS" = "NONE" ]; then
 +echo "opensm disabled."
 +exit 0
 +fi
 +
 +for PORT in $PORTS ; do
 +    echo -n "Starting opensm on $PORT: "
 +    start-stop-daemon --start --quiet --make-pidfile  --pidfile /var/run/opensm-$PORT --background --exec /usr/sbin/opensm -- -g $PORT -f /var/log/opensm.$PORT.log
 +    RETVAL=$?
 +    echo
 +done
 +}
 +
 +stop () {
 +
 +if [ "$PORTS" = "ALL" ]; then
 +PORTS=`/usr/sbin/ibstat -p`
 +fi
 +
 +if [ "$PORTS" = "NONE" ]; then
 +    echo "opensm disabled."
 +    exit 0
 +fi
 +for PORT in $PORTS ; do
 +    echo -n "Shutting down opensm on $PORT: "
 +    start-stop-daemon --stop --pidfile /var/run/opensm-$PORT 
 +    RETVAL=$?
 +    echo
 +done
 +}
 +
 +
 +case "$1" in
 +    start)
 +        start
 +        ;;
 +    stop)
 +        stop
 +        ;;
 +    restart | force-reload )
 +        stop
 +	start
 +        ;;
 +    reload)
 +    echo "Reloading opensm configuration..."
 +        killall -HUP opensm
 +	RETVAL=$?
 +	echo "done"
 +        ;;
 +    *)
 +        echo "Usage: $0 {start|stop|restart|reload|force-reload}"
 +        RETVAL=1
 +        ;;
 +esac
 +
 +exit $RETVAL;
diff --cc debian/opensm.logrotate
index 3329fe8,0000000..a7cdf5c
mode 100644,000000..100644
--- a/debian/opensm.logrotate
+++ b/debian/opensm.logrotate
@@@ -1,8 -1,0 +1,8 @@@
 +/var/log/opensm*.log {
 +rotate 4
 +weekly
 +compress
 +postrotate 
-  /usr/bin/killall -SIGUSR1 /usr/sbin/opensm
++ /usr/bin/killall -SIGUSR1 /usr/sbin/opensm 2> /dev/null || true
 +endscript
 +}
diff --cc debian/opensm.postinst
index 4596cc6,0000000..34e3041
mode 100644,000000..100644
--- a/debian/opensm.postinst
+++ b/debian/opensm.postinst
@@@ -1,11 -1,0 +1,11 @@@
 +#!/bin/sh
 +
 +set -e
 +
 +. /usr/share/debconf/confmodule
 +
- if [ -x "/etc/init.d/opensm-boot" ]; then
- update-rc.d opensm-boot start 24 S . > /dev/null
++if [ "$1" = configure ] && [ -x "/etc/init.d/opensm-boot" ]; then
++	update-rc.d opensm-boot start 24 S . > /dev/null
 +fi
 +
 +#DEBHELPER#
diff --cc debian/rules
index 026af99,0000000..4f63e0f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,104 -1,0 +1,94 @@@
 +#!/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
++config.status:  configure
 +	dh_testdir
 +	# Add here commands to configure the package.
 +	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
 +	--sysconfdir=/etc --localstatedir=/var/run
 +
 +build: build-stamp
 +
 +build-stamp:  config.status 
 +	dh_testdir
 +
 +	# Add here commands to compile the package.
 +	$(MAKE)
 +	#docbook-to-man debian/opensm.sgml > opensm.1
 +
 +	touch $@
 +
- clean: clean-patched unpatch
- clean-patched:
++clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp 
 +
 +	# Add here commands to clean up after the build process.
 +	[ ! -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
 +
 +	# Add here commands to install the package into debian/opensm.
 +	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
++	rm -f $(CURDIR)/debian/tmp/usr/lib/lib*.la
 +	cp $(CURDIR)/debian/opensm-boot.init $(CURDIR)/debian/tmp/etc/init.d/opensm-boot
 +
 +
 +# 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 ChangeLog
 +	dh_installdocs
 +	dh_installexamples
 +	dh_install --list-missing
 +	dh_installdebconf
 +	dh_installlogrotate
 +	dh_installinit
 +	dh_installman
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
- 	dh_makeshlibs
++	dh_makeshlibs -V
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install 
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)

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