ykohut/leapp-repository
1
0
Fork 0
forked from rpms/leapp-repository
Code Pull Requests Activity

Update ELevate patch: rabase to upststream 0.22.0-1

Browse Source 
Bump version to 0.22.0-1.elevate.1
This commit is contained in:
Yuriy Kohut 2025-02-27 17:38:25 +02:00
parent aca48aac9c
commit 3782e8de2b
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SOURCES/leapp-repository-0.21.0-elevate.patch → SOURCES/leapp-repository-0.22.0-elevate.patch
View File

@ -3422,7 +3422,7 @@ index 00000000..370758e6
+ end
+end
diff --git a/commands/command_utils.py b/commands/command_utils.py
index 190f5f03..e264ced4 100644
index 84b9de1b..387468f3 100644
--- a/commands/command_utils.py
+++ b/commands/command_utils.py
@@ -16,7 +16,7 @@ LEAPP_UPGRADE_FLAVOUR_DEFAULT = 'default'
@ -3444,10 +3444,10 @@ index 00000000..c6694a8e
+### Useful for packages that have identical version strings but contain binary changes between major OS versions
+### Packages that aren't installed will be skipped
diff --git a/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py b/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py
index b236e39b..af02f1a6 100644
index b28ec57c..6882488a 100644
--- a/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py
+++ b/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py
@@ -89,7 +89,7 @@ def figure_out_commands_needed_to_add_entry(kernel_path, initramfs_path, args_to
@@ -91,7 +91,7 @@ def figure_out_commands_needed_to_add_entry(kernel_path, initramfs_path, args_to
'/usr/sbin/grubby',
'--add-kernel', '{0}'.format(kernel_path),
'--initrd', '{0}'.format(initramfs_path),
@ -3457,10 +3457,10 @@ index b236e39b..af02f1a6 100644
'--make-default',
'--args', args_to_add_str
diff --git a/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py b/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py
index 2f58ba9e..b15f96b5 100644
index e5f632bc..3e8d8c7b 100644
--- a/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py
+++ b/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py
@@ -50,7 +50,7 @@ run_args_add = [
@@ -53,7 +53,7 @@ run_args_add = [
'/usr/sbin/grubby',
'--add-kernel', '/abc',
'--initrd', '/def',
@ -3706,7 +3706,7 @@ index f42909f0..6383a56f 100644
+ if not has_grub_cfg:
+ run(['/sbin/grub2-mkconfig', '-o', grub_cfg_path])
diff --git a/repos/system_upgrade/common/actors/filterrpmtransactionevents/actor.py b/repos/system_upgrade/common/actors/filterrpmtransactionevents/actor.py
index 5ccdb35b..b5002ba0 100644
index 582a5821..18f2c33f 100644
--- a/repos/system_upgrade/common/actors/filterrpmtransactionevents/actor.py
+++ b/repos/system_upgrade/common/actors/filterrpmtransactionevents/actor.py
@@ -32,6 +32,7 @@ class FilterRpmTransactionTasks(Actor):
@ -3741,7 +3741,7 @@ index 5ccdb35b..b5002ba0 100644
modules_to_reset=list(modules_to_reset.values()),
modules_to_enable=list(modules_to_enable.values())))
diff --git a/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py b/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py
index 9e213f64..7e0462e8 100644
index 749b3347..39e4487f 100644
--- a/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py
+++ b/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py
@@ -1,4 +1,5 @@
@ -5071,26 +5071,26 @@ index 34f7b8f9..acba532c 100644
if self.opts.tid[0] == 'check':
diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json
index cc9dcdb5..5ce5a666 100644
index 1c54dae8..5ce5a666 100644
--- a/repos/system_upgrade/common/files/upgrade_paths.json
+++ b/repos/system_upgrade/common/files/upgrade_paths.json
@@ -1,10 +1,10 @@
{
"default": {
- "7.9": ["8.10"],
- "8.10": ["9.4", "9.5", "9.6"],
- "8.10": ["9.4", "9.6"],
+ "7.9": ["8.7", "8.8", "8.9", "8.10"],
+ "8.10": ["9.0", "9.1", "9.2", "9.3", "9.4", "9.5"],
"9.6": ["10.0"],
- "7": ["8.10"],
- "8": ["9.4", "9.5", "9.6"],
- "8": ["9.4", "9.6"],
+ "7": ["8.7", "8.8", "8.9", "8.10"],
+ "8": ["9.0", "9.1", "9.2", "9.3", "9.4", "9.5"],
"9": ["10.0"]
},
"saphana": {
diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py
index d710a647..0d075535 100644
index febeed36..0d075535 100644
--- a/repos/system_upgrade/common/libraries/config/version.py
+++ b/repos/system_upgrade/common/libraries/config/version.py
@@ -17,9 +17,9 @@ OP_MAP = {
@ -5099,7 +5099,7 @@ index d710a647..0d075535 100644
# Note: 'rhel-alt' is detected when on 'rhel' with kernel 4.x
- '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9']},
- '8': {'rhel': ['8.10'], 'rhel-saphana': ['8.10']},
- '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6']},
- '9': {'rhel': ['9.6'], 'rhel-saphana': ['9.6']},
+ '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9'], 'centos': ['7.9'], 'ol': ['7.9'], 'scientific': ['7.9']},
+ '8': {'rhel': ['8.8', '8.10'], 'rhel-saphana': ['8.8', '8.10'], 'centos': ['8.5', '8.999'], 'almalinux': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'ol': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'rocky': ['8.6', '8.7', '8.8', '8.9', '8.10']},
+ '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6'], 'centos': ['9.999'], 'almalinux': ['9.4', '9.5', '9.6'], 'rocky': ['9.4', '9.5', '9.6']},
@ -5332,10 +5332,10 @@ index 00000000..db91400e
+
+ return combined_repomapping
diff --git a/repos/system_upgrade/common/libraries/rhsm.py b/repos/system_upgrade/common/libraries/rhsm.py
index 74f6aeb1..6f512d7d 100644
index e7b074aa..0b260c86 100644
--- a/repos/system_upgrade/common/libraries/rhsm.py
+++ b/repos/system_upgrade/common/libraries/rhsm.py
@@ -93,7 +93,7 @@ def _handle_rhsm_exceptions(hint=None):
@@ -94,7 +94,7 @@ def _handle_rhsm_exceptions(hint=None):
def skip_rhsm():
"""Check whether we should skip RHSM related code."""
@ -5344,7 +5344,7 @@ index 74f6aeb1..6f512d7d 100644
def with_rhsm(f):
@@ -326,11 +326,6 @@ def set_container_mode(context):
@@ -327,11 +327,6 @@ def set_container_mode(context):
could be affected and the generated repo file in the container could be
affected as well (e.g. when the release is set, using rhsm, on the host).
@ -5356,7 +5356,7 @@ index 74f6aeb1..6f512d7d 100644
:param context: An instance of a mounting.IsolatedActions class
:type context: mounting.IsolatedActions class
"""
@@ -338,20 +333,8 @@ def set_container_mode(context):
@@ -339,20 +334,8 @@ def set_container_mode(context):
api.current_logger().error('Trying to set RHSM into the container mode'
'on host. Skipping the action.')
return
@ -5472,10 +5472,10 @@ index 00000000..014b7afb
+class VendorTopic(Topic):
+ name = 'vendor_topic'
diff --git a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
index 5e9bf5c6..8a4a34b6 100644
index c076fe6b..2455a2f6 100644
--- a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
+++ b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
@@ -15,6 +15,22 @@ from leapp.libraries.common.grub import (
@@ -14,6 +14,22 @@ from leapp.libraries.common.grub import (
from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo, EFIBootEntry, TargetUserSpaceInfo
@ -5498,20 +5498,20 @@ index 5e9bf5c6..8a4a34b6 100644
UPGRADE_EFI_ENTRY_LABEL = 'Leapp Upgrade'
ARM_SHIM_PACKAGE_NAME = 'shim-aa64'
@@ -22,7 +38,7 @@ ARM_GRUB_PACKAGE_NAME = 'grub2-efi-aa64'
@@ -21,7 +37,7 @@ ARM_GRUB_PACKAGE_NAME = 'grub2-efi-aa64'
EFI_MOUNTPOINT = '/boot/efi/'
LEAPP_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/leapp/')
-RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/redhat/')
+RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/', distro_dir)
UPGRADE_BLS_DIR = '/boot/upgrade-loader'
CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir'
diff --git a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
index 3ff3ead9..a64a0a9f 100644
index daa7b2ca..dd604d8b 100644
--- a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
+++ b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
@@ -6,9 +6,25 @@ from leapp.libraries.common.grub import GRUB2_BIOS_ENTRYPOINT, GRUB2_BIOS_ENV_FI
@@ -5,9 +5,25 @@ from leapp.exceptions import StopActorExecutionError
from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo

7
SPECS/leapp-repository.spec
View File

@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"}
Epoch: 1
Name: leapp-repository
Version: 0.22.0
Release: 1%{?dist}
Release: 1%{?dist}.elevate.1
Summary: Repositories for leapp
License: ASL 2.0
@ -66,6 +66,7 @@ BuildArch: noarch
### PATCHES HERE
# Patch0001: filename.patch
Patch0100: leapp-repository-0.22.0-elevate.patch
%description
@ -235,6 +236,7 @@ Requires: python3-distro
# APPLY PATCHES HERE
# %%patch0001 -p1
%%patch0100 -p1
%build
@ -319,6 +321,9 @@ done;
# no files here
%changelog
* Thu Feb 27 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.22.0-1.elevate.1
- ELevate vendors support for upstream 0.22.0-1 version
* Fri Feb 14 2025 Petr Stodulka <pstodulk@redhat.com> - 0.22.0-1
- Rebase to new upstream 0.22.0
- Minor updates in generated reports