e7efbe1105
Problem: - Centos 7.5 upgraded initscripts. - Porting of initscripts patches did not resolve and 'fuzz' in the line numbers of the patches. - If initscript is built by rpm 4.11, or default version of rpm until 4.14 is compiled, a fuzzy patch results in the creating of an .orig file. - Packaging of initscripts failes due to the unexpected, and unpackaged .orig file Solution: Safest solution is to de-fuzz our initscripts patches. A seperate investigation will bug report will address the broader issues. Closes-Bug: 1794611 Change-Id: I1e91a230194c0c21798b7e91b444f929b54106d6 Signed-off-by: Scott Little <scott.little@windriver.com>
34 lines
968 B
Diff
34 lines
968 B
Diff
From 7d7f3dc174164989d47cb103a766e68f818f5f64 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 14:49:27 -0400
|
|
Subject: [PATCH 11/13] WRS:
|
|
spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
|
|
|
|
---
|
|
SPECS/initscripts.spec | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
|
|
index e3748e5..f2d0271 100644
|
|
--- a/SPECS/initscripts.spec
|
|
+++ b/SPECS/initscripts.spec
|
|
@@ -52,6 +52,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
|
|
Patch9: 0001-force-delay-check-link-down.patch
|
|
Patch10: run-ifdown-on-all-interfaces.patch
|
|
Patch11: sysconfig-affirmative-check-for-link-carrier.patch
|
|
+Patch12: sysconfig-unsafe-usage-of-linkdelay-variable.patch
|
|
|
|
%description
|
|
The initscripts package contains basic system scripts used
|
|
@@ -80,6 +81,7 @@ Currently, this consists of various memory checking code.
|
|
%patch9 -p1
|
|
%patch10 -p1
|
|
%patch11 -p1
|
|
+%patch12 -p1
|
|
|
|
%build
|
|
make
|
|
--
|
|
1.9.1
|
|
|