f8cf2f4086
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: I623f7de6f79ecf9984076844c6816e425b0c3624 Signed-off-by: slin14 <shuicheng.lin@intel.com>
25 lines
799 B
Diff
25 lines
799 B
Diff
From 3558b107aa5464f867516e2d734592d0f6363b97 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 17:05:58 -0400
|
|
Subject: [PATCH 5/9] WRS: fix-snmpd-initscript.patch
|
|
|
|
---
|
|
SPECS/net-snmp.spec | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
|
|
index 035d2f8..3e36cb5 100644
|
|
--- a/SPECS/net-snmp.spec
|
|
+++ b/SPECS/net-snmp.spec
|
|
@@ -434,7 +434,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
|
|
install -m 755 %SOURCE13 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd
|
|
|
|
install -d ${RPM_BUILD_ROOT}%{_initrddir}
|
|
-install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/snmpd
|
|
install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_initrddir}/snmptrapd
|
|
|
|
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
|
--
|
|
2.7.4
|
|
|