[Pkg-openmpi-commits] r192 - in /openmpi/trunk/debian: changelog control libopenmpi-dev.preinst openmpi-bin.README.Debian openmpi-bin.preinst patches/disable-memory-allocator patches/series
manuel at users.alioth.debian.org
manuel at users.alioth.debian.org
Tue Jun 23 23:14:01 UTC 2009
Author: manuel
Date: Tue Jun 23 23:14:00 2009
New Revision: 192
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=192
Log:
Acknowleding NMUs, preparing new upload
Added:
openmpi/trunk/debian/openmpi-bin.preinst
openmpi/trunk/debian/patches/disable-memory-allocator
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/control
openmpi/trunk/debian/libopenmpi-dev.preinst
openmpi/trunk/debian/openmpi-bin.README.Debian
openmpi/trunk/debian/patches/series
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=192&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Tue Jun 23 23:14:00 2009
@@ -1,9 +1,33 @@
-openmpi (1.3.2-3) UNRELEASED; urgency=low
-
- * Removing ancient mpicc master alternative in preinst. Closes: #531184,
- #532008.
-
- -- Manuel Prinz <manuel at debian.org> Wed, 10 Jun 2009 01:29:03 +0200
+openmpi (1.3.2-3) unstable; urgency=low
+
+ * Re-uploading, as last upload was not successful.
+ * Acknowledgement of NMU. Thanks to Steve M. Robbins for the patches and
+ NMUs! Closes: #531522.
+ * Removing ancient mpicc, mpiCC and mpiexec master alternatives in preinst.
+ Closes: #531184, #532008, #532910.
+ * debian/control: Bumped Standards-Version. No changes needed.
+ * Fixed typo in README.Debian of openmpi-bin.
+
+ -- Manuel Prinz <manuel at debian.org> Wed, 24 Jun 2009 00:33:23 +0200
+
+openmpi (1.3.2-2.2) unstable; urgency=low
+
+ * Non-Maintainer Upload (NMU)
+ * debian/patches/disable-memory-allocator: Replace with improved patch
+ from upstream.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 21 Jun 2009 13:08:05 -0500
+
+openmpi (1.3.2-2.1) unstable; urgency=low
+
+ * Non-Maintainer Upload (NMU)
+ * debian/patches/disable-memory-allocator: New. Patch
+ opal/mca/memory/ptmalloc2/hooks.c to add check for environment
+ variable OMPI_MCA_disable_memory_allocator. If set, avoid setting up
+ malloc hooks and avoid stat() calls from the malloc init hook.
+ Closes: #531522.
+
+ -- Steve M. Robbins <smr at debian.org> Wed, 17 Jun 2009 22:03:31 -0500
openmpi (1.3.2-2) unstable; urgency=low
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=192&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Tue Jun 23 23:14:00 2009
@@ -5,7 +5,7 @@
Maintainer: Debian OpenMPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre.ledru at inria.fr>
Build-Depends: debhelper (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], gfortran, gcc (>= 4:4.1.2), chrpath, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
XS-Dm-Upload-Allowed: yes
Modified: openmpi/trunk/debian/libopenmpi-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.preinst?rev=192&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.preinst (original)
+++ openmpi/trunk/debian/libopenmpi-dev.preinst Tue Jun 23 23:14:00 2009
@@ -4,8 +4,11 @@
# mpicc seemed to be used as a master alternative by some MPI package. But
# currently, all MPI packages have the mpicc alternative installed as a slave
-# link. We remove the link here in order to resolve bug #531184.
+# link. We remove the link here in order to resolve bugs #531184 and #532910.
update-alternatives --quiet --remove-all mpicc >/dev/null 2>&1 || true
+update-alternatives --quiet --remove-all mpiCC >/dev/null 2>&1 || true
+
+#DEBHELPER#
exit 0
Modified: openmpi/trunk/debian/openmpi-bin.README.Debian
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.README.Debian?rev=192&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.README.Debian (original)
+++ openmpi/trunk/debian/openmpi-bin.README.Debian Tue Jun 23 23:14:00 2009
@@ -34,7 +34,7 @@
Thread support was enabled until package version 1.2.3-3. It is known to be
broken in upstream and led to segfaults on several architectures.
-We disabled threading for this reason in 1.2.3-4 and will reenable it as soon
+We disabled threading for this reason in 1.2.3-4 and will re-enable it as soon
as it is known to be working, probably in the 1.3 branch of OpenMPI. Please
see http://bugs.debian.org/435581 for a discussion of this issue.
Added: openmpi/trunk/debian/openmpi-bin.preinst
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.preinst?rev=192&op=file
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.preinst (added)
+++ openmpi/trunk/debian/openmpi-bin.preinst Tue Jun 23 23:14:00 2009
@@ -1,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# mpiexec seemed to be used as a master alternative by some MPI package. But
+# currently, all MPI packages have the mpicc alternative installed as a slave
+# link. We remove the link here in order to resolve bug #532008.
+
+update-alternatives --quiet --remove-all mpiexec >/dev/null 2>&1 || true
+
+#DEBHELPER#
+
+exit 0
Added: openmpi/trunk/debian/patches/disable-memory-allocator
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/disable-memory-allocator?rev=192&op=file
==============================================================================
--- openmpi/trunk/debian/patches/disable-memory-allocator (added)
+++ openmpi/trunk/debian/patches/disable-memory-allocator Tue Jun 23 23:14:00 2009
@@ -1,0 +1,37 @@
+Patch to fix #531522.
+This patch is the cumulation of upstream patches:
+
+ https://svn.open-mpi.org/trac/ompi/changeset/21479
+ https://svn.open-mpi.org/trac/ompi/changeset/21489
+
+This change might make it into OMPI v1.3.3.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531522#181
+
+
+--- openmpi-1.3.2.orig/opal/mca/memory/ptmalloc2/hooks.c
++++ openmpi-1.3.2/opal/mca/memory/ptmalloc2/hooks.c
+@@ -721,10 +721,24 @@
+ (unfortunately, there's really no good way to do this other
+ than this abstraction violation :-( ) */
+ struct stat st;
++ check_result_t r1, r2;
+ check_result_t lp = check("OMPI_MCA_mpi_leave_pinned");
+ check_result_t lpp = check("OMPI_MCA_mpi_leave_pinned_pipeline");
+ bool want_rcache = false, found_driver = false;
+
++ /* See if we want to disable this component. This check is
++ necessary for some environments -- for example, Debian's
++ "fakeroot" build environment allocates memory during stat(),
++ causing Badness (see http://bugs.debian.org/531522).
++ $FAKEROOTKEY is set by Debian's "fakeroot" build environment;
++ check for that explicitly. */
++ r1 = check("OMPI_MCA_memory_ptmalloc2_disable");
++ r2 = check("FAKEROOTKEY");
++ if ((RESULT_NOT_FOUND != r1 && RESULT_NO != r1) ||
++ (RESULT_NOT_FOUND != r2 && RESULT_NO != r2)) {
++ return;
++ }
++
+ /* Look for sentinel files (directories) to see if various network
+ drivers are loaded (yes, I know, further abstraction
+ violations...).
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=192&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Tue Jun 23 23:14:00 2009
@@ -1,5 +1,8 @@
# Fixes build issues on Alpha.
alpha_build
+
+# Fix 531522.
+disable-memory-allocator
# Fixes build issues on Sparc.
sparc_build
More information about the Pkg-openmpi-commits
mailing list