From f73e50e5b0980cb9471a8dbf594dc41bf2cbea76 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Tue, 6 Oct 2020 16:43:43 -0400 Subject: [PATCH 1/4] Update to build with libdaos 1.2.0 PR-repos: daos@PR-3610 Signed-off-by: Brian J. Murrell --- Makefile-rpm.mk | 3 --- mpich-EL_7.spec | 14 ++++++++------ mpich-LEAP_15.spec | 3 +++ packaging/Makefile_packaging.mk | 11 +++++++---- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Makefile-rpm.mk b/Makefile-rpm.mk index e9b399dc014..f4ab4548b93 100644 --- a/Makefile-rpm.mk +++ b/Makefile-rpm.mk @@ -1,9 +1,6 @@ NAME := mpich SRC_EXT := gz -PR_REPOS := #leave blank -EL_7_PR_REPOS := automake libtool - GIT_TAG := v3.3 TOPDIR := $(shell echo $$PWD) diff --git a/mpich-EL_7.spec b/mpich-EL_7.spec index 9ed514106df..8d53b65af60 100644 --- a/mpich-EL_7.spec +++ b/mpich-EL_7.spec @@ -1,10 +1,9 @@ -%global cart_major 4 %global daos_major 0 Summary: A high-performance implementation of MPI Name: mpich Version: 3.4~a2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mpich.org/ @@ -52,7 +51,7 @@ Obsoletes: mpich-3.0 < 3.1 Obsoletes: mpich-3.2 < 3.3 Requires: environment(modules) Provides: bundled(hwloc) = 2.0.1rc2 -Provides: %{name}-cart-%{cart_major}-daos-%{daos_major} +Provides: %{name}-daos-%{daos_major} %description MPICH is a high-performance and widely portable implementation of the Message @@ -84,7 +83,7 @@ Obsoletes: mpich2-autoload < 3.0 Obsoletes: mpich-3.0-autoload < 3.1 # and it's standard package Obsoletes: mpich-3.2-autoload < 3.3 -Provides: %{name}-autoload-cart-%{cart_major}-daos-%{daos_major} +Provides: %{name}-autoload-daos-%{daos_major} %description autoload This package contains profile files that make mpich automatically loaded. @@ -125,14 +124,14 @@ Contains documentations, examples and man-pages for mpich %package -n python2-mpich Summary: mpich support for Python 2 -Provides: %{name}-python2-mpich-cart-%{cart_major}-daos-%{daos_major} +Provides: %{name}-python2-mpich-daos-%{daos_major} %description -n python2-mpich mpich support for Python 2. %package -n python3-mpich Summary: mpich support for Python 3 -Provides: %{name}-python3-mpich-cart-%{cart_major}-daos-%{daos_major} +Provides: %{name}-python3-mpich-daos-%{daos_major} %description -n python3-mpich mpich support for Python 3. @@ -347,6 +346,9 @@ find %{buildroot} -type f -name "*.la" -delete %{python3_sitearch}/%{name}.pth %changelog +* Tue Oct 06 2020 Brian J. Murrell - 3.4~a2-2 +- Rebuild for libdaos 1.2.0 + * Tue May 12 2020 Brian J. Murrell - 3.4~a2-1 - Update to 3.4a2 - Disabled %check due to https://github.com/pmodels/mpich/issues/4534 diff --git a/mpich-LEAP_15.spec b/mpich-LEAP_15.spec index 1d0d9c30146..74be125cd92 100644 --- a/mpich-LEAP_15.spec +++ b/mpich-LEAP_15.spec @@ -461,6 +461,9 @@ fi %endif # !testsuite %changelog +* Tue Oct 06 2020 Brian J. Murrell - 3.4~a2-4 +- Rebuild for libdaos 1.2.0 + * Mon Jun 22 2020 Brian J. Murrell - 3.4~a2-3 - Add Requires: daos-devel to devel subpackage diff --git a/packaging/Makefile_packaging.mk b/packaging/Makefile_packaging.mk index 1c30e036fd7..0dee0b30439 100644 --- a/packaging/Makefile_packaging.mk +++ b/packaging/Makefile_packaging.mk @@ -38,7 +38,7 @@ LEAP_15_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-rep EL_7_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-el7: *\(.*\)/\1/p') UBUNTU_20_04_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-ubuntu20: *\(.*\)/\1/p') -COMMON_RPM_ARGS := --define "%_topdir $$PWD/_topdir" $(BUILD_DEFINES) +COMMON_RPM_ARGS := --define "_topdir $$PWD/_topdir" $(BUILD_DEFINES) SPEC := $(shell if [ -f $(NAME)-$(DISTRO_BASE).spec ]; then echo $(NAME)-$(DISTRO_BASE).spec; else echo $(NAME).spec; fi) VERSION = $(eval VERSION := $(shell rpm $(COMMON_RPM_ARGS) --specfile --qf '%{version}\n' $(SPEC) | sed -n '1p'))$(VERSION) DEB_RVERS := $(subst $(DOT),\$(DOT),$(VERSION)) @@ -49,9 +49,9 @@ RPMS = $(eval RPMS := $(addsuffix .rpm,$(addprefix _topdir/RPMS/x86 DEB_TOP := _topdir/BUILD DEB_BUILD := $(DEB_TOP)/$(NAME)-$(VERSION) DEB_TARBASE := $(DEB_TOP)/$(DEB_NAME)_$(VERSION) -SOURCE ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\\\#/\\\\\#/g' -e 's/.*: *//'))$(SOURCE) -PATCHES ?= $(eval PATCHES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/p'))$(PATCHES) -OTHER_SOURCES := $(eval OTHER_SOURCES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/d' -e p))$(OTHER_SOURCES) +SOURCE ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\\\#/\\\\\#/g' -e 's/.*: *//'))$(SOURCE) +PATCHES ?= $(eval PATCHES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/p'))$(PATCHES) +OTHER_SOURCES := $(eval OTHER_SOURCES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/d' -e p))$(OTHER_SOURCES) SOURCES := $(addprefix _topdir/SOURCES/,$(notdir $(SOURCE)) $(PATCHES) $(OTHER_SOURCES)) ifeq ($(ID_LIKE),debian) DEBS := $(addsuffix _$(VERSION)-1_amd64.deb,$(shell sed -n '/-udeb/b; s,^Package:[[:blank:]],$(DEB_TOP)/,p' $(TOPDIR)/debian/control)) @@ -396,6 +396,9 @@ show_patches: show_sources: @echo $(SOURCES) +show_other_sources: + @echo $(OTHER_SOURCES) + show_targets: @echo $(TARGETS) From 43554646d2c0ae053ffb0a68209f9362f3a3a30c Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 8 Oct 2020 20:30:12 -0400 Subject: [PATCH 2/4] Bump the daos_major Signed-off-by: Brian J. Murrell --- mpich-EL_7.spec | 2 +- mpich-LEAP_15.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mpich-EL_7.spec b/mpich-EL_7.spec index 8d53b65af60..140d16131af 100644 --- a/mpich-EL_7.spec +++ b/mpich-EL_7.spec @@ -1,4 +1,4 @@ -%global daos_major 0 +%global daos_major 1 Summary: A high-performance implementation of MPI Name: mpich diff --git a/mpich-LEAP_15.spec b/mpich-LEAP_15.spec index 74be125cd92..5a275486cee 100644 --- a/mpich-LEAP_15.spec +++ b/mpich-LEAP_15.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global daos_major 0 +%global daos_major 1 # Static libraries are disabled by default # for non HPC builds From 0a3db62dab8ae8b352a20e483e0f647045d9cc03 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 8 Oct 2020 19:01:37 -0400 Subject: [PATCH 3/4] Add BR: daos-devel hack to get specific version To be formalized into something usable later. PR-repos: daos@PR-3610 Signed-off-by: Brian J. Murrell --- mpich-EL_7.spec | 2 +- mpich-LEAP_15.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mpich-EL_7.spec b/mpich-EL_7.spec index 140d16131af..eac009ee5c0 100644 --- a/mpich-EL_7.spec +++ b/mpich-EL_7.spec @@ -40,7 +40,7 @@ BuildRequires: python36-devel %endif BuildRequires: automake >= 1.15 BuildRequires: libtool >= 2.4.4 -BuildRequires: daos-devel +BuildRequires: daos-devel = 1.1.0-33.5094.gf56b0d3a%{dist} BuildRequires: libuuid-devel Provides: mpi Provides: mpich2 = %{version} diff --git a/mpich-LEAP_15.spec b/mpich-LEAP_15.spec index 5a275486cee..3797a741851 100644 --- a/mpich-LEAP_15.spec +++ b/mpich-LEAP_15.spec @@ -102,7 +102,7 @@ BuildRequires: mpi-selector BuildRequires: python-devel BuildRequires: sysfsutils BuildRequires: libfabric-devel -BuildRequires: daos-devel +BuildRequires: daos-devel = 1.1.0-33.5094.gf56b0d3a%{dist} Provides: %{package_name}-daos-%{daos_major} Provides: mpi From 8639d0de1f461041fa32d98becddbb3e9a21c273 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Fri, 9 Oct 2020 11:18:58 -0400 Subject: [PATCH 4/4] Add %{?_isa} to BR: daos-devel Signed-off-by: Brian J. Murrell --- mpich-EL_7.spec | 3 ++- mpich-LEAP_15.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mpich-EL_7.spec b/mpich-EL_7.spec index eac009ee5c0..7696f53e881 100644 --- a/mpich-EL_7.spec +++ b/mpich-EL_7.spec @@ -40,7 +40,8 @@ BuildRequires: python36-devel %endif BuildRequires: automake >= 1.15 BuildRequires: libtool >= 2.4.4 -BuildRequires: daos-devel = 1.1.0-33.5094.gf56b0d3a%{dist} +BuildRequires: daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist} + BuildRequires: libuuid-devel Provides: mpi Provides: mpich2 = %{version} diff --git a/mpich-LEAP_15.spec b/mpich-LEAP_15.spec index 3797a741851..eb7a9744764 100644 --- a/mpich-LEAP_15.spec +++ b/mpich-LEAP_15.spec @@ -102,7 +102,7 @@ BuildRequires: mpi-selector BuildRequires: python-devel BuildRequires: sysfsutils BuildRequires: libfabric-devel -BuildRequires: daos-devel = 1.1.0-33.5094.gf56b0d3a%{dist} +BuildRequires: daos-devel%{?_isa} = 1.1.0-33.5094.gf56b0d3a%{dist} Provides: %{package_name}-daos-%{daos_major} Provides: mpi