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>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 7e75a43284b19d4217d2902adb6f3200bccdf037 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 07/13] WRS: force-delay-check-link-down.patch
|
|
|
|
Conflicts:
|
|
SPECS/initscripts.spec
|
|
---
|
|
SPECS/initscripts.spec | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
|
|
index 63ad994..c806126 100644
|
|
--- a/SPECS/initscripts.spec
|
|
+++ b/SPECS/initscripts.spec
|
|
@@ -4,7 +4,7 @@ Version: 9.49.41
|
|
# ppp-watch is GPLv2+, everything else is GPLv2
|
|
License: GPLv2 and GPLv2+
|
|
Group: System Environment/Base
|
|
-Release: 1%{?dist}.6
|
|
+Release: 1%{?dist}.7
|
|
URL: https://github.com/fedora-sysv/initscripts
|
|
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
|
@@ -49,6 +49,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
|
|
Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
|
|
Patch7: support-interface-promisc.patch
|
|
Patch8: 0001-dhclient-remove-1-arg.patch
|
|
+Patch9: 0001-force-delay-check-link-down.patch
|
|
|
|
%description
|
|
The initscripts package contains basic system scripts used
|
|
@@ -74,6 +75,7 @@ Currently, this consists of various memory checking code.
|
|
%patch6 -p1
|
|
%patch7 -p1
|
|
%patch8 -p1
|
|
+%patch9 -p1
|
|
|
|
%build
|
|
make
|
|
--
|
|
1.9.1
|
|
|