867dddc305
Use initscripts-config package to package script and service file for initscripts package. Refactor 0001-Disable-zeroconf-route.patch， spec-add-mountnfs-init-script.patch and spec-include-TiS-changes.patch, let initscripts-config to be responsible for the installation of config/script/service files. Merged some meta patches that just includes adding source code patch to spec-include-Tis-changes.patch. Removed base/procps since it just includes one file, sysctl.conf. And move this file to initscripts-config folder.The monitor-tools package in stx-integ has a %post script that is adding an entry to sysctl.conf, so add "Requires: initscripts-config" in monitor-tools.spec, to ensure it is installed after this package replaces the file. Deployment test and ping test between VMs pass Service, config and script files check pass. Story: 2003768 Task: 27585 Change-Id: I2ea3bd05bdc5bca5658d157e6f40f7380e922500 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
58 lines
1.6 KiB
Diff
58 lines
1.6 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
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
SPECS/initscripts.spec | 26 ++++++++++++++++++++++++++
|
|
1 file changed, 26 insertions(+)
|
|
|
|
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
|
|
index e96290a..d3c2ce6 100644
|
|
--- a/SPECS/initscripts.spec
|
|
+++ b/SPECS/initscripts.spec
|
|
@@ -36,6 +36,19 @@ Requires(preun): /sbin/chkconfig
|
|
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd
|
|
Provides: /sbin/service
|
|
|
|
+Patch1: support-interface-scriptlets.patch
|
|
+Patch2: relocate-dhclient-leases-to-var-run.patch
|
|
+Patch3: dhclient-restrict-interfaces-to-those-on-c.patch
|
|
+Patch4: support-interface-promisc.patch
|
|
+Patch5: 0001-dhclient-remove-1-arg.patch
|
|
+Patch6: 0001-force-delay-check-link-down.patch
|
|
+Patch7: run-ifdown-on-all-interfaces.patch
|
|
+Patch8: sysconfig-affirmative-check-for-link-carrier.patch
|
|
+Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
|
|
+Patch10: ipv6-static-route-support.patch
|
|
+Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
|
|
+Patch12: run-dhclient-as-daemon-for-ipv6.patch
|
|
+
|
|
%description
|
|
The initscripts package contains basic system scripts used
|
|
during a boot of the system. It also contains scripts which
|
|
@@ -55,6 +68,19 @@ Currently, this consists of various memory checking code.
|
|
%prep
|
|
%setup -q
|
|
|
|
+%patch1 -p1
|
|
+%patch2 -p1
|
|
+%patch3 -p1
|
|
+%patch4 -p1
|
|
+%patch5 -p1
|
|
+%patch6 -p1
|
|
+%patch7 -p1
|
|
+%patch8 -p1
|
|
+%patch9 -p1
|
|
+%patch10 -p1
|
|
+%patch11 -p1
|
|
+%patch12 -p1
|
|
+
|
|
%build
|
|
make
|
|
|
|
--
|
|
1.8.3.1
|
|
|