Detect grub2 on riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -23,3 +23,4 @@ appliance-tools-004.5.tar.bz2
 /appliance-tools-010.2.tar.bz2
 /appliance-tools-011.0.tar.bz2
 /appliance-tools-011.1.tar.bz2
+/appliance-tools-011.2.tar.bz2

appliance-tools.spec

@@ -10,7 +10,7 @@
 %endif
 
 # Minimum version of imgcreate (livecd-tools)
-%global min_imgcreate_ver 25.0-2
+%global min_imgcreate_ver 28.3-3
 
 %if 0%{?fedora}
 %global min_imgcreate_evr 1:%{min_imgcreate_ver}
@@ -20,17 +20,20 @@
 
 Name: appliance-tools
 Summary: Tools for building Appliances
-Version: 011.1
-Release: 1%{?dist}
+Version: 011.2
+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
 Requires: python%{python_pkgversion}-future
+Requires: python%{python_pkgversion}-setuptools
 Requires: curl rsync kpartx
 Requires: zlib
 Requires: qemu-img
@@ -41,8 +44,10 @@ Requires: btrfs-progs
 Requires: xfsprogs
 Requires: sssd-client
 BuildRequires: python%{python_pkgversion}-devel
+BuildRequires: python%{python_pkgversion}-setuptools
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/which
+BuildRequires: make
 BuildArch: noarch
 
 
@@ -73,6 +78,54 @@ 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)
+
+* Sun Aug 13 2023 Neal Gompa <ngompa@fedoraproject.org> - 011.2-4
+- Add BR for setuptools (#2135410)
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 011.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jul 02 2023 Python Maint <python-maint@redhat.com> - 011.2-2
+- Rebuilt for Python 3.12
+
+* Mon Jun 26 2023 Neal Gompa <ngompa@fedoraproject.org> - 011.2-1
+- Update to 011.2 release
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 011.1-11
+- Rebuilt for Python 3.12
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 011.1-8
+- Rebuilt for Python 3.11
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Aug 23 2021 Pavel Březina <pbrezina@redhat.com> - 011.1-6
+- Switch from authconfig to authselect (rhbz#1982158)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jun 26 2021 Neal Gompa <ngompa13@gmail.com> - 011.1-4
+- Backport fix to deal with grub-install errors for UEFI
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 011.1-3
+- Rebuilt for Python 3.10
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 011.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Thu Aug 27 2020 Neal Gompa <ngompa13@gmail.com> - 011.1-1
 - Update to 011.1 release
 

detect-grub2-riscv64.patch

@@ -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

sources

@@ -1 +1 @@
-SHA512 (appliance-tools-011.1.tar.bz2) = 91f5248248fd877c34bf2389298cafd6e8fc406edb8daa32b98358b1fef96065d68a8ad18f08272b7632d96b7b983355eb01c87504c5810a6b0838d1a1395ff9
+SHA512 (appliance-tools-011.2.tar.bz2) = 8b46337b3b6cbcdfb5f73ca52d95444c083ea8eb8c266d2ea52c29637a16e4ffdbb32390b797657495760cf4742b9db14a6938f3c693b0e0107adefa74dfac3b