From ad6242eca30063f9c42a566e4761e73e583198e3 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 23 Jan 2025 12:29:58 +0200 Subject: [PATCH] Update ELevate patch: rabase to upstream 0.21.0-5 Bump version to 0.21.0-5.elevate.1 --- SOURCES/leapp-repository-0.21.0-elevate.patch | 54 +++++++++---------- SPECS/leapp-repository.spec | 6 ++- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/SOURCES/leapp-repository-0.21.0-elevate.patch b/SOURCES/leapp-repository-0.21.0-elevate.patch index cffbd3c..b626160 100644 --- a/SOURCES/leapp-repository-0.21.0-elevate.patch +++ b/SOURCES/leapp-repository-0.21.0-elevate.patch @@ -3874,7 +3874,7 @@ index f24dda68..7ee5d016 100644 all_events = list(chain(*[parse_entry(entry) for entry in events_data['packageinfo']])) diff --git a/repos/system_upgrade/common/actors/peseventsscanner/libraries/pes_events_scanner.py b/repos/system_upgrade/common/actors/peseventsscanner/libraries/pes_events_scanner.py -index f5cb2613..10e27220 100644 +index 50336150..540182a5 100644 --- a/repos/system_upgrade/common/actors/peseventsscanner/libraries/pes_events_scanner.py +++ b/repos/system_upgrade/common/actors/peseventsscanner/libraries/pes_events_scanner.py @@ -1,5 +1,6 @@ @@ -3913,24 +3913,24 @@ index f5cb2613..10e27220 100644 def get_cloud_provider_name(cloud_provider_variant): -@@ -83,7 +87,7 @@ def get_transaction_configuration(): - These configuration files have higher priority than PES data. - :return: RpmTransactionTasks model instance +@@ -86,7 +90,7 @@ def get_transaction_configuration(): + + :return: TransactionConfiguration """ -- transaction_configuration = TransactionConfiguration(to_install=[], to_remove=[], to_keep=[]) -+ transaction_configuration = TransactionConfiguration(to_install=[], to_remove=[], to_keep=[], to_reinstall=[]) +- transaction_configuration = TransactionConfiguration(to_install=set(), to_remove=set(), to_keep=set()) ++ transaction_configuration = TransactionConfiguration(to_install=set(), to_remove=set(), to_keep=set(), to_reinstall=set()) _Pkg = partial(Package, repository=None, modulestream=None) -@@ -91,6 +95,7 @@ def get_transaction_configuration(): - transaction_configuration.to_install.extend(_Pkg(name=pkg_name) for pkg_name in tasks.to_install) - transaction_configuration.to_remove.extend(_Pkg(name=pkg_name) for pkg_name in tasks.to_remove) - transaction_configuration.to_keep.extend(_Pkg(name=pkg_name) for pkg_name in tasks.to_keep) -+ transaction_configuration.to_reinstall.extend(_Pkg(name=pkg_name) for pkg_name in tasks.to_reinstall) +@@ -94,6 +98,7 @@ def get_transaction_configuration(): + transaction_configuration.to_install.update(_Pkg(name=pkg_name) for pkg_name in tasks.to_install) + transaction_configuration.to_remove.update(_Pkg(name=pkg_name) for pkg_name in tasks.to_remove) + transaction_configuration.to_keep.update(_Pkg(name=pkg_name) for pkg_name in tasks.to_keep) ++ transaction_configuration.to_reinstall.update(_Pkg(name=pkg_name) for pkg_name in tasks.to_reinstall) return transaction_configuration -@@ -130,6 +135,7 @@ def compute_pkg_changes_between_consequent_releases(source_installed_pkgs, +@@ -133,6 +138,7 @@ def compute_pkg_changes_between_consequent_releases(source_installed_pkgs, logger = api.current_logger() # Start with the installed packages and modify the set according to release events target_pkgs = set(source_installed_pkgs) @@ -3938,7 +3938,7 @@ index f5cb2613..10e27220 100644 release_events = [e for e in events if e.to_release == release] -@@ -173,9 +179,12 @@ def compute_pkg_changes_between_consequent_releases(source_installed_pkgs, +@@ -176,9 +182,12 @@ def compute_pkg_changes_between_consequent_releases(source_installed_pkgs, target_pkgs = target_pkgs.difference(event.out_pkgs) target_pkgs = target_pkgs.union(event.out_pkgs) @@ -3952,7 +3952,7 @@ index f5cb2613..10e27220 100644 def remove_undesired_events(events, relevant_to_releases): -@@ -241,15 +250,17 @@ def compute_packages_on_target_system(source_pkgs, events, releases): +@@ -244,15 +253,17 @@ def compute_packages_on_target_system(source_pkgs, events, releases): did_processing_cross_major_version = True pkgs_to_demodularize = {pkg for pkg in target_pkgs if pkg.modulestream} @@ -3974,7 +3974,7 @@ index f5cb2613..10e27220 100644 def compute_rpm_tasks_from_pkg_set_diff(source_pkgs, target_pkgs, pkgs_to_demodularize): -@@ -353,15 +364,13 @@ def get_pesid_to_repoid_map(target_pesids): +@@ -356,15 +367,13 @@ def get_pesid_to_repoid_map(target_pesids): :return: Dictionary mapping the target_pesids to their corresponding repoid """ @@ -3993,7 +3993,7 @@ index f5cb2613..10e27220 100644 rhui_info = next(api.consume(RHUIInfo), None) cloud_provider = rhui_info.provider if rhui_info else '' -@@ -507,6 +516,19 @@ def process(): +@@ -553,6 +562,19 @@ def process(): if not events: return @@ -4011,20 +4011,20 @@ index f5cb2613..10e27220 100644 + events.extend(vendor_events) + releases = get_relevant_releases(events) - source_pkgs = get_installed_pkgs() - source_pkgs = apply_transaction_configuration(source_pkgs) -@@ -519,7 +541,7 @@ def process(): + installed_pkgs = get_installed_pkgs() + transaction_configuration = get_transaction_configuration() +@@ -566,7 +588,7 @@ def process(): events = remove_undesired_events(events, releases) # Apply events - compute what packages should the target system have -- target_pkgs, pkgs_to_demodularize = compute_packages_on_target_system(source_pkgs, events, releases) -+ target_pkgs, pkgs_to_demodularize, pkgs_to_reinstall = compute_packages_on_target_system(source_pkgs, events, releases) +- target_pkgs, pkgs_to_demodularize = compute_packages_on_target_system(pkgs_to_begin_computation_with, ++ target_pkgs, pkgs_to_demodularize, pkgs_to_reinstall = compute_packages_on_target_system(pkgs_to_begin_computation_with, + events, releases) # Packages coming out of the events have PESID as their repository, however, we need real repoid - target_pkgs = replace_pesids_with_repoids_in_packages(target_pkgs, repoids_of_source_pkgs) -@@ -535,4 +557,5 @@ def process(): - # Compare the packages on source system and the computed packages on target system and determine what to install - rpm_tasks = compute_rpm_tasks_from_pkg_set_diff(source_pkgs, target_pkgs, pkgs_to_demodularize) +@@ -586,4 +608,5 @@ def process(): + rpm_tasks = include_instructions_from_transaction_configuration(rpm_tasks, transaction_configuration, + installed_pkgs) if rpm_tasks: + rpm_tasks.to_reinstall = sorted(pkgs_to_reinstall) api.produce(rpm_tasks) @@ -4963,7 +4963,7 @@ index 00000000..a53775cf + } +} diff --git a/repos/system_upgrade/common/files/distro/rhel/gpg-signatures.json b/repos/system_upgrade/common/files/distro/rhel/gpg-signatures.json -index 8a5471a8..dde34c9d 100644 +index 3cc67f82..c1f4acf4 100644 --- a/repos/system_upgrade/common/files/distro/rhel/gpg-signatures.json +++ b/repos/system_upgrade/common/files/distro/rhel/gpg-signatures.json @@ -4,7 +4,9 @@ @@ -4988,7 +4988,7 @@ index 8a5471a8..dde34c9d 100644 + "gpg-pubkey-6275f250-5e26cb2e", + "gpg-pubkey-73e3b907-6581b071" + ], - "10": [] + "10": ["gpg-pubkey-fd431d51-4ae0493b"] } } diff --git a/repos/system_upgrade/common/files/distro/rocky/gpg-signatures.json b/repos/system_upgrade/common/files/distro/rocky/gpg-signatures.json diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 235d459..5bb0223 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: 5%{?dist} +Release: 5%{?dist}.elevate.1 Summary: Repositories for leapp License: ASL 2.0 @@ -427,6 +427,10 @@ done; # no files here %changelog +* Thu Jan 23 2025 Yuriy Kohut - 0.21.0-5.elevate.1 +- Update ELevate patch: + - rabase to upstream 0.21.0-5 + * Fri Jan 17 2025 Petr Stodulka - 0.21.0-5 - Fix pes events scanner crashing when there are duplicate packages in the received instructions - Fix pes events scanner not respecting user’s transaction configuration