84c6cae443
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: I0a701722187a3fd34ad710c86dbcf31318fbfda5 Signed-off-by: slin14 <shuicheng.lin@intel.com>
41 lines
985 B
Diff
41 lines
985 B
Diff
From a67b7364d9d4d8891f593d35b6685483ab6d8225 Mon Sep 17 00:00:00 2001
|
|
From: Andy Ning <andy.ning@windriver.com>
|
|
Date: Tue, 20 Mar 2018 10:14:56 -0400
|
|
Subject: [5/6] CGTS-9265: remove TC specific config files
|
|
|
|
The hardcoded sshd_config and ssh_config files are replaced by
|
|
patches to openssh.
|
|
---
|
|
SPECS/openssh.spec | 8 --------
|
|
1 file changed, 8 deletions(-)
|
|
|
|
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
|
|
index 39bbcac..442261e 100644
|
|
--- a/SPECS/openssh.spec
|
|
+++ b/SPECS/openssh.spec
|
|
@@ -88,10 +88,6 @@ Source11: sshd.service
|
|
Source12: sshd-keygen.service
|
|
Source13: sshd-keygen
|
|
|
|
-# WRS
|
|
-Source14: sshd_config
|
|
-Source15: ssh_config
|
|
-
|
|
# Internal debug
|
|
Patch0: openssh-5.9p1-wIm.patch
|
|
|
|
@@ -706,10 +702,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
popd
|
|
%endif
|
|
|
|
-# WRS: Overwrite with our config
|
|
-install -m 0640 %{SOURCE14} $RPM_BUILD_ROOT/etc/ssh/sshd_config
|
|
-install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/ssh/ssh_config
|
|
-
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
--
|
|
2.7.4
|
|
|