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>
28 lines
952 B
Diff
28 lines
952 B
Diff
From f77c05868c164eebe1c84eb3fdd920ef3305cebc 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 09/13] WRS:
|
|
0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
SPECS/initscripts.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
|
|
index ad32f19..ace1326 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}
|
|
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
|
URL: https://github.com/fedora-sysv/initscripts
|
|
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
--
|
|
1.8.3.1
|
|
|