diff --git a/SOURCES/leapp-repository-0.22.0-elevate.patch b/SOURCES/leapp-repository-0.22.0-elevate.patch index 307ceb8..c60629d 100644 --- a/SOURCES/leapp-repository-0.22.0-elevate.patch +++ b/SOURCES/leapp-repository-0.22.0-elevate.patch @@ -3823,7 +3823,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 50336150..540182a5 100644 +index e6741293..7a7e9ebf 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 @@ @@ -3942,7 +3942,7 @@ index 50336150..540182a5 100644 rhui_info = next(api.consume(RHUIInfo), None) cloud_provider = rhui_info.provider if rhui_info else '' -@@ -553,6 +562,19 @@ def process(): +@@ -554,6 +563,19 @@ def process(): if not events: return @@ -3962,7 +3962,7 @@ index 50336150..540182a5 100644 releases = get_relevant_releases(events) installed_pkgs = get_installed_pkgs() transaction_configuration = get_transaction_configuration() -@@ -566,7 +588,7 @@ def process(): +@@ -567,7 +589,7 @@ def process(): events = remove_undesired_events(events, releases) # Apply events - compute what packages should the target system have @@ -3971,14 +3971,14 @@ index 50336150..540182a5 100644 events, releases) # Packages coming out of the events have PESID as their repository, however, we need real repoid -@@ -586,4 +608,5 @@ def process(): +@@ -587,4 +609,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) diff --git a/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py b/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py -index 58089195..4ec1d6e0 100644 +index d4a64793..4ec1d6e0 100644 --- a/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py +++ b/repos/system_upgrade/common/actors/repositoriesmapping/libraries/repositoriesmapping.py @@ -3,6 +3,7 @@ from collections import defaultdict @@ -3989,12 +3989,12 @@ index 58089195..4ec1d6e0 100644 from leapp.libraries.common.fetch import load_data_asset from leapp.libraries.common.rpms import get_leapp_packages, LeappComponents from leapp.libraries.stdlib import api -@@ -16,120 +17,6 @@ REPOMAP_FILE = 'repomap.json' +@@ -16,121 +17,6 @@ REPOMAP_FILE = 'repomap.json' """The name of the new repository mapping file.""" -class RepoMapData(object): -- VERSION_FORMAT = '1.2.1' +- VERSION_FORMAT = '1.3.0' - - def __init__(self): - self.repositories = [] @@ -4017,7 +4017,8 @@ index 58089195..4ec1d6e0 100644 - repo_type=data['repo_type'], - arch=data['arch'], - major_version=data['major_version'], -- pesid=pesid +- pesid=pesid, +- distro=data['distro'], - )) - - def get_repositories(self, valid_major_versions): @@ -4406,7 +4407,7 @@ index 00000000..cb5c7ab7 + assert api.current_logger.infomsg == msg + assert not api.produce.called diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/actor.py b/repos/system_upgrade/common/actors/setuptargetrepos/actor.py -index 767fa00c..bc1d5bfa 100644 +index 91855818..3a7e955b 100644 --- a/repos/system_upgrade/common/actors/setuptargetrepos/actor.py +++ b/repos/system_upgrade/common/actors/setuptargetrepos/actor.py @@ -10,7 +10,8 @@ from leapp.models import ( @@ -4419,7 +4420,7 @@ index 767fa00c..bc1d5bfa 100644 ) from leapp.tags import FactsPhaseTag, IPUWorkflowTag -@@ -32,7 +33,8 @@ class SetupTargetRepos(Actor): +@@ -37,7 +38,8 @@ class SetupTargetRepos(Actor): RepositoriesFacts, RepositoriesBlacklisted, RHUIInfo, @@ -5181,15 +5182,15 @@ index c9c3f1fc..96907be0 100644 def is_nogpgcheck_set(): diff --git a/repos/system_upgrade/common/libraries/repomaputils.py b/repos/system_upgrade/common/libraries/repomaputils.py new file mode 100644 -index 00000000..db91400e +index 00000000..39b7d662 --- /dev/null +++ b/repos/system_upgrade/common/libraries/repomaputils.py -@@ -0,0 +1,140 @@ +@@ -0,0 +1,141 @@ +from collections import defaultdict +from leapp.models import PESIDRepositoryEntry, RepoMapEntry, RepositoriesMapping + +class RepoMapData(object): -+ VERSION_FORMAT = '1.2.1' ++ VERSION_FORMAT = '1.3.0' + + def __init__(self): + self.repositories = [] @@ -5212,7 +5213,8 @@ index 00000000..db91400e + repo_type=data['repo_type'], + arch=data['arch'], + major_version=data['major_version'], -+ pesid=pesid ++ pesid=pesid, ++ distro=data['distro'], + )) + + def get_repositories(self, valid_major_versions): @@ -5385,10 +5387,10 @@ index 00000000..de4056fb + topic = VendorTopic + data = fields.List(fields.String()) diff --git a/repos/system_upgrade/common/models/repositoriesmap.py b/repos/system_upgrade/common/models/repositoriesmap.py -index 7192a60d..2144090d 100644 +index 842cd807..fc740606 100644 --- a/repos/system_upgrade/common/models/repositoriesmap.py +++ b/repos/system_upgrade/common/models/repositoriesmap.py -@@ -91,3 +91,4 @@ class RepositoriesMapping(Model): +@@ -96,3 +96,4 @@ class RepositoriesMapping(Model): mapping = fields.List(fields.Model(RepoMapEntry), default=[]) repositories = fields.List(fields.Model(PESIDRepositoryEntry), default=[]) diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 3bdcb72..02fd95e 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -422,6 +422,10 @@ ln -s 10.0 %{next_major_ver} # no files here %changelog +* Tue Jun 24 2025 Yuriy Kohut - 0.22.0-4.elevate.1 +- Update ELevate patch: + - rebase to upstream 0.22.0-4 (hash 7c6bb64e550ccfefe4001e79fef44b7d69446c36) + * Thu Jun 05 2025 Karolina Kula - 0.22.0-4 - Fix parsing of the kernel cmdline - Require leapp data with provided_data_streams 4.0+