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

0001-Ignore-grub2-install-errors-if-they-are-expected.patch

@@ -1,63 +0,0 @@
-From bc03c7227fcfb4f5ebe05de2c31705c0eb94b6e7 Mon Sep 17 00:00:00 2001
-From: Pablo Greco <pgreco@centosproject.org>
-Date: Wed, 24 Mar 2021 10:30:46 -0300
-Subject: [PATCH] Ignore grub2-install errors if they are expected
-
-With the inclusion of
-https://github.com/rhboot/grub2/commit/a1be2d182af27afb6db0e7fcf9d5ebf40086b2f6
-grub2-install refuses to run in efi environments, making
-appliance-create fail erroneously. The approach here is to skip this
-error if expected, while still calling grub2-install to try to keep the
-functionality as close as possible with older versions
-
-Signed-off-by: Pablo Greco <pgreco@centosproject.org>
----
- appcreate/appliance.py | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/appcreate/appliance.py b/appcreate/appliance.py
-index 31de48a..474a3b9 100644
---- a/appcreate/appliance.py
-+++ b/appcreate/appliance.py
-@@ -74,6 +74,7 @@ class ApplianceImageCreator(ImageCreator):
-         # This determines which partition layout we'll be using
-         self.bootloader = None
-         self.grub2inst_params = []
-+        self.grub2inst_may_fail = False
- 
-     def _get_fstab(self):
-         f = ""
-@@ -201,12 +202,16 @@ class ApplianceImageCreator(ImageCreator):
-                 if 'grub2-efi-arm' in packages:
-                     self.bootloader = 'grub2'
-                     self.grub2inst_params = ["--target=arm-efi", "--removable"]
-+                    self.grub2inst_may_fail = True
-                 elif 'grub2-efi-aa64' in packages:
-                     self.bootloader = 'grub2'
-+                    self.grub2inst_may_fail = True
-                 elif 'grub2-efi-ia32' in packages:
-                     self.bootloader = 'grub2'
-+                    self.grub2inst_may_fail = True
-                 elif 'grub2-efi-x64' in packages:
-                     self.bootloader = 'grub2'
-+                    self.grub2inst_may_fail = True
-                 elif 'grub2' in packages or 'grub2-pc' in packages:
-                     self.bootloader = 'grub2'
-                 elif 'grub' in packages:
-@@ -505,8 +510,11 @@ class ApplianceImageCreator(ImageCreator):
-         rc = subprocess.call(["chroot", self._instroot, "grub2-install", "--no-floppy", "--no-nvram", "--grub-mkdevicemap=/boot/grub2/device.map"] + self.grub2inst_params + [loopdev])
- 
-         if rc != 0:
--            subprocess.call(["umount", self._instroot + "/dev"])
--            raise MountError("Unable to install grub2 bootloader")
-+            if self.grub2inst_may_fail:
-+                logging.debug("grub2-install failed, but error is expected and ignored (EFI)")
-+            else:
-+                subprocess.call(["umount", self._instroot + "/dev"])
-+                raise MountError("Unable to install grub2 bootloader")
- 
-         mkconfig_dest = "/boot/grub2/grub.cfg"
-         try:
--- 
-2.31.1
-

0002-switch-from-authconfig-to-authselect.patch

@@ -1,36 +0,0 @@
-From d1d2eac31801a0aa99159ea9b575fe3e85d5fde8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
-Date: Fri, 9 Jul 2021 14:18:58 +0200
-Subject: [PATCH] switch from authconfig to authselect
-
-Authconfig compatibility tool (from authselect-compat) will be removed from Fedora 35:
-https://fedoraproject.org/wiki/Changes/RemoveAuthselectCompatPackage
----
- config/fedora-aos.ks | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/config/fedora-aos.ks b/config/fedora-aos.ks
-index 97ad20cd0bd3dbf3fe6d0f453776c37770dac206..0f49d90f66caf6250444f5f6df9de87d1fc21e2f 100644
---- a/config/fedora-aos.ks
-+++ b/config/fedora-aos.ks
-@@ -4,7 +4,7 @@
- lang C
- keyboard us
- timezone US/Eastern
--auth --useshadow --enablemd5
-+authselect select sssd with-silent-lastlog --force
- selinux --permissive
- firewall --disabled
- bootloader --timeout=1 --append="acpi=force console=ttyS0,115200"
-@@ -72,8 +72,6 @@ iputils
- -setserial
- -ed
- 
--# Remove the authconfig pieces
---authconfig
- -rhpl
- -wireless-tools
- 
--- 
-2.31.1
-

appliance-tools.spec

@@ -20,21 +20,20 @@
 
 Name: appliance-tools
 Summary: Tools for building Appliances
-Version: 011.1
-Release: 7%{?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
 
-# Backports from upstream
-Patch0001: 0001-Ignore-grub2-install-errors-if-they-are-expected.patch
-Patch0002: 0002-switch-from-authconfig-to-authselect.patch
+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
@@ -45,6 +44,7 @@ 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
@@ -78,6 +78,36 @@ 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
 

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