From 78f861d29dd4929b11cee0ef11ddc56fb4d69255 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Fri, 9 Aug 2024 11:34:18 -0400
Subject: [PATCH] Remove Centos/RPM references

--rpm option is replaced by --package

Signed-off-by: Scott Little <scott.little@windriver.com>
Change-Id: I10158c445a96e825d07b336e547dd7b912619080
---
 scripts/build-helm-charts.sh   | 4 ++--
 scripts/lib/changelog_utils.sh | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/build-helm-charts.sh b/scripts/build-helm-charts.sh
index b19a48d..51288bc 100755
--- a/scripts/build-helm-charts.sh
+++ b/scripts/build-helm-charts.sh
@@ -221,7 +221,7 @@ if [[ ( "${#image_dirs[@]}" -gt 0 || "$use_managed_image_list" -eq 1 ) && -n "${
                     cmd+=" --label '${label}'"
                     cmd+=" --image-record ${image_arg}"
                     cmd+=" --app $app"
-                    cmd+=" -r $pkgs"
+                    cmd+=" --package $pkgs"
                     cmd+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/main-${label}.log\""
                     cmd+=" ; [[ \${PIPESTATUS[0]} -eq 0 ]]"
                     notice "building primary helm chart $app ($label)"
@@ -241,7 +241,7 @@ for spec in $EXTRA_HELM_CHARTS ; do
     cmd+=" --verbose"
     cmd+=" --os $DOCKER_BASE_OS"
     cmd+=" --app $app"
-    cmd+=" -r $pkgs"
+    cmd+=" --package $pkgs"
     cmd+=" 2>&1 | tee \"\$MY_WORKSPACE/std/build-helm/$app.log\""
     notice "building extra helm chart $app"
     build_helm_charts "$cmd" || exit 1
diff --git a/scripts/lib/changelog_utils.sh b/scripts/lib/changelog_utils.sh
index 1022635..62b6efe 100644
--- a/scripts/lib/changelog_utils.sh
+++ b/scripts/lib/changelog_utils.sh
@@ -25,8 +25,6 @@ NEED_BUILD_PATTERNS=(
 #    "  stx-tools/centos-mirror-tools/config/centos/$LAYER"
 #    "! stx-tools/*"
 
-    "  cgcs-root/build-tools/build_iso/*.cfg"
-    "  cgcs-root/build-tools/build_iso/minimal_rpm_list.txt"
     "  cgcs-root/build-tools/signing/*"
     "  cgcs-root/build-tools/certificats/*"
     "  cgcs-root/build-tools/build-docker-images/*"