From 32cef9a90f526ffee89e9300422703af61ae348e Mon Sep 17 00:00:00 2001
From: Leo Sandoval <lsandova@redhat.com>
Date: Tue, 3 Dec 2024 17:54:14 -0600
Subject: [PATCH] grubby-bls: on PPC systems, remove petiboot's version checks

Resolves: #RHEL-61421
Signed-off-by: Leo Sandoval <lsandova@redhat.com>
---
 grubby-bls  | 23 ++---------------------
 grubby.spec |  6 +++++-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/grubby-bls b/grubby-bls
index a67cf31..ebaedc7 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -595,29 +595,10 @@ remove_var_prefix() {
 
 update_grubcfg()
 {
-    # Older ppc64le OPAL firmware (petitboot version < 1.8.0) don't have BLS support
-    # so grub2-mkconfig has to be run to generate a config with menuentry commands.
+    # Older ppc64le OPAL firmware don't have BLS support so grub2-mkconfig has to be run
+    # to generate a config with menuentry commands.
     if [ "${arch}" = "ppc64le" ] && [ -d /sys/firmware/opal ]; then
         RUN_MKCONFIG="true"
-        petitboot_path="/sys/firmware/devicetree/base/ibm,firmware-versions/petitboot"
-
-        if test -e ${petitboot_path}; then
-            read -r -d '' petitboot_version < ${petitboot_path}
-            petitboot_version="$(echo ${petitboot_version//v})"
-
-            if test -n ${petitboot_version}; then
-                major_version="$(echo ${petitboot_version} | cut -d . -f1)"
-                minor_version="$(echo ${petitboot_version} | cut -d . -f2)"
-
-                re='^[0-9]+$'
-                if [[ $major_version =~ $re ]] && [[ $minor_version =~ $re ]] &&
-                       ([[ ${major_version} -gt 1 ]] ||
-                            [[ ${major_version} -eq 1 &&
-                                 ${minor_version} -ge 8  ]]); then
-                    RUN_MKCONFIG="false"
-                fi
-            fi
-        fi
     fi
 
     # PV and PVH Xen DomU guests boot with pygrub that doesn't have BLS support,
diff --git a/grubby.spec b/grubby.spec
index edd2ffd..d5433f0 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 65%{?dist}
+Release: 66%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -131,6 +131,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Dec 06 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-66
+- grubby-bls: on PPC systems, remove petiboot's version checks
+- Resolves: #RHEL-61421
+
 * Thu Dec 05 2024 Leo Sandoval <lsandova@redhat.com> - 8.40-65
 - On grub cfg updates, run grub2-mkconfig for Xen systems
   Resolves: #RHEL-50691