From fba99cc18515382966b1cc8097dfde49b18df83a Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 19 Aug 2024 22:00:38 -0700
Subject: [PATCH] sync from upstream script update

---
 prepopulate.json                           | 22 ++++++-----
 prepopulate.yaml                           | 20 ++++++----
 shared/additional_and_filter_packages.conf |  2 -
 sync-from-upstream                         | 44 ++++++++++++++--------
 4 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 421273f..f01ab77 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -34443,7 +34443,8 @@
         "realmd.aarch64"
       ],
       "rocky-release": [
-        "rocky-release.aarch64"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.aarch64"
@@ -36123,7 +36124,8 @@
         "realmd.ppc64le"
       ],
       "rocky-release": [
-        "rocky-release.ppc64le"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.ppc64le"
@@ -37749,7 +37751,8 @@
         "realmd.s390x"
       ],
       "rocky-release": [
-        "rocky-release.s390x"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.s390x"
@@ -39659,7 +39662,8 @@
         "realmd.x86_64"
       ],
       "rocky-release": [
-        "rocky-release.x86_64"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.x86_64"
@@ -42320,7 +42324,7 @@
         "rasqal-devel.aarch64"
       ],
       "rocky-release": [
-        "rocky-rb-certs.noarch"
+        "rocky-sb-certs.noarch"
       ],
       "redland": [
         "redland-devel.aarch64"
@@ -44977,7 +44981,7 @@
         "rasqal-devel.ppc64le"
       ],
       "rocky-release": [
-        "rocky-rb-certs.noarch"
+        "rocky-sb-certs.noarch"
       ],
       "redland": [
         "redland-devel.ppc64le"
@@ -47591,7 +47595,7 @@
         "rasqal-devel.s390x"
       ],
       "rocky-release": [
-        "rocky-rb-certs.noarch"
+        "rocky-sb-certs.noarch"
       ],
       "redland": [
         "redland-devel.s390x"
@@ -50795,7 +50799,7 @@
         "rasqal-devel.x86_64"
       ],
       "rocky-release": [
-        "rocky-rb-certs.noarch"
+        "rocky-sb-certs.noarch"
       ],
       "redland": [
         "redland-devel.i686",
@@ -52235,4 +52239,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/prepopulate.yaml b/prepopulate.yaml
index a7037d0..6acaeca 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -26886,7 +26886,8 @@ BaseOS:
     rng-tools:
     - rng-tools.aarch64
     rocky-release:
-    - rocky-release.aarch64
+    - rocky-release-eula.noarch
+    - rocky-release.noarch
     rootfiles:
     - rootfiles.noarch
     rpcbind:
@@ -28173,7 +28174,8 @@ BaseOS:
     rng-tools:
     - rng-tools.ppc64le
     rocky-release:
-    - rocky-release.ppc64le
+    - rocky-release-eula.noarch
+    - rocky-release.noarch
     rootfiles:
     - rootfiles.noarch
     rpcbind:
@@ -29421,7 +29423,8 @@ BaseOS:
     rng-tools:
     - rng-tools.s390x
     rocky-release:
-    - rocky-release.s390x
+    - rocky-release-eula.noarch
+    - rocky-release.noarch
     rootfiles:
     - rootfiles.noarch
     rpcbind:
@@ -30934,7 +30937,8 @@ BaseOS:
     rng-tools:
     - rng-tools.x86_64
     rocky-release:
-    - rocky-release.x86_64
+    - rocky-release-eula.noarch
+    - rocky-release.noarch
     rootfiles:
     - rootfiles.noarch
     rpcbind:
@@ -32853,7 +32857,7 @@ CRB:
     rhc:
     - rhc-devel.aarch64
     rocky-release:
-    - rocky-rb-certs.noarch
+    - rocky-sb-certs.noarch
     rpcsvc-proto:
     - rpcsvc-proto-devel.aarch64
     rrdtool:
@@ -34734,7 +34738,7 @@ CRB:
     rhc:
     - rhc-devel.ppc64le
     rocky-release:
-    - rocky-rb-certs.noarch
+    - rocky-sb-certs.noarch
     rpcsvc-proto:
     - rpcsvc-proto-devel.ppc64le
     rrdtool:
@@ -36580,7 +36584,7 @@ CRB:
     rhc:
     - rhc-devel.s390x
     rocky-release:
-    - rocky-rb-certs.noarch
+    - rocky-sb-certs.noarch
     rpcsvc-proto:
     - rpcsvc-proto-devel.s390x
     rrdtool:
@@ -38989,7 +38993,7 @@ CRB:
     rhc:
     - rhc-devel.x86_64
     rocky-release:
-    - rocky-rb-certs.noarch
+    - rocky-sb-certs.noarch
     rpcsvc-proto:
     - rpcsvc-proto-devel.i686
     - rpcsvc-proto-devel.x86_64
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 15f0962..8320cb6 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -14,8 +14,6 @@ filter_packages = [
              "*openh264*",      # https://fedoraproject.org/wiki/Non-distributable-rpms
              "python3-openipmi", #RhBug 1982794
              "OpenIPMI-perl", #RhBug 1982794
-             "rhc",
-             "rhc-worker-playbook"
          ]
          "ppc64le": [
              "SLOF",
diff --git a/sync-from-upstream b/sync-from-upstream
index 313342a..2b70a79 100755
--- a/sync-from-upstream
+++ b/sync-from-upstream
@@ -1,20 +1,34 @@
 #!/bin/bash
-HOWMANY="-$1"
-if [ -z $1 ]; then
-  HOWMANY="-1"
+set -e
+echo "Cloning upstream pungi"
+git clone https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git -b centos-9-stream /var/tmp/c9s
+
+echo "Copying shared data"
+if [ -d "shared" ]; then
+  /bin/cp /var/tmp/c9s/shared/* shared/
 fi
 
-BRANCH=$(git branch --show-current)
-if [[ ! "${BRANCH}" =~ "r9s" ]]; then
-  echo "Not a lookahead branch."
-  exit 1
-fi
+echo "Copying prepopulate"
+/bin/cp /var/tmp/c9s/prepopulate.json .
 
-echo "Fetching from upstream"
-git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-9-stream
-echo "Formatting patch and applying..."
-git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
-echo "!! DIFF OF CHANGES !!"
-git --no-pager diff HEAD
+echo "Changing to rocky where required in prepopulate"
+while read -r pattern; do
+  sscript+="$pattern;"
+done <<EOF
+s/"redhat-release"/"rocky-release"/g
+s/"redhat-release\..*"/"rocky-release.noarch"/g
+s/"redhat-release-eula\..*"/"rocky-release-eula.noarch"/g
+s/"redhat-indexhtml/"rocky-indexhtml/g
+s/"redhat-logos/"rocky-logos/g
+s/"redhat-backgrounds/"rocky-backgrounds/g
+s/"redhat-sb-certs/"rocky-sb-certs/g
+EOF
+sed -i "$sscript" prepopulate.json
 
-echo "You may now commit and push."
+echo "Generating yaml"
+/bin/bash ./generate-prepop-yaml
+
+rm -rf /var/tmp/c9s
+
+git status
+echo "Completed. Check status above."