From c1dc06ef5178405284506c805ad1c845ec583e64 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 29 Aug 2024 12:55:09 +0300 Subject: [PATCH] Update ELevate vendors patch: - make sure 'efi_finalization_fix' step runs before 'kernelcmdlineconfig' - fix no attribute 'Hints' error for 'leapp.reporting' module Bump the package release: 0.21.0-2.elevate.2 --- SOURCES/leapp-repository-0.21.0-elevate.patch | 35 +++++++++++++++++-- SPECS/leapp-repository.spec | 7 +++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/SOURCES/leapp-repository-0.21.0-elevate.patch b/SOURCES/leapp-repository-0.21.0-elevate.patch index 43d13a8..dc745b7 100644 --- a/SOURCES/leapp-repository-0.21.0-elevate.patch +++ b/SOURCES/leapp-repository-0.21.0-elevate.patch @@ -3714,7 +3714,7 @@ index 56016513..7ae1dd5a 100644 tags = (IPUWorkflowTag, FactsPhaseTag) diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py -index f42909f0..4a2bc8ad 100644 +index f42909f0..4ddde9f7 100644 --- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py +++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py @@ -1,17 +1,118 @@ @@ -3741,7 +3741,8 @@ index f42909f0..4a2bc8ad 100644 - consumes = () + consumes = (KernelCmdlineArg, InstalledTargetKernelVersion, FirmwareFacts, MountEntry) produces = () - tags = (FinalizationPhaseTag, IPUWorkflowTag) +- tags = (FinalizationPhaseTag, IPUWorkflowTag) ++ tags = (FinalizationPhaseTag.Before, IPUWorkflowTag) def process(self): - efi_reboot_fix.maybe_emit_updated_boot_entry() @@ -3902,6 +3903,36 @@ index 9e213f64..52cfe14f 100644 variant=data.get('VARIANT', '').strip('"') or None, variant_id=data.get('VARIANT_ID', '').strip('"') or None ) +diff --git a/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py b/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py +index 238a8aa6..6b261c3b 100644 +--- a/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py ++++ b/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py +@@ -175,14 +175,14 @@ def entrypoint(configs=None): + api.current_logger().error(str(e)) + + if use_cmdline_file(): +- report_hint = reporting.Hints( ++ report_hint = ( + 'After the system has been rebooted into the new version of RHEL, you' + ' should take the kernel cmdline arguments from /proc/cmdline (Everything' + ' except the BOOT_IMAGE entry and initrd entries) and copy them into' + ' /etc/kernel/cmdline before installing any new kernels.' + ) + else: +- report_hint = reporting.Hints( ++ report_hint = ( + 'After the system has been rebooted into the new version of RHEL, you' + ' should take the kernel cmdline arguments from /proc/cmdline (Everything' + ' except the BOOT_IMAGE entry and initrd entries) and then use the' +@@ -204,7 +204,7 @@ def entrypoint(configs=None): + ' not able to set the arguments as the default for kernels installed in' + ' the future.' + ), +- report_hint, ++ reporting.Remediation(hint=report_hint), + reporting.Severity(reporting.Severity.HIGH), + reporting.Groups([ + reporting.Groups.BOOT, diff --git a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py index 32e4527b..1e595e9a 100644 --- a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index b670113..9265972 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"} Epoch: 1 Name: leapp-repository Version: 0.21.0 -Release: 2%{?dist}.elevate.1 +Release: 2%{?dist}.elevate.2 Summary: Repositories for leapp License: ASL 2.0 @@ -305,6 +305,11 @@ done; # no files here %changelog +* Thu Aug 29 2024 Yuriy Kohut - 0.21.0-2.elevate.2 +- Update ELevate patch: + - make sure 'efi_finalization_fix' step runs before 'kernelcmdlineconfig' + - fix no attribute 'Hints' error for 'leapp.reporting' module + * Thu Aug 22 2024 Yuriy Kohut - 0.21.0-2.elevate.1 - ELevate vendors support