starlingx/integ
Code Issues Proposed changes

de-fuzz sudo patches

Browse Source 
When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: I2de8b090ce2c03ec4bc64504f700e4846ada4cd7
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 08:07:29 +08:00
parent 0fc7a655c9
commit 5a7ede1099
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/sudo/centos/meta_patches/0003-Further-parallelize-sudo-build.patch
View File

@ -1,17 +1,17 @@
From b670ce302dc1ffbb71d2a88124b843e9be12c42c Mon Sep 17 00:00:00 2001
From 6013de8f9571574f6aba9431f7f51ee9ef8cf199 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:50:44 -0400
Subject: [PATCH 3/3] WRS: 0003-Further-parallelize-sudo-build.patch
Subject: WRS: 0003-Further-parallelize-sudo-build.patch
---
SPECS/sudo.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec
index d731ba9..713bf5f 100644
index acbcb26..8c3f395 100644
--- a/SPECS/sudo.spec
+++ b/SPECS/sudo.spec
@@ -144,7 +144,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
@@ -164,7 +164,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
--with-sssd
# --without-kerb5 \
# --without-kerb4
@ -21,5 +21,5 @@ index d731ba9..713bf5f 100644
make check
--
1.9.1
2.7.4