starlingx/integ
Code Issues Proposed changes

de-fuzz util-linux 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: I6ab8d2a32b2ea997411b479d1953efb3b6ccbdd1
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 07:48:51 +08:00
parent 15896eea00
commit 1290065966
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/util-linux/centos/meta_patches/0003-util-linux-login-pamd.patch
View File

@ -1,7 +1,7 @@
From 48483baf9bcce5fbf9040f1f400eea9a0fd76c86 Mon Sep 17 00:00:00 2001 From 3db968a14a7a93d08d9d801e79d96d05dc100519 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:55:36 -0400 Date: Mon, 2 Oct 2017 14:55:36 -0400
Subject: [PATCH 2/3] WRS: 0003-util-linux-login-pamd.patch Subject: WRS: 0003-util-linux-login-pamd.patch
--- ---
SOURCES/util-linux-login.pamd | 1 + SOURCES/util-linux-login.pamd | 1 +
@ -21,10 +21,10 @@ index 3c03927..9c57d31 100644
session optional pam_console.so session optional pam_console.so
# pam_selinux.so open should only be followed by sessions to be executed in the user context # pam_selinux.so open should only be followed by sessions to be executed in the user context
diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec
index 8d4dae6..bed4869 100644 index 4b045fd..537a03c 100644
--- a/SPECS/util-linux.spec --- a/SPECS/util-linux.spec
+++ b/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec
@@ -688,7 +688,7 @@ fi @@ -738,7 +738,7 @@ fi
%config(noreplace) %{_sysconfdir}/pam.d/chfn %config(noreplace) %{_sysconfdir}/pam.d/chfn
%config(noreplace) %{_sysconfdir}/pam.d/chsh %config(noreplace) %{_sysconfdir}/pam.d/chsh
@ -34,5 +34,5 @@ index 8d4dae6..bed4869 100644
%config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/pam.d/su-l
-- --
1.9.1 2.7.4

10
base/util-linux/centos/meta_patches/spec-use-su-file-from-shadow.patch
View File

@ -1,14 +1,14 @@
From 8e1cb6a69f144137d23ecaf94d704f35c8c7a9d6 Mon Sep 17 00:00:00 2001 From 1b4403d3c5b9fc0f73e1af70e34deb2d54a9c686 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:55:36 -0400 Date: Mon, 2 Oct 2017 14:55:36 -0400
Subject: [PATCH 1/3] WRS: spec-use-su-file-from-shadow.patch Subject: WRS: spec-use-su-file-from-shadow.patch
--- ---
SPECS/util-linux.spec | 3 ++- SPECS/util-linux.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec
index 27d18a9..8d4dae6 100644 index 48100e4..4b045fd 100644
--- a/SPECS/util-linux.spec --- a/SPECS/util-linux.spec
+++ b/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec
@@ -41,6 +41,7 @@ Source12: util-linux-su.pamd @@ -41,6 +41,7 @@ Source12: util-linux-su.pamd
@ -19,7 +19,7 @@ index 27d18a9..8d4dae6 100644
### Obsoletes & Conflicts & Provides ### Obsoletes & Conflicts & Provides
Conflicts: bash-completion < 1:2.1-1 Conflicts: bash-completion < 1:2.1-1
@@ -561,7 +562,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/sunhostid @@ -612,7 +613,7 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/sunhostid
install -m 644 %{SOURCE2} ./remote install -m 644 %{SOURCE2} ./remote
install -m 644 %{SOURCE3} ./chsh install -m 644 %{SOURCE3} ./chsh
install -m 644 %{SOURCE3} ./chfn install -m 644 %{SOURCE3} ./chfn
@ -29,5 +29,5 @@ index 27d18a9..8d4dae6 100644
install -m 644 %{SOURCE14} ./runuser install -m 644 %{SOURCE14} ./runuser
install -m 644 %{SOURCE15} ./runuser-l install -m 644 %{SOURCE15} ./runuser-l
-- --
1.9.1 2.7.4