From 3b9176df7898855b3ad960be0a2df9bac98da98a Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 3 Oct 2019 14:58:53 -0400 Subject: [PATCH 1/3] Use updated cart and daos PRs Signed-off-by: Brian J. Murrell --- Makefile-rpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile-rpm.mk b/Makefile-rpm.mk index 197d390b9f1..75f9a3cd4be 100644 --- a/Makefile-rpm.mk +++ b/Makefile-rpm.mk @@ -6,7 +6,7 @@ PATCHES := mpich.macros mpich.pth.py2 mpich.pth.py3 mpich-modules.patch fix-vers # daos_adio-hwloc.patch daos_adio-izem.patch daos_adio-ucx.patch \ # daos_adio-libfabric.patch # daos_adio-all.patch -PR_REPOS := pmix spdk fio dpdk protobuf-c fuse pmdk raft cart@daos_devel1 daos \ +PR_REPOS := pmix spdk fio dpdk protobuf-c fuse pmdk raft cart@PR-229:3 daos@PR-1191:5 \ automake libtool GIT_TAG := v3.3 From 93f84416f47d04e577c581691780e97cd8d8dd3d Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 3 Oct 2019 15:11:13 -0400 Subject: [PATCH 2/3] Need the mercury PR repo also Signed-off-by: Brian J. Murrell --- Makefile-rpm.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-rpm.mk b/Makefile-rpm.mk index 75f9a3cd4be..954f8c9c1ee 100644 --- a/Makefile-rpm.mk +++ b/Makefile-rpm.mk @@ -6,8 +6,8 @@ PATCHES := mpich.macros mpich.pth.py2 mpich.pth.py3 mpich-modules.patch fix-vers # daos_adio-hwloc.patch daos_adio-izem.patch daos_adio-ucx.patch \ # daos_adio-libfabric.patch # daos_adio-all.patch -PR_REPOS := pmix spdk fio dpdk protobuf-c fuse pmdk raft cart@PR-229:3 daos@PR-1191:5 \ - automake libtool +PR_REPOS := pmix spdk fio dpdk protobuf-c fuse pmdk raft mercury@PR-22 \ + cart@PR-229:3 daos@PR-1191:5 automake libtool GIT_TAG := v3.3 From 7ee50c9aedb16bd5056a87d56484ac41bc3db18b Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 3 Oct 2019 20:41:20 -0400 Subject: [PATCH 3/3] Update cart build used Signed-off-by: Brian J. Murrell --- Makefile-rpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile-rpm.mk b/Makefile-rpm.mk index 954f8c9c1ee..9dd218f0ee3 100644 --- a/Makefile-rpm.mk +++ b/Makefile-rpm.mk @@ -7,7 +7,7 @@ PATCHES := mpich.macros mpich.pth.py2 mpich.pth.py3 mpich-modules.patch fix-vers # daos_adio-libfabric.patch # daos_adio-all.patch PR_REPOS := pmix spdk fio dpdk protobuf-c fuse pmdk raft mercury@PR-22 \ - cart@PR-229:3 daos@PR-1191:5 automake libtool + cart@PR-229:6 daos@PR-1191:5 automake libtool GIT_TAG := v3.3