Detect grub2 on riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-09-26 17:17:04 +03:00
parent 3147e9e2e0
commit a47e11530a
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 20 additions and 1 deletions

View File

@ -21,12 +21,14 @@
Name: appliance-tools
Summary: Tools for building Appliances
Version: 011.2
Release: 5%{?dist}
Release: 5.0.riscv64%{?dist}
License: GPLv2
URL: https://pagure.io/appliance-tools
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
Patch0: detect-grub2-riscv64.patch
# Ensure system deps are installed (rhbz#1409536)
Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}}
Requires: python%{python_pkgversion}-progress
@ -76,6 +78,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
%{python_sitelib}/ec2convert/
%changelog
* Tue Sep 26 2023 David Abdurachmanov <davidlt@rivosinc.com> - 011.2-5.0.riscv64
- Detect grub2 on riscv64
* Sun Aug 13 2023 Neal Gompa <ngompa@fedoraproject.org> - 011.2-5
- Add runtime dep for setuptools (#2135410)

View File

@ -0,0 +1,14 @@
diff --git a/appcreate/appliance.py b/appcreate/appliance.py
index e9ff5bf..1a7bcde 100644
--- a/appcreate/appliance.py
+++ b/appcreate/appliance.py
@@ -206,6 +206,9 @@ class ApplianceImageCreator(ImageCreator):
elif 'grub2-efi-aa64' in packages:
self.bootloader = 'grub2'
self.grub2inst_may_fail = True
+ elif 'grub2-efi-riscv64' in packages:
+ self.bootloader = 'grub2'
+ self.grub2inst_may_fail = True
elif 'grub2-efi-ia32' in packages:
self.bootloader = 'grub2'
self.grub2inst_may_fail = True