remove sanlock src rpm
It is replaced with rpm, since sanlock is used in build stage only. And not included in ISO image. Story: 2004109 Task: 27519 Depends-On: https://review.openstack.org/611486 Change-Id: I03b1d3e9fae7d8a3eb331249a5e534f969856eb5 Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14
parent
8054afd299
commit
888e9ad118
@ -1 +0,0 @@
|
||||
TIS_PATCH_VER=3
|
||||
@ -1,27 +0,0 @@
|
||||
From b37781fdf5c5f4b373f124875c39ae10697c5898 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:45:32 -0400
|
||||
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/sanlock.spec
|
||||
---
|
||||
SPECS/sanlock.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/sanlock.spec b/SPECS/sanlock.spec
|
||||
index 5bfb8e4..587fcb2 100644
|
||||
--- a/SPECS/sanlock.spec
|
||||
+++ b/SPECS/sanlock.spec
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
Name: sanlock
|
||||
Version: 3.6.0
|
||||
-Release: 1%{?dist}
|
||||
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: A shared storage lock manager
|
||||
|
||||
Group: System Environment/Base
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
|
||||
spec-sanlock-systemctl-post-enable-preun-disable.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
@ -1,39 +0,0 @@
|
||||
From 2e52b9f2956ac629598e0d0c201af38194904e16 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:45:32 -0400
|
||||
Subject: [PATCH 2/3] WRS:
|
||||
spec-sanlock-systemctl-post-enable-preun-disable.patch
|
||||
|
||||
---
|
||||
SPECS/sanlock.spec | 15 ++-------------
|
||||
1 file changed, 2 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/SPECS/sanlock.spec b/SPECS/sanlock.spec
|
||||
index 92b81bb..b4996de 100644
|
||||
--- a/SPECS/sanlock.spec
|
||||
+++ b/SPECS/sanlock.spec
|
||||
@@ -108,19 +108,8 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
|
||||
/usr/sbin/usermod -a -G disk sanlock
|
||||
|
||||
%post
|
||||
-%if %{with_systemd}
|
||||
-%systemd_post wdmd.service sanlock.service
|
||||
-%endif
|
||||
-
|
||||
-%preun
|
||||
-%if %{with_systemd}
|
||||
-%systemd_preun wdmd.service sanlock.service
|
||||
-%endif
|
||||
-
|
||||
-%postun
|
||||
-%if %{with_systemd}
|
||||
-%systemd_postun
|
||||
-%endif
|
||||
+ /bin/systemctl enable sanlock.service >/dev/null 2>&1 || :
|
||||
+ /bin/systemctl enable wdmd.service >/dev/null 2>&1 || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 4d37b60c81cf76f1d1e2f9cde5ee33e052593d54 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 16:45:32 -0400
|
||||
Subject: [PATCH 1/3] WRS:
|
||||
spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
|
||||
|
||||
---
|
||||
SPECS/sanlock.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SPECS/sanlock.spec b/SPECS/sanlock.spec
|
||||
index 18ce7dc..92b81bb 100644
|
||||
--- a/SPECS/sanlock.spec
|
||||
+++ b/SPECS/sanlock.spec
|
||||
@@ -30,6 +30,7 @@ Requires(postun): systemd-units
|
||||
Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz
|
||||
|
||||
# Patch0: 0001-foo.patch
|
||||
+Patch100: wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
|
||||
|
||||
%description
|
||||
The sanlock daemon manages leases for applications on hosts using shared storage.
|
||||
@@ -37,6 +38,7 @@ The sanlock daemon manages leases for applications on hosts using shared storage
|
||||
%prep
|
||||
%setup -q
|
||||
# %patch0 -p1 -b .0001-foo.patch
|
||||
+%patch100 -p1 -b .disable-wdmd-daemon-on-boot
|
||||
|
||||
%build
|
||||
# upstream does not require configure
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 9ef42b78435ca3c593d7589a8844886d735a646b Mon Sep 17 00:00:00 2001
|
||||
From: Scott Little <scott.little@windriver.com>
|
||||
Date: Thu, 5 Oct 2017 14:17:05 -0400
|
||||
Subject: wdmd Kernel watchdog enable and reboot on error
|
||||
|
||||
This patch is a port of this commit:
|
||||
|
||||
5a4deca10fd8e967c042714382dd66bf9a4cf15c
|
||||
(CGTS-3360 - Kernel watchdog enable and reboot on error)
|
||||
|
||||
into centos 7.
|
||||
|
||||
---
|
||||
init.d/wdmd.service | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/init.d/wdmd.service b/init.d/wdmd.service
|
||||
index 7e6d973..2e7db50 100644
|
||||
--- a/init.d/wdmd.service
|
||||
+++ b/init.d/wdmd.service
|
||||
@@ -3,9 +3,9 @@ Description=Watchdog Multiplexing Daemon
|
||||
After=syslog.target
|
||||
|
||||
[Service]
|
||||
-Type=forking
|
||||
-ExecStart=/lib/systemd/systemd-wdmd start
|
||||
+Type=oneshot
|
||||
ExecStop=/lib/systemd/systemd-wdmd stop
|
||||
+RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
mirror:Source/sanlock-3.6.0-1.el7.src.rpm
|
||||
|
||||
@ -32,7 +32,6 @@ base/shadow-utils
|
||||
security/shim-unsigned
|
||||
security/shim-signed
|
||||
logging/syslog-ng
|
||||
base/sanlock
|
||||
base/sudo
|
||||
virt/cloud-init
|
||||
base/watchdog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user