From bf9077cfb54edad452631fbd283f85eafc717101 Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Mon, 17 May 2021 08:00:09 -0700 Subject: [PATCH 1/4] update mkfit to 3.0.0 --- mkfit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkfit.spec b/mkfit.spec index 5ac1bf5c42c..f5e68306a2f 100644 --- a/mkfit.spec +++ b/mkfit.spec @@ -1,6 +1,6 @@ -### RPM external mkfit 2.1.0 +### RPM external mkfit 3.0.0 ## INCLUDE compilation_flags -%define tag V2.1.0-0+pr291 +%define tag V3.0.0-0+pr315 %define branch devel %define github_user trackreco From 2ac363ace75a0fbd08abe4f83d6394d3c9a8d018 Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Mon, 17 May 2021 09:05:43 -0700 Subject: [PATCH 2/4] BUILD_ARGS=SSE3="1" for x86_64 is a better choice --- mkfit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkfit.spec b/mkfit.spec index f5e68306a2f..01b3542736c 100644 --- a/mkfit.spec +++ b/mkfit.spec @@ -20,7 +20,7 @@ sed -i -e 's|-std=c++14|-std=c++1z|' Makefile.config %build %ifarch x86_64 -BUILD_ARGS=VEC_GCC="-msse3" +BUILD_ARGS=SSE3="1" %endif %ifarch aarch64 BUILD_ARGS=VEC_GCC="-march=native" From 3632e856d198654ff6158adae52374a8ff60fc87 Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Thu, 20 May 2021 16:14:33 -0700 Subject: [PATCH 3/4] Update mkfit.spec --- mkfit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkfit.spec b/mkfit.spec index 01b3542736c..8dbffd4f0c4 100644 --- a/mkfit.spec +++ b/mkfit.spec @@ -1,6 +1,6 @@ -### RPM external mkfit 3.0.0 +### RPM external mkfit 3.0.1 ## INCLUDE compilation_flags -%define tag V3.0.0-0+pr315 +%define tag V3.0.1-1+e081989 %define branch devel %define github_user trackreco From bff911fe6ca43313e5f375c2adb087d17a4bbd56 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 21 May 2021 08:01:02 +0200 Subject: [PATCH 4/4] mkfit now use nlohmann/json --- mkfit-toolfile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mkfit-toolfile.spec b/mkfit-toolfile.spec index 1e93e180784..c683942c729 100644 --- a/mkfit-toolfile.spec +++ b/mkfit-toolfile.spec @@ -26,6 +26,7 @@ done cat << \EOF_TOOLFILE >>%i/etc/scram.d/%{base_package}.xml + EOF_TOOLFILE