From 6b0facbe22d51cf10bc9d3bb4859b529b04205ca Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 7 Feb 2025 07:10:20 -0700
Subject: [PATCH] Sync from Upstream (see notes)
The following comps have received changes
comps-rocky-10-lh.xml.in
comps-rocky-9-lh.xml.in
---
comps-rocky-10-lh.xml | 1 +
comps-rocky-10-lh.xml.in | 1 +
comps-rocky-9-lh.xml | 4 ++--
comps-rocky-9-lh.xml.in | 4 ++--
scripts/sync-from-upstream | 16 ++++++++--------
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 59553ed..b373bcd 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -3154,6 +3154,7 @@
<packagereq type="default">python3-test</packagereq>
<packagereq type="default">python3-wheel</packagereq>
<packagereq type="default">python3-wheel-wheel</packagereq>
+ <packagereq type="default">python3-PyMySQL+rsa</packagereq>
<packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
<packagereq type="default" arch="x86_64">qatlib-tests</packagereq>
<packagereq type="default" arch="x86_64">qatzip-devel</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 35769d8..fa9cbc0 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -3351,6 +3351,7 @@
<packagereq type="default">python3-test</packagereq>
<packagereq type="default">python3-wheel</packagereq>
<packagereq type="default">python3-wheel-wheel</packagereq>
+ <packagereq type="default">python3-PyMySQL+rsa</packagereq>
<packagereq type="default" arch="x86_64">qatlib-devel</packagereq>
<packagereq type="default" arch="x86_64">qatlib-tests</packagereq>
<packagereq type="default" arch="x86_64">qatzip-devel</packagereq>
diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index 92ec52a..4192563 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -1150,7 +1150,7 @@
<packagereq variant="BaseOS" type="default">time</packagereq>
<packagereq variant="BaseOS" type="default">unzip</packagereq>
<packagereq variant="BaseOS" type="default">usbutils</packagereq>
- <packagereq variant="BaseOS" type="default" arch="ppc64le,s390x,x86_64">vdo</packagereq>
+ <packagereq variant="BaseOS" type="default">vdo</packagereq>
<packagereq variant="BaseOS" type="optional">vdo-support</packagereq>
<packagereq variant="BaseOS" type="default" arch="ppc64le,s390x,x86_64">kmod-kvdo</packagereq>
<packagereq variant="BaseOS" type="default">virt-what</packagereq>
@@ -1257,7 +1257,7 @@
<packagereq variant="BaseOS" type="default">time</packagereq>
<packagereq variant="BaseOS" type="default">unzip</packagereq>
<packagereq variant="BaseOS" type="default">usbutils</packagereq>
- <packagereq variant="BaseOS" type="default" arch="ppc64le,s390x,x86_64">vdo</packagereq>
+ <packagereq variant="BaseOS" type="default">vdo</packagereq>
<packagereq variant="BaseOS" type="optional">vdo-support</packagereq>
<packagereq variant="BaseOS" type="default" arch="ppc64le,s390x,x86_64">kmod-kvdo</packagereq>
<packagereq variant="BaseOS" type="default">virt-what</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 6c56ce9..3957faf 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -1155,7 +1155,7 @@
<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">virt-what</packagereq>
@@ -1266,7 +1266,7 @@
<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">virt-what</packagereq>
diff --git a/scripts/sync-from-upstream b/scripts/sync-from-upstream
index 3b89339..8dbac56 100755
--- a/scripts/sync-from-upstream
+++ b/scripts/sync-from-upstream
@@ -39,14 +39,14 @@ sed -i "$sscript" "${COMPS_ROCKY}"
#EOF
#sed -Ei "$mscript" "${COMPS_ROCKY}"
-echo "Modifications to make sure certain scenarios work"
-while read -r pattern; do
- wscript+="$pattern;"
-done <<EOF
-/>kmod-kvdo</ s/type="default"/type="default" arch="ppc64le,s390x,x86_64"/g
-/>vdo</ s/type="default"/type="default" arch="ppc64le,s390x,x86_64"/g
-EOF
-sed -i "$wscript" "${COMPS_ROCKY}"
+#echo "Modifications to make sure certain scenarios work"
+#while read -r pattern; do
+# wscript+="$pattern;"
+#done <<EOF
+#/>kmod-kvdo</ s/type="default"/type="default" arch="ppc64le,s390x,x86_64"/g
+#/>vdo</ s/type="default"/type="default" arch="ppc64le,s390x,x86_64"/g
+#EOF
+#sed -i "$wscript" "${COMPS_ROCKY}"
echo "Generating proper XML"
/bin/bash ./scripts/update-comps "${COMPS_ROCKY/.in/}" rocky
--
GitLab