[Pkg-openmpi-commits] r319 - in /openmpi/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Wed Nov 7 15:24:50 UTC 2012
Author: sylvestre
Date: Wed Nov 7 15:24:49 2012
New Revision: 319
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=319
Log:
* New upstream release
* Fix bashims (Closes: #690929)
* Remove mca_pml_crcpw.so on ia64 & sparc
Added:
openmpi/trunk/debian/patches/fix-bashims.diff
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/libopenmpi1.6-dev.links
openmpi/trunk/debian/libopenmpi1.6.install
openmpi/trunk/debian/libopenmpi1.6.install.armel
openmpi/trunk/debian/libopenmpi1.6.install.armhf
openmpi/trunk/debian/libopenmpi1.6.install.ia64
openmpi/trunk/debian/libopenmpi1.6.install.sparc
openmpi/trunk/debian/libopenmpi1.6.links
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/rules
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Wed Nov 7 15:24:49 2012
@@ -1,3 +1,11 @@
+openmpi1.6 (1.6.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix bashims (Closes: #690929)
+ * Remove mca_pml_crcpw.so on ia64 & sparc
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 07 Nov 2012 11:50:54 +0100
+
openmpi1.6 (1.6.2-2) unstable; urgency=low
* Remove mca_grpcomm_hier.so on all archs
Modified: openmpi/trunk/debian/libopenmpi1.6-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6-dev.links?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6-dev.links (original)
+++ openmpi/trunk/debian/libopenmpi1.6-dev.links Wed Nov 7 15:24:49 2012
@@ -10,7 +10,7 @@
usr/lib/libmca_common_sm.so.3 usr/lib/libmca_common_sm.so
usr/lib/libmpi_cxx.so.1 usr/lib/libmpi_cxx.so
usr/lib/libmpi_f77.so.1 usr/lib/libmpi_f77.so
-usr/lib/libmpi_f90.so.1 usr/lib/libmpi_f90.so
+usr/lib/libmpi_f90.so.3 usr/lib/libmpi_f90.so
usr/lib/libompitrace.so.0 usr/lib/libompitrace.so
usr/lib/libopen-pal.so.4 usr/lib/libopen-pal.so
usr/lib/libopen-rte.so.4 usr/lib/libopen-rte.so
Modified: openmpi/trunk/debian/libopenmpi1.6.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.install (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install Wed Nov 7 15:24:49 2012
@@ -1,12 +1,12 @@
## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3
## Plugins
usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
Modified: openmpi/trunk/debian/libopenmpi1.6.install.armel
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install.armel?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.install.armel (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install.armel Wed Nov 7 15:24:49 2012
@@ -1,12 +1,12 @@
OB## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3
## Plugins
usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
Modified: openmpi/trunk/debian/libopenmpi1.6.install.armhf
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install.armhf?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.install.armhf (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install.armhf Wed Nov 7 15:24:49 2012
@@ -1,12 +1,12 @@
## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3
## Plugins
usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
Modified: openmpi/trunk/debian/libopenmpi1.6.install.ia64
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install.ia64?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.install.ia64 (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install.ia64 Wed Nov 7 15:24:49 2012
@@ -1,12 +1,12 @@
## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3
## Plugins
usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
@@ -60,7 +60,6 @@
usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
usr/lib/openmpi/lib/openmpi/mca_pml_bfo.so
usr/lib/openmpi/lib/openmpi/mca_pml_cm.so
-usr/lib/openmpi/lib/openmpi/mca_pml_crcpw.so
usr/lib/openmpi/lib/openmpi/mca_pml_csum.so
usr/lib/openmpi/lib/openmpi/mca_pml_ob1.so
usr/lib/openmpi/lib/openmpi/mca_pml_v.so
Modified: openmpi/trunk/debian/libopenmpi1.6.install.sparc
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.install.sparc?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.install.sparc (original)
+++ openmpi/trunk/debian/libopenmpi1.6.install.sparc Wed Nov 7 15:24:49 2012
@@ -1,12 +1,12 @@
## Shared libraries
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3
## Plugins
usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
@@ -60,7 +60,6 @@
usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
usr/lib/openmpi/lib/openmpi/mca_pml_bfo.so
usr/lib/openmpi/lib/openmpi/mca_pml_cm.so
-usr/lib/openmpi/lib/openmpi/mca_pml_crcpw.so
usr/lib/openmpi/lib/openmpi/mca_pml_csum.so
usr/lib/openmpi/lib/openmpi/mca_pml_ob1.so
usr/lib/openmpi/lib/openmpi/mca_pml_v.so
Modified: openmpi/trunk/debian/libopenmpi1.6.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi1.6.links?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.6.links (original)
+++ openmpi/trunk/debian/libopenmpi1.6.links Wed Nov 7 15:24:49 2012
@@ -1,18 +1,18 @@
# Compatibility links to /usr/bin
usr/lib/openmpi/lib/libmca_common_sm.so.3.0.0 usr/lib/libmca_common_sm.so.3.0.0
usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1 usr/lib/libmpi_cxx.so.1.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.1.0.3 usr/lib/libmpi_f77.so.1.0.3
-usr/lib/openmpi/lib/libmpi_f90.so.1.1.0 usr/lib/libmpi_f90.so.1.1.0
-usr/lib/openmpi/lib/libmpi.so.1.0.3 usr/lib/libmpi.so.1.0.3
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.6 usr/lib/libmpi_f77.so.1.0.6
+usr/lib/openmpi/lib/libmpi_f90.so.3.1.0 usr/lib/libmpi_f90.so.3.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.6 usr/lib/libmpi.so.1.0.6
usr/lib/openmpi/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0.0.0
-usr/lib/openmpi/lib/libopen-pal.so.4.0.0 usr/lib/libopen-pal.so.4.0.0
-usr/lib/openmpi/lib/libopen-rte.so.4.0.0 usr/lib/libopen-rte.so.4.0.0
+usr/lib/openmpi/lib/libopen-pal.so.4.0.3 usr/lib/libopen-pal.so.4.0.3
+usr/lib/openmpi/lib/libopen-rte.so.4.0.3 usr/lib/libopen-rte.so.4.0.3
# SONAME symlinks
usr/lib/libmca_common_sm.so.3.0.0 usr/lib/libmca_common_sm.so.3
usr/lib/libmpi_cxx.so.1.0.1 usr/lib/libmpi_cxx.so.1
-usr/lib/libmpi_f77.so.1.0.3 usr/lib/libmpi_f77.so.1
-usr/lib/libmpi_f90.so.1.1.0 usr/lib/libmpi_f90.so.1
-usr/lib/libmpi.so.1.0.3 usr/lib/libmpi.so.1
+usr/lib/libmpi_f77.so.1.0.6 usr/lib/libmpi_f77.so.1
+usr/lib/libmpi_f90.so.3.1.0 usr/lib/libmpi_f90.so.3
+usr/lib/libmpi.so.1.0.6 usr/lib/libmpi.so.1
usr/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0
-usr/lib/libopen-pal.so.4.0.0 usr/lib/libopen-pal.so.4
-usr/lib/libopen-rte.so.4.0.0 usr/lib/libopen-rte.so.4
+usr/lib/libopen-pal.so.4.0.3 usr/lib/libopen-pal.so.4
+usr/lib/libopen-rte.so.4.0.3 usr/lib/libopen-rte.so.4
Added: openmpi/trunk/debian/patches/fix-bashims.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/fix-bashims.diff?rev=319&op=file
==============================================================================
--- openmpi/trunk/debian/patches/fix-bashims.diff (added)
+++ openmpi/trunk/debian/patches/fix-bashims.diff Wed Nov 7 15:24:49 2012
@@ -1,0 +1,33 @@
+Index: openmpi1.6-1.6.3/orte/tools/orte-bootproxy/orte-bootproxy.sh
+===================================================================
+--- openmpi1.6-1.6.3.orig/orte/tools/orte-bootproxy/orte-bootproxy.sh 2012-04-03 16:30:31.000000000 +0200
++++ openmpi1.6-1.6.3/orte/tools/orte-bootproxy/orte-bootproxy.sh 2012-11-07 15:44:16.847838743 +0100
+@@ -4,7 +4,7 @@
+ # Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
+ #
+
+-if (( $# < 1 )) ; then
++if test $# -lt 1; then
+ echo "orte-bootproxy.sh: for OMPI internal use only"
+ exit 1
+ fi
+@@ -69,12 +69,13 @@
+ fi
+
+ # push all MCA params to the environment
+-while [ "${var:0:5}" = "OMPI_" ]; do
+- if [ "${var:5:6}" = "PREFIX" ]; then
+- export LD_LIBRARY_PATH="${var:12}"/lib:$LD_LIBRARY_PATH
+- export PATH="${var:12}"/bin:$PATH
+- elif [ "${var:5:4}" = "WDIR" ]; then
+- cd "${var:10}"
++while [ "$(echo $var | awk '{ string=substr($0, 1, 5); print string; }' )" = "OMPI_" ]; do
++ if [ "$(echo $var | awk '{ string=substr($0, 6, 6); print string; }' )" = "PREFIX" ]; then
++ TMP_PATH=$(echo $var | awk '{ string=substr($0, 1, 12); print string; }' )
++ export LD_LIBRARY_PATH="$TMP_PATH"/lib:$LD_LIBRARY_PATH
++ export PATH="$TMP_PATH"/bin:$PATH
++ elif [ "$(echo $var | awk '{ string=substr($0, 5, 4); print string; }' )" = "WDIR" ]; then
++ cd "$(echo $var | awk '{ string=substr($0, 1, 10); print string; }' )"
+ else
+ export $var
+ fi
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Wed Nov 7 15:24:49 2012
@@ -9,3 +9,4 @@
# 658600: Regression of bug 531522
#fix-fakeroot-execution.patch
arm_detection.diff
+fix-bashims.diff
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=319&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Wed Nov 7 15:24:49 2012
@@ -83,8 +83,8 @@
override_dh_installdocs:
dh_installdocs --all AUTHORS NEWS README
-#override_dh_shlibdeps:
-# LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib" dh_shlibdeps -- --ignore-missing-info
+override_dh_shlibdeps:
+ LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib" dh_shlibdeps -- --ignore-missing-info
override_dh_strip:
dh_strip --dbg-package=libopenmpi1.6-dbg
More information about the Pkg-openmpi-commits
mailing list