integ/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch
slin14 45ecc7f61f rebase initscripts patch to CentOS7.5
Story: 2003389
Task: 24475

Change-Id: I9127f8235d1bf437d11363fb6af785473f829aae
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-08-22 14:59:32 +08:00

62 lines
1.7 KiB
Diff

From 29d8980d8c67a302a27a3084f58657414578a2b9 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] WRS: spec-include-TiS-changes.patch
Conflicts:
SPECS/initscripts.spec
---
SPECS/initscripts.spec | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index e96290a..665b576 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -7,6 +7,10 @@ Group: System Environment/Base
Release: 1%{?dist}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+# WRS
+Source1: sysctl.conf
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: initscripts-legacy <= 9.39
Requires: /bin/awk, sed, coreutils
@@ -36,6 +40,10 @@ Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd
Provides: /sbin/service
+Patch4: support-interface-scriptlets.patch
+Patch5: relocate-dhclient-leases-to-var-run.patch
+Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
+
%description
The initscripts package contains basic system scripts used
during a boot of the system. It also contains scripts which
@@ -55,6 +63,10 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
%build
make
@@ -75,6 +87,9 @@ rm -f \
touch $RPM_BUILD_ROOT/etc/crypttab
chmod 600 $RPM_BUILD_ROOT/etc/crypttab
+# WRS: Overwrite with our config
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
+
%pre
/usr/sbin/groupadd -g 22 -r -f utmp
--
2.7.4