starlingx/integ
Code Issues Proposed changes

upgrade watchdog to CentOS 7.6 version

Browse Source 
[Patch 2/3]
update to version 5.13-12

Story: 2004522
Task: 28437

Depends-On: https://review.openstack.org/#/c/627759/

Change-Id: I440f8b43e826308cf812e0c40b2e046a11f49e9f
Signed-off-by: SidneyAn <ran1.an@intel.com>
This commit is contained in:
SidneyAn 2018-12-29 21:28:49 +08:00 committed by Ran An
parent 683d3632bc
commit 5b35567612
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -11,12 +11,12 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec
index 75ce3dd..88c4245 100644 index 75ce3dd..88c4245 100644
--- a/SPECS/watchdog.spec --- a/SPECS/watchdog.spec
+++ b/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec
@@ -1,7 +1,7 @@ @@ -2,7 +2,7 @@
Summary: Software and/or Hardware watchdog daemon Summary: Software and/or Hardware watchdog daemon
Name: watchdog Name: watchdog
Version: 5.13 Version: 5.13
-Release: 11%{?dist} -Release: 12%{?dist}
+Release: 11.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 12.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ License: GPLv2+
URL: http://sourceforge.net/projects/watchdog/ URL: http://sourceforge.net/projects/watchdog/

4
base/watchdog/centos/meta_patches/spec-TiS-changes.patch
View File

@ -14,7 +14,7 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec
index 7eeacc9..75ce3dd 100644 index 7eeacc9..75ce3dd 100644
--- a/SPECS/watchdog.spec --- a/SPECS/watchdog.spec
+++ b/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec
@@ -18,6 +18,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch @@ -19,6 +19,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch
Patch2: 0002-wd_identify-wd_keepalive-Document-c-config-file-in-h.patch Patch2: 0002-wd_identify-wd_keepalive-Document-c-config-file-in-h.patch
Patch3: 0003-watchdog-5.13-rhsel.patch Patch3: 0003-watchdog-5.13-rhsel.patch
Patch4: 0004-watchdog-5.13-rhseldoc.patch Patch4: 0004-watchdog-5.13-rhseldoc.patch
@ -22,7 +22,7 @@ index 7eeacc9..75ce3dd 100644
BuildRequires: systemd-units BuildRequires: systemd-units
@@ -49,6 +50,7 @@ expiration) initiated by the BMC. @@ -50,6 +51,7 @@ expiration) initiated by the BMC.
%patch2 -p1 -b .keepalive %patch2 -p1 -b .keepalive
%patch3 -p1 -b .rhsel %patch3 -p1 -b .rhsel
%patch4 -p1 -b .rhseldoc %patch4 -p1 -b .rhseldoc

2
base/watchdog/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/watchdog-5.13-11.el7.src.rpm mirror:Source/watchdog-5.13-12.el7.src.rpm