From: Peter Michael Green Date: Thu, 1 Oct 2020 17:31:15 +0000 (+0000) Subject: Manual merge of version 4.0.4-1+rpi1 and 4.0.5-5 to produce 4.0.5-5+rpi1 X-Git-Tag: archive/raspbian/4.0.5-5+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b201f1cc83e986a37efbd98d59e1ef4e54c27dea;p=openmpi.git Manual merge of version 4.0.4-1+rpi1 and 4.0.5-5 to produce 4.0.5-5+rpi1 --- b201f1cc83e986a37efbd98d59e1ef4e54c27dea diff --cc debian/changelog index 9d259a53,12613475..ea27dd91 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,59 +1,67 @@@ - openmpi (4.0.4-1+rpi1) bullseye-staging; urgency=medium ++openmpi (4.0.5-5+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 2.1.1-6+rpi1 by Peter Michael Green at Wed, 05 Jul 2017 00:52:53 +0000] + * Modify arm "detection" for Raspbian. + * Partially fix clean target + - -- Raspbian forward porter Sat, 04 Jul 2020 02:50:33 +0000 ++ -- Peter Michael Green Thu, 01 Oct 2020 15:59:39 +0000 ++ + openmpi (4.0.5-5) unstable; urgency=medium + + * Drop amd64 from NO_PMIX_ARCH (debugging test). Closes: #970698 + * Update Breaks/Replaces to cope with bug regression below + + -- Alastair McKinstry Mon, 21 Sep 2020 21:29:06 +0100 + + openmpi (4.0.5-4) unstable; urgency=medium + + * Regression fix: man pages belong in openmpi-bin, Closes: #970442 + * Set B-D on libpmix-dev. Closes: #970193 + * Add dependency on libevent-dev to libopenmpi-dev. Closes: #945121 + + -- Alastair McKinstry Thu, 17 Sep 2020 11:25:15 +0100 + + openmpi (4.0.5-3) unstable; urgency=medium + + * Revert autogenerated vars in preinst/postinst. Closes: #970036 + * Update pmix path for libpmix-dev >= 3.2.0rc1-2 + * Ack. bug closed due to mpi4py test disabled: Closes: #965352. + + -- Alastair McKinstry Sat, 12 Sep 2020 12:33:38 +0100 + + openmpi (4.0.5-2) unstable; urgency=medium + + * in binary-indep builds, ignore stuff thats not installed (d/not-installed) + + -- Alastair McKinstry Thu, 10 Sep 2020 09:18:52 +0100 + + openmpi (4.0.5-1) unstable; urgency=medium + + * New upstream release + * Update libversions: + libmpi.so 40.20.4 -> 40.20.5 + libopen-pal.so 40.20.4 -> 40.20.5 + libopen-rte.so 40.20.4 -> 40.20.5 + libmpi_usempif08: 40.21.1 -> 40.21.2 + * Add libpmix-dev as Dependency of libopenmpi-dev + * Depend on libjs-jquery-ui in -dev pkg rather than use external version + * Move to debhelper 13; use DEB_HOST_MULTIARCH vars rather than autogenerated + link, install files + * Drop use_openib patch now that UCX enabled + * Change gdb.conf and branch names to match DEP-14 recommendations + + -- Alastair McKinstry Wed, 09 Sep 2020 16:48:29 +0100 + + openmpi (4.0.4-2) unstable; urgency=medium + + * Re-enable liboshmem.so + * Se hwloc to external for clarity + * Enable UCX support + - Add libmca_common_ucx.so lib + * Tidy up d/rules to use more dh_* commands not cp/mv + * Ship javadocs in libopenmpi-dev + + -- Alastair McKinstry Wed, 15 Jul 2020 07:59:50 +0100 openmpi (4.0.4-1) unstable; urgency=medium diff --cc debian/patches/series index 2b929e80,502ff74a..70aaa043 --- a/debian/patches/series +++ b/debian/patches/series @@@ -9,6 -9,5 +9,6 @@@ verbose-ompi-rules.patc fix-underlinking.patch #version-script.patch no-warning-unused.patch - use-openib.patch + # use-openib.patch ia64.patch +raspbian.diff diff --cc debian/rules index 6b43a361,a37f8cd9..b8db2bbb --- a/debian/rules +++ b/debian/rules @@@ -113,13 -109,6 +109,12 @@@ override_dh_auto_clean find . -name .dirstamp -delete find . -type l -delete find . -name '*.o' -delete - rm -f $(patsubst %, debian/%, ${AUTOGENERATED}) + rm -f `find test/ -type f ! -name '*.*' ! -name 'run_tests'` + rm -f `find . -name '*.a'` + rm -f `find . -name '*.class'` + rm -f `find . -name '*.mod'` + rm -f `find . -name '*.jar'` + rm -f `find orte/tools/ -type f ! -name '*.*'` override_dh_update_autotools_config: (cd config && autom4te --language=m4sh opal_get_version.m4sh -o opal_get_version.sh)