Hello community, here is the log from the commit of package openmpi3 for openSUSE:Factory checked in at 2018-09-18 11:44:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi3 (Old) and /work/SRC/openSUSE:Factory/.openmpi3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi3" Tue Sep 18 11:44:21 2018 rev:11 rq:636132 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi3/openmpi3.changes 2018-08-22 14:22:06.126600203 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi3.new/openmpi3.changes 2018-09-18 11:44:42.487831004 +0200 @@ -1,0 +2,16 @@ +Mon Sep 10 12:15:48 UTC 2018 - [email protected] + +- Remove bashism in preun scriptlet + +------------------------------------------------------------------- +Wed Sep 5 06:53:37 UTC 2018 - [email protected] + +- Fix handling of mpi-selector during updates (bsc#1098653) + +------------------------------------------------------------------- +Mon Sep 3 08:47:46 UTC 2018 - [email protected] + +- Add reproducible.patch to drop build time and hostname to make + package build reproducible (boo#1047218, boo#1084909) + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi3.spec ++++++ --- /var/tmp/diff_new_pack.12lh1a/_old 2018-09-18 11:44:46.175827166 +0200 +++ /var/tmp/diff_new_pack.12lh1a/_new 2018-09-18 11:44:46.179827161 +0200 @@ -133,6 +133,7 @@ Source4: mpivars.sh Source5: mpivars.csh Patch0: Build-warning-stringop-overflow-in.patch +Patch1: reproducible.patch Provides: mpi BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -375,6 +376,7 @@ openmpi%{m_f_ver}-libs EOF %endif +%patch1 -p1 # Live patch the VERSION file sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e 's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \ -e 's/^date=.*$/date="OpenMPI %{version} Distribution for SUSE"/' VERSION @@ -551,16 +553,21 @@ %if %{without hpc} %post +# Always register. We might be already registered in the case of an udate +# but mpi-selector handles it fine /usr/bin/mpi-selector \ - --register %{name}-%{version} \ + --register %{name} \ --source-dir %{mpi_bindir} \ --yes %preun -/usr/bin/mpi-selector --unregister %{name}-%{version} --yes -/usr/bin/mpi-selector --system --query -if [ ! -z "`/usr/bin/mpi-selector --system --query`" ]; then - /usr/bin/mpi-selector --system --unset --yes %{name}-%{version} +# Only unregister when uninstalling +if [ "$1" = "0" ]; then + /usr/bin/mpi-selector --unregister %{name} --yes + # Deregister the default if we are uninstalling it + if [ "$(/usr/bin/mpi-selector --system --query)" = "%{name}" ]; then + /usr/bin/mpi-selector --system --unset --yes + fi fi %post libs -p /sbin/ldconfig ++++++ reproducible.patch ++++++ Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2017-06-29 make package build reproducible by using fixed date + hostname https://github.com/open-mpi/ompi/issues/3759 https://bugzilla.opensuse.org/show_bug.cgi?id=1047218 packages do not build reproducibly from including build time https://bugzilla.opensuse.org/show_bug.cgi?id=1084909 +hostname Index: openmpi-3.1.1.0.155d2134a776/autogen.pl =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/autogen.pl +++ openmpi-3.1.1.0.155d2134a776/autogen.pl @@ -85,7 +85,7 @@ if ($^O eq "solaris") { } $username = getpwuid($>); -$full_hostname = `hostname`; +$full_hostname = "openSUSEnohostname"; chomp($full_hostname); $hostname = $full_hostname; $hostname =~ s/^([\w\-]+)\..+/\1/; @@ -1190,7 +1190,7 @@ if (-e "orcm") { #--------------------------------------------------------------------------- -$full_hostname = `hostname`; +$full_hostname = "openSUSEnohostname"; chomp($full_hostname); $m4 = "dnl Index: openmpi-3.1.1.0.155d2134a776/config/opal_functions.m4 =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/config/opal_functions.m4 +++ openmpi-3.1.1.0.155d2134a776/config/opal_functions.m4 @@ -94,9 +94,9 @@ EOF # Save some stats about this build # -OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_USER="openSUSEnowhoami" +OPAL_CONFIGURE_HOST="openSUSEnohostname" +OPAL_CONFIGURE_DATE="openSUSEnodate" OPAL_LIBNL_SANITY_INIT @@ -116,9 +116,9 @@ AC_DEFUN([OPAL_BASIC_SETUP],[ # Save some stats about this build # -OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_USER="openSUSEnowhoami" +OPAL_CONFIGURE_HOST="openSUSEnohostname" +OPAL_CONFIGURE_DATE="openSUSEnodate" # # Make automake clean emacs ~ files for "make clean" Index: openmpi-3.1.1.0.155d2134a776/config/opal_get_version.m4 =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/config/opal_get_version.m4 +++ openmpi-3.1.1.0.155d2134a776/config/opal_get_version.m4 @@ -91,7 +91,7 @@ m4_define([OPAL_GET_VERSION],[ $2_REPO_REV=`git describe --tags --always` fi else - $2_REPO_REV="date`date '+%Y-%m-%d'`" + $2_REPO_REV="date" fi fi Index: openmpi-3.1.1.0.155d2134a776/ompi/tools/ompi_info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/ompi/tools/ompi_info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/ompi/tools/ompi_info/Makefile.am @@ -27,9 +27,9 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-3.1.1.0.155d2134a776/orte/tools/orte-info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/orte/tools/orte-info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/orte/tools/orte-info/Makefile.am @@ -24,9 +24,9 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-3.1.1.0.155d2134a776/oshmem/tools/oshmem_info/Makefile.am =================================================================== --- openmpi-3.1.1.0.155d2134a776.orig/oshmem/tools/oshmem_info/Makefile.am +++ openmpi-3.1.1.0.155d2134a776/oshmem/tools/oshmem_info/Makefile.am @@ -16,9 +16,9 @@ AM_CPPFLAGS = \ -DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ - -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_USER="\"USER\"" \ + -DOMPI_BUILD_HOST="\"openSUSEnohostname\"" \ + -DOMPI_BUILD_DATE="\"`date -u -r ../../../NEWS`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \
