[Pkg-openmpi-commits] r359 - in /openmpi/branches/experimental/debian: TODO changelog libopenmpi-dev.install libopenmpi1.10.install openmpi-bin.install openmpi-bin.manpages patches/series rules
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Fri Jan 29 10:22:01 UTC 2016
Author: mckinstry
Date: Fri Jan 29 10:22:01 2016
New Revision: 359
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=359
Log:
Prep -2 upload to unstable, with fixes for Hurd/KFreebsd
Modified:
openmpi/branches/experimental/debian/TODO
openmpi/branches/experimental/debian/changelog
openmpi/branches/experimental/debian/libopenmpi-dev.install
openmpi/branches/experimental/debian/libopenmpi1.10.install
openmpi/branches/experimental/debian/openmpi-bin.install
openmpi/branches/experimental/debian/openmpi-bin.manpages
openmpi/branches/experimental/debian/patches/series
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=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/TODO (original)
+++ openmpi/branches/experimental/debian/TODO Fri Jan 29 10:22:01 2016
@@ -1,12 +1,3 @@
* 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=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/changelog (original)
+++ openmpi/branches/experimental/debian/changelog Fri Jan 29 10:22:01 2016
@@ -1,9 +1,12 @@
openmpi (1.10.2-2) UNRELEASED; urgency=medium
- * libopenmpi1.10 conflicts with libopenmpi1.6.
+ * libopenmpi1.10 conflicts with libopenmpi1.6. Closes: #813042.
* Fixes for hppa, hurd patches.
* checkpoint/restart disabled - lack of upstream maintenance support
since 1.7+.
+ * Drop references to tools no longer shipped in 1.10.2
+ * oshmem only supported on Linux, so only try to install on Linux, not
+ Hurd or KFreeBSD
-- Alastair McKinstry <mckinstry at debian.org> Wed, 27 Jan 2016 18:42:59 +0000
Modified: openmpi/branches/experimental/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi-dev.install?rev=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi-dev.install (original)
+++ openmpi/branches/experimental/debian/libopenmpi-dev.install Fri Jan 29 10:22:01 2016
@@ -26,14 +26,6 @@
usr/bin/opal_wrapper
usr/share/man/man1/opal_wrapper.1
#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/libopenmpi1.10.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/libopenmpi1.10.install?rev=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/libopenmpi1.10.install (original)
+++ openmpi/branches/experimental/debian/libopenmpi1.10.install Fri Jan 29 10:22:01 2016
@@ -1,6 +1,5 @@
## 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
@@ -9,7 +8,6 @@
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
Modified: openmpi/branches/experimental/debian/openmpi-bin.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/openmpi-bin.install?rev=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-bin.install (original)
+++ openmpi/branches/experimental/debian/openmpi-bin.install Fri Jan 29 10:22:01 2016
@@ -3,23 +3,14 @@
## Executables
usr/bin/ompi-clean
usr/bin/ompi_info
-# 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-ps
usr/bin/orterun
-# 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 -- 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=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/openmpi-bin.manpages (original)
+++ openmpi/branches/experimental/debian/openmpi-bin.manpages Fri Jan 29 10:22:01 2016
@@ -1,14 +1,10 @@
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-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-ps.1
debian/tmp/usr/share/man/man1/orte-top.1
# Note: Those are identical and could by symlinked
@@ -18,6 +14,3 @@
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/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/patches/series?rev=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/patches/series (original)
+++ openmpi/branches/experimental/debian/patches/series Fri Jan 29 10:22:01 2016
@@ -17,6 +17,6 @@
basic-arm64-support.diff
# ppc64el-support.patch
alpha_badatomic.patch
-pkgconfig-vars.patch
+# pkgconfig-vars.patch
hppa.patch
reproducible-build.patch
Modified: openmpi/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/experimental/debian/rules?rev=359&op=diff
==============================================================================
--- openmpi/branches/experimental/debian/rules (original)
+++ openmpi/branches/experimental/debian/rules Fri Jan 29 10:22:01 2016
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
DPKG_EXPORT_BUILDFLAGS = 1
@@ -30,6 +30,7 @@
# Flags for the static build: see bug #502232
#STATIC_CONFIG_PARAMS = --enable-static
+STATIC_CONFIG_PARAMS =
# Enable MPI thread support (user request, see #602132). Progress threads are known
# to not work, so we do not enable them until they are supported.
@@ -43,6 +44,7 @@
dh_auto_configure -- \
$(CHKPT) $(NUMA) $(TORQUE) \
$(MPI_THREADS) \
+ $(STATIC_CONFIG_PARAMS) \
--disable-silent-rules \
--with-hwloc=/usr/ \
--with-libltdl=/usr/ \
@@ -50,6 +52,7 @@
--with-slurm \
--with-sge \
--enable-heterogeneous \
+ --with-verbs \
--disable-vt \
--sysconfdir=/etc/openmpi \
--libdir=\$${prefix}/lib/openmpi/lib \
@@ -90,6 +93,34 @@
rm -f -r debian/tmp/usr/share/openmpi/doc/
# Continue as usual
dh_install
+# oshmem, shmem only built on Linux so do by hand or it may fail ...
+ if test -f debian/tmp/usr/bin/oshrun ; then \
+ cp -a debian/tmp/usr/bin/oshrun debian/openmpi-bin//usr/bin/ ; \
+ cp -a debian/tmp/usr/bin/oshmem_info debian/openmpi-bin//usr/bin/ ; \
+ cp -a debian/tmp/usr/bin/oshcc debian/libopenmpi-dev/usr/bin ; \
+ cp -a debian/tmp/usr/bin/oshfort debian/libopenmpi-dev/usr/bin ; \
+ cp -a debian/tmp/usr/lib/openmpi/lib/liboshmem.so.8.1.0 usr/lib/libopenmpi1.10/usr/lib/openmpi/lib ; \
+ cp -a debian/tmp/usr/share/man/man1/oshcc.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
+ cp -a debian/tmp/usr/share/man/man1/oshfort.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
+ cp -a debian/tmp/usr/share/man/man1/oshrun.1 debian/openmpi-bin/usr/share/man/man1 ; \
+ cp -a debian/tmp/usr/share/man/man1/oshmem_info.1 debian/openmpi-bin/usr/share/man/man1 ; \
+ fi
+ if test -f debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; then \
+ cp -a debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 \
+ debian/libopenmpi1.10/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; \
+ fi
+ if test -f debian/tmp/usr/bin/shmemrun ; then \
+ cp -a debian/tmp/usr/bin/shmemrun debian/openmpi-bin/usr/bin/shmemrun ;\
+ cp -a debian/tmp/usr/share/man/man1/shmemrun.1 debian/openmpi-bin/usr/share/man/man1 ; \
+ cp -a debian/tmp/usr/bin/shmemcc debian/libopenmpi-dev/usr/bin/shmemcc ; \
+ cp -a debian/tmp/usr/bin/shmemfort debian/libopenmpi-dev/usr/bin/shmemfort ; \
+ cp -a debian/tmp/usr/share/man/man1/shmemcc.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
+ cp -a debian/tmp/usr/share/man/man1/shmemfort.1 debian/libopenmpi-dev/usr/share/man/man1 ; \
+ fi
+ if test -f debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; then \
+ cp -a debian/tmp/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 \
+ debian/libopenmpi1.10/usr/lib/openmpi/lib/libmca_common_verbs.so.7.0.0 ; \
+ fi
override_dh_auto_test:
@echo "Tests ignored in this build"
More information about the Pkg-openmpi-commits
mailing list