From a8b0e8e05320334676acfcb2acbd81e224bd9fc8 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Thu, 12 Dec 2024 19:28:45 +0000
Subject: [PATCH] import grubby-8.40-77.el10
---
SOURCES/10-devicetree.install | 2 +-
SPECS/grubby.spec | 64 +++++++++++++++++++----------------
2 files changed, 35 insertions(+), 31 deletions(-)
mode change 100755 => 100644 SOURCES/10-devicetree.install
diff --git a/SOURCES/10-devicetree.install b/SOURCES/10-devicetree.install
old mode 100755
new mode 100644
index 3345391..fdea5ec
--- a/SOURCES/10-devicetree.install
+++ b/SOURCES/10-devicetree.install
@@ -2,7 +2,7 @@
# set -x
-if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]
+if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 || "$(uname -m)" == riscv64 ]]
then
COMMAND="$1"
KERNEL_VERSION="$2"
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index f988fc9..928a3b3 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,41 +1,42 @@
# What? No.
%define __brp_mangle_shebangs %{nil}
-Name: grubby
-Version: 8.40
-Release: 77%{?dist}
-Summary: Command line tool for updating bootloader configs
-License: GPL-2.0-or-later
-Source1: grubby-bls
+Name: grubby
+Version: 8.40
+Release: 77%{?dist}
+Summary: Command line tool for updating bootloader configs
+License: GPL-2.0-or-later
+Source1: grubby-bls
# Source2: rpm-sort.c
-Source3: COPYING
-Source5: 95-kernel-hooks.install
-Source6: 10-devicetree.install
-Source7: grubby.8
-
-BuildRequires: gcc
-BuildRequires: glib2-devel
-BuildRequires: libblkid-devel
-BuildRequires: make
-BuildRequires: pkgconfig
-BuildRequires: popt-devel
-BuildRequires: rpm-devel
-BuildRequires: sed
-%ifarch aarch64 x86_64 %{power64}
-BuildRequires: grub2-tools-minimal
-Requires: grub2-tools-minimal
-Requires: grub2-tools
+Source3: COPYING
+Source5: 95-kernel-hooks.install
+Source6: 10-devicetree.install
+Source7: grubby.8
+
+
+BuildRequires: gcc
+BuildRequires: glib2-devel
+BuildRequires: libblkid-devel
+BuildRequires: make
+BuildRequires: pkgconfig
+BuildRequires: popt-devel
+BuildRequires: rpm-devel
+BuildRequires: sed
+%ifarch aarch64 x86_64 %{power64} riscv64
+BuildRequires: grub2-tools-minimal
+Requires: grub2-tools-minimal
+Requires: grub2-tools
%endif
%ifarch s390 s390x
-Requires: s390utils-core
+Requires: s390utils-core
%endif
-Requires: findutils
-Requires: util-linux
+Requires: findutils
+Requires: util-linux
-ExcludeArch: %{ix86}
-Conflicts: uboot-tools < 2021.01-0.1.rc2
-Obsoletes: %{name}-bls < %{version}-%{release}
-Obsoletes: %{name}-deprecated < %{version}-%{release}
+ExcludeArch: %{ix86}
+Conflicts: uboot-tools < 2021.01-0.1.rc2
+Obsoletes: %{name}-bls < %{version}-%{release}
+Obsoletes: %{name}-deprecated < %{version}-%{release}
%description
This package provides a grubby compatibility script that manages
@@ -74,6 +75,9 @@ fi
%{_mandir}/man8/grubby.8*
%changelog
+* Thu Dec 12 2024 Release Engineering <releng@rockylinux.org> - 8.40-77
+- Add riscv64 device tree support
+
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 8.40-77
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
--
GitLab