From 518c6078da18e0022b9eccc265944471fd1abf77 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 26 Jun 2023 09:02:27 -0400 Subject: [PATCH] Update to 011.2 release --- .gitignore | 1 + ...-install-errors-if-they-are-expected.patch | 63 ------------------- ...switch-from-authconfig-to-authselect.patch | 36 ----------- appliance-tools.spec | 11 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 0001-Ignore-grub2-install-errors-if-they-are-expected.patch delete mode 100644 0002-switch-from-authconfig-to-authselect.patch diff --git a/.gitignore b/.gitignore index 85175d7..fda5e46 100644 --- a/.gitignore +++ b/.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 diff --git a/0001-Ignore-grub2-install-errors-if-they-are-expected.patch b/0001-Ignore-grub2-install-errors-if-they-are-expected.patch deleted file mode 100644 index 08ebaa9..0000000 --- a/0001-Ignore-grub2-install-errors-if-they-are-expected.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bc03c7227fcfb4f5ebe05de2c31705c0eb94b6e7 Mon Sep 17 00:00:00 2001 -From: Pablo Greco -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 ---- - 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 - diff --git a/0002-switch-from-authconfig-to-authselect.patch b/0002-switch-from-authconfig-to-authselect.patch deleted file mode 100644 index d81ec1b..0000000 --- a/0002-switch-from-authconfig-to-authselect.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d1d2eac31801a0aa99159ea9b575fe3e85d5fde8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pavel=20B=C5=99ezina?= -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 - diff --git a/appliance-tools.spec b/appliance-tools.spec index f1a193c..22b4784 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -20,17 +20,13 @@ Name: appliance-tools Summary: Tools for building Appliances -Version: 011.1 -Release: 11%{?dist} +Version: 011.2 +Release: 1%{?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 - # Ensure system deps are installed (rhbz#1409536) Requires: python%{python_pkgversion}-imgcreate %{?min_imgcrate_evr:>= %{min_imgcreate_evr}} Requires: python%{python_pkgversion}-progress @@ -78,6 +74,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{python_sitelib}/ec2convert/ %changelog +* Mon Jun 26 2023 Neal Gompa - 011.2-1 +- Update to 011.2 release + * Tue Jun 13 2023 Python Maint - 011.1-11 - Rebuilt for Python 3.12 diff --git a/sources b/sources index ee3a813..784f2bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (appliance-tools-011.1.tar.bz2) = 91f5248248fd877c34bf2389298cafd6e8fc406edb8daa32b98358b1fef96065d68a8ad18f08272b7632d96b7b983355eb01c87504c5810a6b0838d1a1395ff9 +SHA512 (appliance-tools-011.2.tar.bz2) = 8b46337b3b6cbcdfb5f73ca52d95444c083ea8eb8c266d2ea52c29637a16e4ffdbb32390b797657495760cf4742b9db14a6938f3c693b0e0107adefa74dfac3b