From aaf5354b89447f21053b786160e201e0a51fb9e2 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 20 Sep 2024 00:50:51 -0700
Subject: [PATCH] prep sync script for rhel_only
---
scripts/sync-from-upstream | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/scripts/sync-from-upstream b/scripts/sync-from-upstream
index 14b8cf8..3b89339 100755
--- a/scripts/sync-from-upstream
+++ b/scripts/sync-from-upstream
@@ -18,24 +18,26 @@ while read -r pattern; do
sscript+="$pattern;"
done <<EOF
s/>redhat-release/>rocky-release/g
+s/>redhat-sb-certs/>rocky-sb-certs/g
s/Red Hat Enterprise Linux/Rocky Linux/g
s/RHEL/Rocky Linux/g
s/Red Hat, Inc./Rocky Enterprise Software Foundation/g
EOF
sed -i "$sscript" "${COMPS_ROCKY}"
-echo "Making sure some packages are RHEL only"
-while read -r pattern; do
- mscript+="$pattern;"
-done <<EOF
-/>insights-client</ s/(<packagereq.*>insights-client<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-/>rhc</ s/(<packagereq.*>rhc<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-/>rhc-devel</ s/(<packagereq.*>rhc-devel<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-/>subscription-manager</ s/(<packagereq.*>subscription-manager<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-/>subscription-manager-cockpit</ s/(<packagereq.*>subscription-manager-cockpit<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-/>libdnf-plugin-subscription-manager</ s/(<packagereq.*>libdnf-plugin-subscription-manager<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
-EOF
-sed -Ei "$mscript" "${COMPS_ROCKY}"
+# This is taken care of upstream now. Left for visibility.
+#echo "Making sure some packages are RHEL only"
+#while read -r pattern; do
+# mscript+="$pattern;"
+#done <<EOF
+#/>insights-client</ s/(<packagereq.*>insights-client<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#/>rhc</ s/(<packagereq.*>rhc<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#/>rhc-devel</ s/(<packagereq.*>rhc-devel<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#/>subscription-manager</ s/(<packagereq.*>subscription-manager<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#/>subscription-manager-cockpit</ s/(<packagereq.*>subscription-manager-cockpit<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#/>libdnf-plugin-subscription-manager</ s/(<packagereq.*>libdnf-plugin-subscription-manager<\/packagereq>)/<rhel_only>\1<\/rhel_only>/g
+#EOF
+#sed -Ei "$mscript" "${COMPS_ROCKY}"
echo "Modifications to make sure certain scenarios work"
while read -r pattern; do
--
GitLab