From c7d64f97053c20f38192b5cd07f9b0cc747bd41e Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 8 Aug 2018 09:21:00 -0700 Subject: [PATCH] bash: remove parallelization patch This patch is problematic in two ways, first with the mis-spelled nproc (as nprocs), it causes the -j option to not have a value, this causes make to not limit the number of jobs that can run in parallel. Secondly, the bash build seems to have a race condition when a large number of jobs (over 60) are run. Since we want a more stable build, let's remove this patch. Change-Id: I5d3e3f496c067fa837090cfec52ddb7aca8873f0 Story: 2003358 Task: 24408 Signed-off-by: Saul Wold --- .../0001-Further-parallelize-bash-build.patch | 25 ------------------- base/bash/centos/meta_patches/PATCH_ORDER | 1 - 2 files changed, 26 deletions(-) delete mode 100644 base/bash/centos/meta_patches/0001-Further-parallelize-bash-build.patch diff --git a/base/bash/centos/meta_patches/0001-Further-parallelize-bash-build.patch b/base/bash/centos/meta_patches/0001-Further-parallelize-bash-build.patch deleted file mode 100644 index e12fd26fb..000000000 --- a/base/bash/centos/meta_patches/0001-Further-parallelize-bash-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dbe4403d95cb18d9857bc53420d293e5be1f3fd6 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 16:05:36 -0400 -Subject: [PATCH 3/3] WRS: 0001-Further-parallelize-bash-build.patch - ---- - SPECS/bash.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/bash.spec b/SPECS/bash.spec -index 115d540..5e688c1 100644 ---- a/SPECS/bash.spec -+++ b/SPECS/bash.spec -@@ -341,7 +341,7 @@ autoconf - # Recycles pids is neccessary. When bash's last fork's pid was X - # and new fork's pid is also X, bash has to wait for this same pid. - # Without Recycles pids bash will not wait. --make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" -+make -j"%(nprocs)" "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" - - %install - rm -rf $RPM_BUILD_ROOT --- -1.9.1 - diff --git a/base/bash/centos/meta_patches/PATCH_ORDER b/base/bash/centos/meta_patches/PATCH_ORDER index 8ca1e48f8..b8f937b3d 100644 --- a/base/bash/centos/meta_patches/PATCH_ORDER +++ b/base/bash/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,2 @@ spec-TiS-bash-history.patch 0001-Update-package-versioning-for-TIS-format.patch -0001-Further-parallelize-bash-build.patch