Prepare for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
2024-03-21 17:09:57 +02:00 · 2024-01-24 21:05:49 +00:00 · 2024-01-20 21:34:21 +00:00 · 2024-01-11 09:40:17 +01:00 · 2023-12-01 08:13:01 +00:00
3 changed files with 17 additions and 5 deletions
--- a/10-devicetree.install
+++ b/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"
--- a/2
+++ b/2
@ -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

--- a/grubby.spec
+++ b/grubby.spec
@ -3,9 +3,9 @@

 Name: grubby
 Version: 8.40
-Release: 72%{?dist}
+Release: 75.0.riscv64%{?dist}
 Summary: Command line tool for updating bootloader configs
-License: GPLv2+
+License: GPL-2.0-or-later
 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}
+%ifarch aarch64 x86_64 %{power64} riscv64
 BuildRequires: grub2-tools-minimal
 Requires: grub2-tools-minimal
 Requires: grub2-tools
@ -74,6 +74,18 @@ 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
Author	SHA1	Message	Date
David Abdurachmanov	e6b7c1c178	Prepare for riscv64 Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-03-21 17:09:57 +02:00
Fedora Release Engineering	758f62e580	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 21:05:49 +00:00
Fedora Release Engineering	5318daa5c6	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-20 21:34:21 +00:00
Marta Lewandowska	893f94f428	Don't overwrite vars that start with GRUB_CMDLINE_LINUX When updating args for ALL kernels, grubby clobbers all variables in /etc/default/grub that start with GRUB_CMDLINE_LINUX and renders that line multiple times, for each variable that exists. This breaks using recovery mode. Fix so this doesn't happen anymore. Signed-off-by: Marta Lewandowska <mlewando@redhat.com>	2024-01-11 09:40:17 +01:00
Miroslav Suchý	a73ecd5815	Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2	2023-12-01 08:13:01 +00:00