From eb1e841492180ca10d8dc0c40cfa4f98f55a38e0 Mon Sep 17 00:00:00 2001 From: solarhu Date: Tue, 18 May 2021 17:50:52 +0800 Subject: [PATCH 1/2] Disabled for GOMP issue with rpmbuild --- generic-release-1.0/performance.sh | 5 +++-- generic-release.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/generic-release-1.0/performance.sh b/generic-release-1.0/performance.sh index 27559d8..86d8927 100644 --- a/generic-release-1.0/performance.sh +++ b/generic-release-1.0/performance.sh @@ -9,8 +9,9 @@ #PURPOSE. #See the Mulan PSL v2 for more details. -CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` -export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] +#Disable for GOMP issue with rpmbuild +#CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` +#export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] sysctl -w vm.min_free_kbytes=112640 &> /dev/null sysctl -w vm.dirty_ratio=60 &> /dev/null diff --git a/generic-release.spec b/generic-release.spec index 6fec9a2..0d50dff 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 38 +%define generic_release 39 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Jan 7 2020 shenyangyang - 1.0-38 +* Tue May 18 2021 solar.hu - 1.0-39 +- Disable for GOMP issue with rpmbuild + - add %{product_family}-rootfiles package that contains the basic .bash* config for root user -- Gitee From 36a83f90a7ff0bc48a2b06bccc3a813ced32ebcb Mon Sep 17 00:00:00 2001 From: solarhu Date: Tue, 18 May 2021 18:00:35 +0800 Subject: [PATCH 2/2] fix changelog --- generic-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic-release.spec b/generic-release.spec index 0d50dff..532f9f4 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -169,10 +169,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /root/.cshrc %changelog -* Thu Jan 7 2020 shenyangyang - 1.0-38 * Tue May 18 2021 solar.hu - 1.0-39 - Disable for GOMP issue with rpmbuild +* Thu Jan 7 2020 shenyangyang - 1.0-38 - add %{product_family}-rootfiles package that contains the basic .bash* config for root user -- Gitee