10-devicetree.install

@@ -2,7 +2,7 @@
 
 # set -x
 
-if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 || "$(uname -m)" == riscv64 ]]
+if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]
 then
 COMMAND="$1"
 KERNEL_VERSION="$2"

grubby-bls

@@ -500,7 +500,7 @@ update_bls_fragment() {
             if [[ -n $old_args ]]; then
                 opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
                 opts="$(echo "$opts" | sed -e 's/\//\\\//g')"
-                sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
+                sed -i -e "s/^GRUB_CMDLINE_LINUX.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
             fi
         fi
 

grubby.spec

@@ -3,9 +3,9 @@
 
 Name: grubby
 Version: 8.40
-Release: 75.0.riscv64%{?dist}
+Release: 72%{?dist}
 Summary: Command line tool for updating bootloader configs
-License: GPL-2.0-or-later
+License: GPLv2+
 Source1: grubby-bls
 # Source2: rpm-sort.c
 Source3: COPYING
@@ -21,7 +21,7 @@ BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: rpm-devel
 BuildRequires: sed
-%ifarch aarch64 x86_64 %{power64} riscv64
+%ifarch aarch64 x86_64 %{power64}
 BuildRequires: grub2-tools-minimal
 Requires: grub2-tools-minimal
 Requires: grub2-tools
@@ -74,18 +74,6 @@ fi
 %{_mandir}/man8/grubby.8*
 
 %changelog
-* Thu Mar 21 2024 David Abdurachmanov <davidlt@rivosinc.com> - 8.40-75.0.riscv64
-- Prepare for riscv64
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.40-75
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.40-74
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-73
-- Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
-
 * Mon Sep 11 2023 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 8.40-72
 - Drop installkernel so that it can be provided by systemd