Package: openmpi
Severity: wishlist
Tags: patch
Hi,
OpenMPI version 1.2 got released a couple of days ago. It would be great
if the Debian package of OpenMPI could be updated to the new version.
I made an updated package for a client of mine, and have attached my
diff; maybe it's of use to you. I tried to address some of the easier
bug reports while I was at it.
Cheers, Til
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-amd64
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
=== debian/control
==================================================================
--- debian/control (revision 14)
+++ debian/control (revision 29)
@@ -71,6 +71,19 @@
.
This package contains platform independent files for Open MPI.
+Package: openmpi-mpidoc
+Architecture: all
+Conflicts: mpi-doc, lam-mpidoc, lam4-dev
+Description: high performance message passing library
+ Open MPI is a project combining technologies and resources from several other
+ projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
+ MPI library available. A completely new MPI-2 compliant implementation, Open
+ MPI offers advantages for system and software vendors, application developers
+ and computer science researchers.
+ .
+ This package contains man pages describing the Message Passing Interface
+ standard.
+
Package: openmpi-dbg
Section: devel
Architecture: any
@@ -82,4 +95,4 @@
MPI offers advantages for system and software vendors, application developers
and computer science researchers.
.
- This package ontains debugging symbols for Open MPI.
+ This package contains debugging symbols for Open MPI.
=== debian/openmpi-bin.install
==================================================================
--- debian/openmpi-bin.install (revision 14)
+++ debian/openmpi-bin.install (revision 29)
@@ -1,4 +1,8 @@
etc/*
-usr/bin/orte*
usr/bin/ompi_info
-usr/bin/mpi*.openmpi
+usr/bin/opal_wrapper
+usr/bin/orted
+usr/bin/orterun
+usr/share/man/man1/*.openmpi.1
+usr/share/man/man1/opal*
+usr/share/man/man1/orte*
=== debian/openmpi-libs0.install
==================================================================
--- debian/openmpi-libs0.install (revision 14)
+++ debian/openmpi-libs0.install (revision 29)
@@ -4,10 +4,13 @@
usr/lib/libmpi.so.0
usr/lib/libmpi_cxx.so.0.0.0
usr/lib/libmpi_cxx.so.0
-usr/lib/libopal.so.0.0.0
-usr/lib/libopal.so.0
-usr/lib/liborte.so.0.0.0
-usr/lib/liborte.so.0
+usr/lib/libmpi_f77.so.0.0.0
+usr/lib/libmpi_f77.so.0
+usr/lib/libmpi_f90.so.0.0.0
+usr/lib/libmpi_f90.so.0
+usr/lib/libopen-pal.so.0.0.0
+usr/lib/libopen-pal.so.0
+usr/lib/libopen-rte.so.0.0.0
+usr/lib/libopen-rte.so.0
usr/lib/openmpi/*.so
usr/lib/mpi.mod
-usr/lib/libmpi_f90.a
=== debian/openmpi-mpidoc.install
==================================================================
--- debian/openmpi-mpidoc.install (revision 14)
+++ debian/openmpi-mpidoc.install (revision 29)
@@ -0,0 +1 @@
+usr/share/man/man3/*
=== debian/patches/30fix_manpage_link.dpatch
==================================================================
--- debian/patches/30fix_manpage_link.dpatch (revision 14)
+++ debian/patches/30fix_manpage_link.dpatch (revision 29)
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30fix_manpage_link.dpatch by Tilman Koschnick <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix link between manpages.
+
[EMAIL PROTECTED]@
+diff -urNad openmpi-1.2~/ompi/mpi/man/man3/MPI_Status_c2f.3
openmpi-1.2/ompi/mpi/man/man3/MPI_Status_c2f.3
+--- openmpi-1.2~/ompi/mpi/man/man3/MPI_Status_c2f.3 2006-11-09
19:53:42.000000000 +0100
++++ openmpi-1.2/ompi/mpi/man/man3/MPI_Status_c2f.3 2007-03-18
00:18:20.513262103 +0100
+@@ -1,2 +1,2 @@
+-.so man3/MPI_Status_c2f.3
++.so man3/MPI_Status_f2c.3
+ ' @(#)MPI_Status_c2f.3 1.12 06/03/09
Property changes on: debian/patches/30fix_manpage_link.dpatch
___________________________________________________________________
Name: svn:executable
+*
=== debian/patches/20implicit_pointer_conversion.dpatch
==================================================================
--- debian/patches/20implicit_pointer_conversion.dpatch (revision 14)
+++ debian/patches/20implicit_pointer_conversion.dpatch (revision 29)
@@ -6,10 +6,10 @@
## DP: architectures. See #377725.
@DPATCH@
-
---- openmpi-1.1.orig/ompi/mca/mpool/openib/mpool_openib_module.c
2006-08-07 15:56:18.428275656 +0200
-+++ openmpi-1.1/ompi/mca/mpool/openib/mpool_openib_module.c 2006-08-07
15:55:50.757482256 +0200
-@@ -26,6 +26,7 @@
+diff -urNad openmpi-1.2~/ompi/mca/mpool/openib/mpool_openib_module.c
openmpi-1.2/ompi/mca/mpool/openib/mpool_openib_module.c
+--- openmpi-1.2~/ompi/mca/mpool/openib/mpool_openib_module.c 2006-11-09
19:53:49.000000000 +0100
++++ openmpi-1.2/ompi/mca/mpool/openib/mpool_openib_module.c 2007-03-16
11:16:12.197752128 +0100
+@@ -27,6 +27,7 @@
#include "ompi/mca/rcache/rcache.h"
#include "ompi/mca/rcache/base/base.h"
#include "ompi/mca/mpool/base/base.h"
=== debian/patches/10opal_noexecstack.dpatch
==================================================================
--- debian/patches/10opal_noexecstack.dpatch (revision 14)
+++ debian/patches/10opal_noexecstack.dpatch (revision 29)
@@ -5,22 +5,21 @@
## DP: Compile opal without executable stack
@DPATCH@
-
-diff -Nur openmpi-1.0.2.orig/opal/asm/Makefile.am
openmpi-1.0.1/opal/asm/Makefile.am
---- openmpi-1.1.orig/opal/asm/Makefile.am 2005-11-11 20:21:26.000000000
+0100
-+++ openmpi-1.1/opal/asm/Makefile.am 2006-01-16 22:20:45.340741088 +0100
-@@ -50,6 +50,7 @@
- libasm_la_DEPENDENCIES = generated/@OMPI_ASM_FILE@
+diff -urNad openmpi-1.2~/opal/asm/Makefile.am openmpi-1.2/opal/asm/Makefile.am
+--- openmpi-1.2~/opal/asm/Makefile.am 2007-03-16 11:13:38.000000000 +0100
++++ openmpi-1.2/opal/asm/Makefile.am 2007-03-16 11:15:18.082869594 +0100
+@@ -51,6 +51,7 @@
+
noinst_LTLIBRARIES = libasm.la
dist_libasm_la_SOURCES = asm.c
+AM_CCASFLAGS = -Wa,--noexecstack
EXTRA_DIST = \
asm-data.txt \
-diff -Nur openmpi-1.0.2.orig/opal/asm/Makefile.in
openmpi-1.0.1/opal/asm/Makefile.in
---- openmpi-1.0.2.orig/opal/asm/Makefile.in 2005-12-12 17:23:53.000000000
+0100
-+++ openmpi-1.0.2/opal/asm/Makefile.in 2006-01-16 22:22:40.600218984 +0100
-@@ -189,6 +189,7 @@
+diff -urNad openmpi-1.2~/opal/asm/Makefile.in openmpi-1.2/opal/asm/Makefile.in
+--- openmpi-1.2~/opal/asm/Makefile.in 2007-03-16 11:13:38.000000000 +0100
++++ openmpi-1.2/opal/asm/Makefile.in 2007-03-16 11:15:18.082869594 +0100
+@@ -219,6 +219,7 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
=== debian/patches/00list
==================================================================
--- debian/patches/00list (revision 14)
+++ debian/patches/00list (revision 29)
@@ -1,2 +1,3 @@
10opal_noexecstack
20implicit_pointer_conversion
+30fix_manpage_link
=== debian/changelog
==================================================================
--- debian/changelog (revision 14)
+++ debian/changelog (revision 29)
@@ -1,3 +1,15 @@
+openmpi (1.2) unstable; urgency=low
+
+ * New upstream release.
+ * Acknowledge previous NMUs (closes: #386491, #392633, #404003, #404026).
+ * Fix: mpicc.openmpi fails to run when named mpicc.openmpi (closes: #388216).
+ * Include manual pages (closes: #413607).
+ * Add openmpi-mpidoc package for man pages describing the MPI standard.
+ * Fix typo in package description (closes: #390238).
+ * Update copyrights.
+
+ -- Tilman Koschnick <[EMAIL PROTECTED]> Fri, 16 Mar 2007 11:17:25 +0100
+
openmpi (1.1-2.3) unstable; urgency=high
* Non-maintainer upload.
=== debian/rules
==================================================================
--- debian/rules (revision 14)
+++ debian/rules (revision 29)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+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)
@@ -58,10 +60,11 @@
dh_clean -k -s
dh_installdirs -popenmpi-libs0 -s /usr/share/lintian/overrides/
$(MAKE) install DESTDIR=$(CURDIR)/debian/openmpi
- cp debian/openmpi/usr/bin/mpicc debian/openmpi/usr/bin/mpicc.openmpi
- cp debian/openmpi/usr/bin/mpic++ debian/openmpi/usr/bin/mpic++.openmpi
- cp debian/openmpi/usr/bin/mpif77 debian/openmpi/usr/bin/mpif77.openmpi
- cp debian/openmpi/usr/bin/mpif90 debian/openmpi/usr/bin/mpif90.openmpi
+ for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 ; do \
+ cp debian/openmpi/usr/share/man/man1/$${f}.1
debian/openmpi/usr/share/man/man1/$${f}.openmpi.1 ; \
+ done
+ chmod 644 debian/openmpi/usr/lib/mpi.mod
+ sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
install -m0644 debian/openmpi-libs0.lintian-overrides
$(CURDIR)/debian/openmpi-libs0/usr/share/lintian/overrides/openmpi-libs0
=== debian/openmpi-bin.links
==================================================================
--- debian/openmpi-bin.links (revision 14)
+++ debian/openmpi-bin.links (revision 29)
@@ -0,0 +1,12 @@
+usr/bin/opal_wrapper usr/bin/mpic++.openmpi
+usr/bin/opal_wrapper usr/bin/mpicc.openmpi
+usr/bin/opal_wrapper usr/bin/mpiCC.openmpi
+usr/bin/opal_wrapper usr/bin/mpicxx.openmpi
+usr/bin/opal_wrapper usr/bin/mpif77.openmpi
+usr/bin/opal_wrapper usr/bin/mpif90.openmpi
+usr/bin/opal_wrapper usr/bin/opalc++
+usr/bin/opal_wrapper usr/bin/opalcc
+usr/bin/opal_wrapper usr/bin/ortec++
+usr/bin/opal_wrapper usr/bin/ortecc
+usr/share/man/man1/mpic++.openmpi.1 usr/share/man/man1/mpiCC.openmpi.1
+usr/share/man/man1/mpiexec.openmpi.1 usr/share/man/man1/mpirun.openmpi.1
=== debian/openmpi-bin.postinst
==================================================================
--- debian/openmpi-bin.postinst (revision 14)
+++ debian/openmpi-bin.postinst (revision 29)
@@ -7,10 +7,18 @@
--slave /usr/bin/mpicxx mpicxx /usr/bin/mpic++.openmpi \
--slave /usr/bin/mpiCC mpiCC /usr/bin/mpic++.openmpi \
--slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.openmpi \
- --slave /usr/bin/mpif90 mpif90 /usr/bin/mpif90.openmpi
+ --slave /usr/bin/mpif90 mpif90 /usr/bin/mpif90.openmpi \
+ --slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz
/usr/share/man/man1/mpicc.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpic++.1.gz mpic++.1.gz
/usr/share/man/man1/mpic++.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpicxx.1.gz mpicxx.1.gz
/usr/share/man/man1/mpicxx.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz
/usr/share/man/man1/mpiCC.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz
/usr/share/man/man1/mpif77.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpif90.1.gz mpif90.1.gz
/usr/share/man/man1/mpif90.openmpi.1.gz
update-alternatives --install /usr/bin/mpiexec mpiexec /usr/bin/orterun 40 \
- --slave /usr/bin/mpirun mpirun /usr/bin/orterun
+ --slave /usr/bin/mpirun mpirun /usr/bin/orterun \
+ --slave /usr/share/man/man1/mpiexec.1.gz mpiexec.1.gz
/usr/share/man/man1/mpiexec.openmpi.1.gz \
+ --slave /usr/share/man/man1/mpirun.1.gz mpirun.1.gz
/usr/share/man/man1/mpirun.openmpi.1.gz
#DEBHELPER#
=== debian/copyright
==================================================================
--- debian/copyright (revision 14)
+++ debian/copyright (revision 29)
@@ -5,16 +5,25 @@
Copyright Holder:
-Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
University Research and Technology
Corporation. All rights reserved.
-Copyright (c) 2004-2006 The University of Tennessee and The University
+Copyright (c) 2004-2007 The University of Tennessee and The University
of Tennessee Research Foundation. All rights
reserved.
Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
University of Stuttgart. All rights reserved.
Copyright (c) 2004-2006 The Regents of the University of California.
All rights reserved.
+Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
+ reserved.
+Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
+Copyright (c) 2006-2007 Voltaire, Inc. All rights reserved.
+Copyright (c) 2006 Sandia National Laboratories. All rights reserved.
+Copyright (c) 2006-2007 Sun Microsystems, Inc. All rights reserved.
+ Use is subject to license terms.
+Copyright (c) 2006-2007 The University of Houston. All rights reserved.
+Copyright (c) 2006 Myricom, Inc. All rights reserved.
License:
=== debian/openmpi-libs0.lintian-overrides
==================================================================
--- debian/openmpi-libs0.lintian-overrides (revision 14)
+++ debian/openmpi-libs0.lintian-overrides (revision 29)
@@ -1 +1 @@
-openmpi-libs0: package-name-doesnt-match-sonames libmpi0 libmca-common_sm0
liborte0 libmpi-cxx0 libopal0
+openmpi-libs0: package-name-doesnt-match-sonames libmpi0 libopen-pal0
libmca-common_sm0 libopen-rte0 libmpi-f90-0 libmpi-cxx0 libmpi-f77-0
=== debian/openmpi-common.links
==================================================================
--- debian/openmpi-common.links (revision 14)
+++ debian/openmpi-common.links (revision 29)
@@ -0,0 +1,6 @@
+usr/share/openmpi/mpic++-wrapper-data.txt
usr/share/openmpi/mpic++.openmpi-wrapper-data.txt
+usr/share/openmpi/mpicc-wrapper-data.txt
usr/share/openmpi/mpicc.openmpi-wrapper-data.txt
+usr/share/openmpi/mpicxx-wrapper-data.txt
usr/share/openmpi/mpicxx.openmpi-wrapper-data.txt
+usr/share/openmpi/mpiCC-wrapper-data.txt
usr/share/openmpi/mpiCC.openmpi-wrapper-data.txt
+usr/share/openmpi/mpif77-wrapper-data.txt
usr/share/openmpi/mpif77.openmpi-wrapper-data.txt
+usr/share/openmpi/mpif90-wrapper-data.txt
usr/share/openmpi/mpif90.openmpi-wrapper-data.txt
