Hello community, here is the log from the commit of package openmpi for openSUSE:Factory checked in at 2018-08-10 09:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi (Old) and /work/SRC/openSUSE:Factory/.openmpi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi" Fri Aug 10 09:43:48 2018 rev:77 rq:628002 version:1.10.7 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi/openmpi.changes 2018-07-04 23:48:53.472305768 +0200 +++ /work/SRC/openSUSE:Factory/.openmpi.new/openmpi.changes 2018-08-10 09:43:51.729699637 +0200 @@ -1,0 +2,7 @@ +Mon Jul 16 14:16:34 UTC 2018 - [email protected] + +- Drop config.log from rpm +- Add reproducible.patch to make package build reproducible + (boo#1047218, boo#1084909, boo#1041090) + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi.spec ++++++ --- /var/tmp/diff_new_pack.3mOLDH/_old 2018-08-10 09:43:53.445702386 +0200 +++ /var/tmp/diff_new_pack.3mOLDH/_new 2018-08-10 09:43:53.445702386 +0200 @@ -119,6 +119,7 @@ Patch3: openmpi-1.8.3-fix-bashisms.patch Patch4: openmpi-etc-files.patch Patch5: openmpi-btl-openib-backport-device-params-from-master.patch +Patch6: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -328,6 +329,7 @@ openmpi-libs EOF %endif +%patch6 -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 @@ -447,6 +449,7 @@ # GCC 5 builds the ignore-tkr extension and there is no way to # turn that off rm -f %{buildroot}%{mpi_libdir}/mpi_ext.mod +rm -f %{buildroot}%{mpi_datadir}/vampirtrace/config.log # differs between builds ; not needed %fdupes %{buildroot}%{mpi_mandir} %fdupes %{buildroot}%{mpi_datadir} ++++++ reproducible.patch ++++++ Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2017-06-29 make package build reproducible by sorting entries and using fixed date + hostname https://github.com/open-mpi/ompi/issues/3759 Index: openmpi-1.10.7/autogen.pl =================================================================== --- openmpi-1.10.7.orig/autogen.pl +++ openmpi-1.10.7/autogen.pl @@ -83,7 +83,7 @@ if ($^O eq "solaris") { } $username = getpwuid($>); -$full_hostname = `hostname`; +$full_hostname = "reproduciblehostname"; chomp($full_hostname); $hostname = $full_hostname; $hostname =~ s/^([\w\-]+)\..+/\1/; @@ -314,7 +314,7 @@ sub mca_process_framework { $mca_found->{$pname}->{$framework}->{found} = 1; opendir(DIR, $dir) || my_die "Can't open $dir directory"; - foreach my $d (readdir(DIR)) { + foreach my $d (sort(readdir(DIR))) { # Skip any non-directory, "base", or any dir that # begins with "." next @@ -609,7 +609,7 @@ sub mpiext_run_global { my $dir = "$topdir/$ext_prefix"; opendir(DIR, $dir) || my_die "Can't open $dir directory"; - foreach my $d (readdir(DIR)) { + foreach my $d (sort(readdir(DIR))) { # Skip any non-directory, "base", or any dir that begins with "." next if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq "."); @@ -696,7 +696,7 @@ sub mpicontrib_run_global { my $dir = "$topdir/$contrib_prefix"; opendir(DIR, $dir) || my_die "Can't open $dir directory"; - foreach my $d (readdir(DIR)) { + foreach my $d (sort(readdir(DIR))) { # Skip any non-directory, "base", or any dir that begins with "." next if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq "."); @@ -1105,7 +1105,7 @@ if ($no_ompi_arg == 1 && $no_orte_arg == #--------------------------------------------------------------------------- -$full_hostname = `hostname`; +$full_hostname = "reproduciblehostname"; chomp($full_hostname); $m4 = "dnl Index: openmpi-1.10.7/config/opal_functions.m4 =================================================================== --- openmpi-1.10.7.orig/config/opal_functions.m4 +++ openmpi-1.10.7/config/opal_functions.m4 @@ -79,8 +79,8 @@ EOF # OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`hostname | head -n 1`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_HOST="reproduciblehostname" +OPAL_CONFIGURE_DATE="reproducibledate" # # Save these details so that they can be used in ompi_info later @@ -99,8 +99,8 @@ AC_DEFUN([OPAL_BASIC_SETUP],[ # OPAL_CONFIGURE_USER="`whoami`" -OPAL_CONFIGURE_HOST="`hostname | head -n 1`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_HOST="reproduciblehostname" +OPAL_CONFIGURE_DATE="reproducibledate" # # Make automake clean emacs ~ files for "make clean" Index: openmpi-1.10.7/config/opal_get_version.m4 =================================================================== --- openmpi-1.10.7.orig/config/opal_get_version.m4 +++ openmpi-1.10.7/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-1.10.7/ompi/tools/ompi_info/Makefile.am =================================================================== --- openmpi-1.10.7.orig/ompi/tools/ompi_info/Makefile.am +++ openmpi-1.10.7/ompi/tools/ompi_info/Makefile.am @@ -25,8 +25,8 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`hostname`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_HOST="\"reproduciblehostname\"" \ + -DOMPI_BUILD_DATE="\"reproducibledate\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-1.10.7/orte/tools/orte-info/Makefile.am =================================================================== --- openmpi-1.10.7.orig/orte/tools/orte-info/Makefile.am +++ openmpi-1.10.7/orte/tools/orte-info/Makefile.am @@ -23,8 +23,8 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`hostname`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_HOST="\"reproduciblehostname\"" \ + -DOMPI_BUILD_DATE="\"reproducibledate\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ Index: openmpi-1.10.7/oshmem/tools/oshmem_info/Makefile.am =================================================================== --- openmpi-1.10.7.orig/oshmem/tools/oshmem_info/Makefile.am +++ openmpi-1.10.7/oshmem/tools/oshmem_info/Makefile.am @@ -14,8 +14,8 @@ AM_CPPFLAGS = \ -DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ - -DOMPI_BUILD_HOST="\"`hostname`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_HOST="\"reproduciblehostname\"" \ + -DOMPI_BUILD_DATE="\"reproducibledate\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \
