[Pkg-openmpi-commits] r356 - in /openmpi/branches/experimental/debian: ./ patches/
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Thu Jan 28 10:52:08 UTC 2016
Author: mckinstry
Date: Thu Jan 28 10:52:07 2016
New Revision: 356
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=356
Log:
Fix installed files, links and dependencies.
TODO:
* pkg-config files are incorrect?
* checkpoint/restart compiles don't work
Added:
openmpi/branches/experimental/debian/libopenmpi1.10.install
openmpi/branches/experimental/debian/libopenmpi1.10.links
openmpi/branches/experimental/debian/patches/reproducible-build.patch
Removed:
openmpi/branches/experimental/debian/libopenmpi1.6.install
openmpi/branches/experimental/debian/libopenmpi1.6.links
Modified:
openmpi/branches/experimental/debian/TODO
openmpi/branches/experimental/debian/changelog
openmpi/branches/experimental/debian/control
openmpi/branches/experimental/debian/libopenmpi-dev.install
openmpi/branches/experimental/debian/libopenmpi-dev.links
openmpi/branches/experimental/debian/openmpi-bin.install
openmpi/branches/experimental/debian/openmpi-bin.manpages
openmpi/branches/experimental/debian/openmpi-checkpoint.install
openmpi/branches/experimental/debian/openmpi-checkpoint.manpages
openmpi/branches/experimental/debian/rules
Modified: openmpi/branches/experimental/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/TODO?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/TODO (original)
+++ openmpi/branches/experimental/debian/TODO Thu Jan 28 10:52:07 2016
@@ -1,4 +1,12 @@
* moved mpi.mod into the -dev package
* *.so in /usr/lib/openmpi/lib/openmpi/ should be in a versionned directory
+For 1.10.2 testing:
+ * All the checkpoint-restart not compiling
+* debian:adios-1.9.0$ pkg-config ompi --libs
+-L/usr/lib/openmpi/lib -L/usr//lib -lmpi_f90 -lmpi_f77 -lmpi
+but mpi_f90, f77 now replaced ?
+
+Fix the build of the following:
+dh_install: openmpi-bin missing files: usr/bin/orte-bootproxy
Modified: openmpi/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/changelog?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog (original)
+++ openmpi/branches/experimental/debian/changelog Thu Jan 28 10:52:07 2016
@@ -1,3 +1,9 @@
+openmpi (1.10.2-2) UNRELEASED; urgency=medium
+
+ * libopenmpi1.10 conflicts with libopenmpi1.6.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 27 Jan 2016 18:42:59 +0000
+
openmpi (1.10.2-1) experimental; urgency=medium
* New upstream release.
Modified: openmpi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/control?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/control (original)
+++ openmpi/branches/experimental/debian/control Thu Jan 28 10:52:07 2016
@@ -10,7 +10,7 @@
libcr-dev [amd64 armel armhf i386 powerpc], libtool, libltdl-dev,
libnuma-dev [amd64 i386 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64el], autoconf (>= 2.59),
automake
-Build-Conflicts: libopenmpi1.3
+Build-Conflicts: libopenmpi1.6
Standards-Version: 3.9.6
Homepage: http://www.open-mpi.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
@@ -65,9 +65,7 @@
Architecture: alpha amd64 armel armhf arm64 i386 ia64 hppa powerpc powerpcspe ppc64 ppc64el sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 mips64 mips64el mips mipsel
Recommends: openmpi-bin
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: openmpi-libs0, libopenmpi1, libopenmpi1.3, libopenmpi2
-Replaces: openmpi-checkpoint (<< 1.6.5-1)
-Breaks: openmpi-checkpoint (<< 1.6.5-1)
+Conflicts: openmpi-libs0, libopenmpi1, libopenmpi1.3, libopenmpi2, libopenmpi1.6
Description: high performance message passing library -- shared 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
@@ -110,7 +108,7 @@
Package: openmpi-checkpoint
Architecture: amd64 armel armhf i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util, libopenmpi1.6 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-bin (= ${binary:Version}), blcr-util, libopenmpi1.10 (= ${binary:Version})
Conflicts: openmpi-checkpoint
Description: high performance message passing library -- checkpoint support
Open MPI is a project combining technologies and resources from several other
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.install?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.install (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.install Thu Jan 28 10:52:07 2016
@@ -16,16 +16,24 @@
# NOTE: opalc++.1 is not provided upstream in 1.5.4
usr/bin/opalcc
usr/share/man/man1/opalcc.1
-usr/bin/ortec++
+# usr/bin/ortec++ FIXME
# usr/share/man/man1/ortec++.1
-usr/bin/ortecc
+# usr/bin/ortecc FIXME
# usr/share/man/man1/ortecc.1
-usr/bin/orteCC
+#usr/bin/orteCC FIXME
# Note: There's no man page for ortecc
## Wrappers and man pages
usr/bin/opal_wrapper
usr/share/man/man1/opal_wrapper.1
-usr/bin/orte_wrapper_script
+#sr/bin/orte_wrapper_scripta FIXME
+usr/bin/oshcc
+usr/share/man/man1/oshcc.1
+usr/bin/oshfort
+usr/share/man/man1/oshfort.1
+usr/bin/shmemcc
+usr/share/man/man1/shmemcc.1
+usr/bin/shmemfort
+usr/share/man/man1/shmemfort.1
# NOTE: There's no man page for opal_wrapper_script (upstream, lintian warning)
## Library headers
usr/lib/openmpi/include/*
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.links?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.links (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.links Thu Jan 28 10:52:07 2016
@@ -7,12 +7,15 @@
usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortec++.1
usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortecc.1
## SONAME symlinks
-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/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
+usr/lib/libmca_common_sm.so.3 usr/lib/libmca_common_sm.so
+usr/lib/libmca_common_verbs.so.7 usr/lib/libmca_common_verbs.so
+usr/lib/libmpi_cxx.so.1 usr/lib/libmpi_cxx.so
+usr/lib/libmpi_mpifh.so.12 usr/lib/libmpi_mpifh.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
+usr/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so
+usr/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so
+usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so
## Convenience link for header files, see bug #493875
-usr/lib/openmpi/include/ usr/include/openmpi
+usr/lib/openmpi/include/ usr/include/openmpi
Added: openmpi/branches/experimental/debian/libopenmpi1.10.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi1.10.install?rev=356&op=file
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi1.10.install (added)
+++ openmpi/branches/experimental/debian/libopenmpi1.10.install Thu Jan 28 10:52:07 2016
@@ -0,0 +1,16 @@
+## Shared libraries
+usr/lib/openmpi/lib/libmca_common_sm.so.4.0.4
+usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.1.3
+usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.0
+usr/lib/openmpi/lib/libmpi.so.12.0.2
+usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.0
+usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.1.0
+usr/lib/openmpi/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.13.0.2
+usr/lib/openmpi/lib/libopen-rte.so.12.0.2
+usr/lib/openmpi/lib/liboshmem.so.8.1.0
+## Plugins
+usr/lib/openmpi/lib/openmpi/*.so
+## Other files
+usr/lib/openmpi/lib/*.mod
Added: openmpi/branches/experimental/debian/libopenmpi1.10.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi1.10.links?rev=356&op=file
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi1.10.links (added)
+++ openmpi/branches/experimental/debian/libopenmpi1.10.links Thu Jan 28 10:52:07 2016
@@ -0,0 +1,24 @@
+# Compatibility links to /usr/bin
+usr/lib/openmpi/lib/libmca_common_sm.so.4.0.4 usr/lib/libmca_common_sm.so.4.0.4
+usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 usr/lib/libmca_common_verbs.so.7.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.1.3 usr/lib/libmpi_cxx.so.1.1.3
+usr/lib/openmpi/lib/libmpi_mpifh.so.12.0.0 usr/lib/libmpi_mpifh.so.12.0.0
+usr/lib/openmpi/lib/libmpi.so.12.0.2 usr/lib/libmpi.so.12.0.2
+usr/lib/openmpi/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so.11.1.0
+usr/lib/openmpi/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0
+usr/lib/openmpi/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.13.0.2 usr/lib/libopen-pal.so.13.0.2
+usr/lib/openmpi/lib/libopen-rte.so.12.0.2 usr/lib/libopen-rte.so.12.0.2
+usr/lib/openmpi/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so.8.1.0
+# SONAME symlinks
+usr/lib/libmca_common_sm.so.4.0.4 usr/lib/libmca_common_sm.so.4
+usr/lib/libmca_common_verbs.so.7.0.0 usr/lib/libmca_common_verbs.so.7
+usr/lib/libmpi_cxx.so.1.1.3 usr/lib/libmpi_cxx.so.1
+usr/lib/libmpi_mpifh.so.12.0.0 usr/lib/libmpi_mpifh.so.12
+usr/lib/libmpi.so.12.0.2 usr/lib/libmpi.so.12
+usr/lib/libmpi_usempif08.so.11.1.0 usr/lib/libmpi_usempif08.so.11
+usr/lib/libmpi_usempi_ignore_tkr.so.6.1.0 usr/lib/libmpi_usempi_ignore_tkr.so.6
+usr/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0
+usr/lib/libopen-pal.so.13.0.2 usr/lib/libopen-pal.so.13
+usr/lib/libopen-rte.so.12.0.2 usr/lib/libopen-rte.so.12
+usr/lib/liboshmem.so.8.1.0 usr/lib/liboshmem.so.8
Modified: openmpi/branches/experimental/debian/openmpi-bin.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-bin.install?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-bin.install (original)
+++ openmpi/branches/experimental/debian/openmpi-bin.install Thu Jan 28 10:52:07 2016
@@ -3,17 +3,23 @@
## Executables
usr/bin/ompi-clean
usr/bin/ompi_info
-usr/bin/ompi-iof
+# usr/bin/ompi-iof -- FIX
usr/bin/ompi-ps
usr/bin/ompi-server
usr/bin/orte-clean
usr/bin/orted
-usr/bin/orte-iof
+# usr/bin/orte-iof
usr/bin/orte-ps
usr/bin/orterun
-usr/bin/ompi-probe
-usr/bin/ompi-profiler
+# usr/bin/ompi-probe
+# usr/bin/ompi-profiler
usr/bin/ompi-top
+usr/bin/orte-dvm
+usr/bin/orte-server
# orte-bootproxy.sh was renamed to orte-bootproxy in debian/rules
-usr/bin/orte-bootproxy
+# usr/bin/orte-bootproxy -- FIXME Why is this missing?
usr/bin/orte-top
+usr/bin/orte-submit
+usr/bin/oshrun
+usr/bin/shmemrun
+usr/bin/oshmem_info
Modified: openmpi/branches/experimental/debian/openmpi-bin.manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-bin.manpages?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-bin.manpages (original)
+++ openmpi/branches/experimental/debian/openmpi-bin.manpages Thu Jan 28 10:52:07 2016
@@ -1,17 +1,23 @@
debian/tmp/usr/share/man/man1/ompi-clean.1
debian/tmp/usr/share/man/man1/ompi_info.1
-debian/tmp/usr/share/man/man1/ompi-iof.1
-debian/tmp/usr/share/man/man1/ompi-probe.1
-debian/tmp/usr/share/man/man1/ompi-profiler.1
+# debian/tmp/usr/share/man/man1/ompi-iof.1
+# debian/tmp/usr/share/man/man1/ompi-probe.1
+#debian/tmp/usr/share/man/man1/ompi-profiler.1
debian/tmp/usr/share/man/man1/ompi-ps.1
debian/tmp/usr/share/man/man1/ompi-server.1
debian/tmp/usr/share/man/man1/ompi-top.1
debian/tmp/usr/share/man/man1/orte-clean.1
debian/tmp/usr/share/man/man1/orted.1
-debian/tmp/usr/share/man/man1/orte-iof.1
+# debian/tmp/usr/share/man/man1/orte-iof.1
debian/tmp/usr/share/man/man1/orte-ps.1
debian/tmp/usr/share/man/man1/orte-top.1
# Note: Those are identical and could by symlinked
debian/tmp/usr/share/man/man1/orterun.1
debian/tmp/usr/share/man/man1/mpiexec.openmpi.1
debian/tmp/usr/share/man/man1/mpirun.openmpi.1
+debian/tmp/usr/share/man/man1/orte-dvm.1
+debian/tmp/usr/share/man/man1/orte-server.1
+debian/tmp/usr/share/man/man1/orte-submit.1
+debian/tmp/usr/share/man/man1/oshmem_info.1
+debian/tmp/usr/share/man/man1/oshrun.1
+debian/tmp/usr/share/man/man1/shmemrun.1
Modified: openmpi/branches/experimental/debian/openmpi-checkpoint.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-checkpoint.install?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-checkpoint.install (original)
+++ openmpi/branches/experimental/debian/openmpi-checkpoint.install Thu Jan 28 10:52:07 2016
@@ -1,7 +1,3 @@
## Binaries
-usr/bin/ompi-checkpoint
-usr/bin/ompi-restart
-usr/bin/opal-checkpoint
-usr/bin/opal-restart
-usr/bin/orte-checkpoint
-usr/bin/orte-restart
+#usr/bin/opal-checkpoint
+#usr/bin/opal-restart
Modified: openmpi/branches/experimental/debian/openmpi-checkpoint.manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-checkpoint.manpages?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-checkpoint.manpages (original)
+++ openmpi/branches/experimental/debian/openmpi-checkpoint.manpages Thu Jan 28 10:52:07 2016
@@ -1,8 +1,8 @@
-debian/tmp/usr/share/man/man1/ompi-checkpoint.1
-debian/tmp/usr/share/man/man1/ompi-restart.1
-debian/tmp/usr/share/man/man1/opal-checkpoint.1
-debian/tmp/usr/share/man/man1/opal-restart.1
-debian/tmp/usr/share/man/man1/orte-checkpoint.1
-debian/tmp/usr/share/man/man1/orte-restart.1
-debian/tmp/usr/share/man/man7/ompi_crcp.7
-debian/tmp/usr/share/man/man7/opal_crs.7
+# debian/tmp/usr/share/man/man1/ompi-checkpoint.1
+#debian/tmp/usr/share/man/man1/ompi-restart.1
+#debian/tmp/usr/share/man/man1/opal-checkpoint.1
+#debian/tmp/usr/share/man/man1/opal-restart.1
+#debian/tmp/usr/share/man/man1/orte-checkpoint.1
+#debian/tmp/usr/share/man/man1/orte-restart.1
+#debian/tmp/usr/share/man/man7/ompi_crcp.7
+#debian/tmp/usr/share/man/man7/opal_crs.7
Added: openmpi/branches/experimental/debian/patches/reproducible-build.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/reproducible-build.patch?rev=356&op=file
==============================================================================
--- openmpi/branches/experimental/debian/patches/reproducible-build.patch (added)
+++ openmpi/branches/experimental/debian/patches/reproducible-build.patch Thu Jan 28 10:52:07 2016
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Remove __DATE__ timestamps to make build bit-reproducible.
+Forwarded: no
+Last-Updated: 2016-01-26
+
+Index: openmpi-1.10.2/ompi/debuggers/ompi_msgq_dll.c
+===================================================================
+--- openmpi-1.10.2.orig/ompi/debuggers/ompi_msgq_dll.c
++++ openmpi-1.10.2/ompi/debuggers/ompi_msgq_dll.c
+@@ -190,7 +190,7 @@ int mqs_version_compatibility (void)
+ char *mqs_version_string (void)
+ {
+ return "Open MPI message queue support for parallel"
+- " debuggers compiled on " __DATE__;
++ " debuggers, Debian version ";
+ } /* mqs_version_string */
+
+ /* So the debugger can tell what interface width the library was compiled with */
Modified: openmpi/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/rules?rev=356&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/rules (original)
+++ openmpi/branches/experimental/debian/rules Thu Jan 28 10:52:07 2016
@@ -58,13 +58,13 @@
find debian/tmp/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;
# Rename the compiler and startup wrappers.
## for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun opalc++ opalcc ortec++ ortecc orteCC ; do \ ##
- for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun ; do \
+ for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun mpifort ; do \
if test -f debian/tmp/usr/bin/$${f}; then \
mv debian/tmp/usr/bin/$${f} debian/tmp/usr/bin/$${f}.openmpi ; \
fi; \
done
# Rename the compiler wrapper man pages.
- for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 mpirun ; do \
+ for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 mpirun mpifort ; do \
if test -f debian/tmp/usr/share/man/man1/$${f}.1; then \
mv debian/tmp/usr/share/man/man1/$${f}.1 debian/tmp/usr/share/man/man1/$${f}.openmpi.1 ; \
fi; \
@@ -93,7 +93,7 @@
@echo "Tests ignored in this build"
override_dh_fixperms:
- chmod 0644 debian/tmp/usr/lib/openmpi/lib/mpi.mod
+ chmod 0644 debian/libopenmpi*/usr/lib/openmpi/lib/*.mod
dh_fixperms
override_dh_installdocs:
More information about the Pkg-openmpi-commits
mailing list