From 0c33908f0f7e72cbb0bf8b9387f7eb122be9778b Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 11 Jun 2024 06:55:53 -0700
Subject: [PATCH] undo kvdo, sync with 10
---
comps-rocky-10-lh.xml.in | 2 ++
comps-rocky-9-lh.xml.in | 4 ++--
comps-rocky-9.4.xml.in | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 73d0370..0f0e731 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -2559,6 +2559,7 @@
<packagereq type="mandatory">pacemaker-nagios-plugins-metadata</packagereq>
<packagereq type="mandatory">pacemaker-remote</packagereq>
<packagereq type="mandatory">pacemaker-cts</packagereq>
+ <packagereq type="default">cockpit-ha-cluster</packagereq>
<packagereq arch="x86_64" type="default">fence-agents-aliyun</packagereq>
<packagereq type="default">fence-agents-all</packagereq>
<packagereq type="default" arch="x86_64">fence-agents-azure-arm</packagereq>
@@ -2601,6 +2602,7 @@
<packagelist>
<packagereq arch="ppc64le,s390x,x86_64" type="mandatory">gfs2-utils</packagereq>
<packagereq type="mandatory">lvm2-lockd</packagereq>
+ <packagereq type="default">cockpit-ha-cluster</packagereq>
<packagereq type="default">dlm</packagereq>
<packagereq type="default" arch="ppc64le,x86_64">fence-agents-openstack</packagereq>
<packagereq type="optional">ctdb</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 3109db8..687aebf 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -1148,9 +1148,9 @@
<packagereq type="default" variant="BaseOS">time</packagereq>
<packagereq type="default" variant="BaseOS">unzip</packagereq>
<packagereq type="default" variant="BaseOS">usbutils</packagereq>
- <packagereq type="default" arch="ppc64le,s390x,x86_64" variant="BaseOS">vdo</packagereq>
+ <packagereq type="default" variant="BaseOS">vdo</packagereq>
<packagereq type="optional" variant="BaseOS">vdo-support</packagereq>
- <packagereq type="default" arch="ppc64le,s390x,x86_64" variant="BaseOS">kmod-kvdo</packagereq>
+ <packagereq type="default" variant="BaseOS">kmod-kvdo</packagereq>
<packagereq type="default" variant="BaseOS">virt-what</packagereq>
<packagereq type="default" variant="BaseOS">which</packagereq>
<packagereq type="default" variant="BaseOS">words</packagereq>
diff --git a/comps-rocky-9.4.xml.in b/comps-rocky-9.4.xml.in
index e29beef..0992a77 100644
--- a/comps-rocky-9.4.xml.in
+++ b/comps-rocky-9.4.xml.in
@@ -1146,9 +1146,9 @@
<packagereq type="default" variant="BaseOS">time</packagereq>
<packagereq type="default" variant="BaseOS">unzip</packagereq>
<packagereq type="default" variant="BaseOS">usbutils</packagereq>
- <packagereq type="default" arch="ppc64le,s390x,x86_64" variant="BaseOS">vdo</packagereq>
+ <packagereq type="default" variant="BaseOS">vdo</packagereq>
<packagereq type="optional" variant="BaseOS">vdo-support</packagereq>
- <packagereq type="default" arch="ppc64le,s390x,x86_64" variant="BaseOS">kmod-kvdo</packagereq>
+ <packagereq type="default" variant="BaseOS">kmod-kvdo</packagereq>
<packagereq type="default" variant="BaseOS">virt-what</packagereq>
<packagereq type="default" variant="BaseOS">which</packagereq>
<packagereq type="default" variant="BaseOS">words</packagereq>
--
GitLab