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

Add patch to support AlmaLinux

Browse Source 
Bump the package release
This commit is contained in:
Yuriy Kohut 2025-06-27 12:48:38 +03:00
parent b71dc1da3a
commit afe69d7f0e
2 changed files with 652 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

646
SOURCES/leapp-repository-0.22.0-almalinux.patch Normal file
View File

@ -0,0 +1,646 @@
diff --git a/etc/leapp/files/repomap.json b/etc/leapp/files/repomap.json
index fc0c42f1..84257d40 100644
--- a/etc/leapp/files/repomap.json
+++ b/etc/leapp/files/repomap.json
@@ -302,6 +302,38 @@
{
"pesid": "rhel10-BaseOS",
"entries": [
+ {
+ "major_version": "10",
+ "repoid": "baseos",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "baseos",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "baseos",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "baseos",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "10",
"repoid": "baseos",
@@ -485,6 +517,38 @@
{
"pesid": "rhel10-AppStream",
"entries": [
+ {
+ "major_version": "10",
+ "repoid": "appstream",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "appstream",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "appstream",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "appstream",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "10",
"repoid": "appstream",
@@ -813,6 +877,38 @@
"channel": "ga",
"repo_type": "rpm",
"distro": "centos"
+ },
+ {
+ "major_version": "10",
+ "repoid": "crb",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "crb",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "crb",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "crb",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
}
]
},
@@ -984,12 +1080,28 @@
"channel": "ga",
"repo_type": "rpm",
"distro": "centos"
+ },
+ {
+ "major_version": "10",
+ "repoid": "rt",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
}
]
},
{
"pesid": "rhel10-NFV",
"entries": [
+ {
+ "major_version": "10",
+ "repoid": "nfv",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "10",
"repoid": "nfv",
@@ -1181,6 +1293,38 @@
{
"pesid": "rhel10-HighAvailability",
"entries": [
+ {
+ "major_version": "10",
+ "repoid": "highavailability",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "highavailability",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "highavailability",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "10",
+ "repoid": "highavailability",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "10",
"repoid": "highavailability",
@@ -4256,6 +4400,38 @@
{
"pesid": "rhel9-BaseOS",
"entries": [
+ {
+ "major_version": "9",
+ "repoid": "baseos",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "baseos",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "baseos",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "baseos",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "9",
"repoid": "baseos",
@@ -4537,6 +4713,38 @@
{
"pesid": "rhel9-AppStream",
"entries": [
+ {
+ "major_version": "9",
+ "repoid": "appstream",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "appstream",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "appstream",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "appstream",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "9",
"repoid": "appstream",
@@ -4973,6 +5181,38 @@
"repo_type": "rpm",
"distro": "centos"
},
+ {
+ "major_version": "9",
+ "repoid": "crb",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "crb",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "crb",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "crb",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "9",
"repoid": "rhui-codeready-builder-for-rhel-9-aarch64-rhui-rpms",
@@ -5206,12 +5446,28 @@
"channel": "ga",
"repo_type": "rpm",
"distro": "centos"
+ },
+ {
+ "major_version": "9",
+ "repoid": "rt",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
}
]
},
{
"pesid": "rhel9-NFV",
"entries": [
+ {
+ "major_version": "9",
+ "repoid": "nfv",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "9",
"repoid": "nfv",
@@ -5466,6 +5722,38 @@
{
"pesid": "rhel9-HighAvailability",
"entries": [
+ {
+ "major_version": "9",
+ "repoid": "highavailability",
+ "arch": "aarch64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "highavailability",
+ "arch": "ppc64le",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "highavailability",
+ "arch": "s390x",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
+ {
+ "major_version": "9",
+ "repoid": "highavailability",
+ "arch": "x86_64",
+ "channel": "ga",
+ "repo_type": "rpm",
+ "distro": "almalinux"
+ },
{
"major_version": "9",
"repoid": "highavailability",
diff --git a/repos/system_upgrade/common/actors/repositoriesmapping/tests/files/repomap_example.json b/repos/system_upgrade/common/actors/repositoriesmapping/tests/files/repomap_example.json
index 1f04d72d..8756ab11 100644
--- a/repos/system_upgrade/common/actors/repositoriesmapping/tests/files/repomap_example.json
+++ b/repos/system_upgrade/common/actors/repositoriesmapping/tests/files/repomap_example.json
@@ -25,6 +25,24 @@
"pesid4",
"pesid5"
]
+ },
+ {
+ "source": "pesid8",
+ "target": [
+ "pesid9"
+ ]
+ }
+ ]
+ },
+ {
+ "source_major_version": "9",
+ "target_major_version": "10",
+ "entries": [
+ {
+ "source": "pesid9",
+ "target": [
+ "pesid10"
+ ]
}
]
}
@@ -120,6 +138,45 @@
"distro": "centos"
}
]
+ },
+ {
+ "pesid": "pesid8",
+ "entries": [
+ {
+ "major_version": "8",
+ "repoid": "some-almalinux-8-repoid1",
+ "arch": "x86_64",
+ "repo_type": "rpm",
+ "channel": "ga",
+ "distro": "almalinux"
+ }
+ ]
+ },
+ {
+ "pesid": "pesid9",
+ "entries": [
+ {
+ "major_version": "9",
+ "repoid": "some-almalinux-9-repoid1",
+ "arch": "x86_64",
+ "repo_type": "rpm",
+ "channel": "ga",
+ "distro": "almalinux"
+ }
+ ]
+ },
+ {
+ "pesid": "pesid10",
+ "entries": [
+ {
+ "major_version": "10",
+ "repoid": "some-almalinux-10-repoid1",
+ "arch": "x86_64",
+ "repo_type": "rpm",
+ "channel": "ga",
+ "distro": "almalinux"
+ }
+ ]
}
]
}
diff --git a/repos/system_upgrade/common/actors/repositoriesmapping/tests/unit_test_repositoriesmapping.py b/repos/system_upgrade/common/actors/repositoriesmapping/tests/unit_test_repositoriesmapping.py
index 9d781125..4e2cd1bc 100644
--- a/repos/system_upgrade/common/actors/repositoriesmapping/tests/unit_test_repositoriesmapping.py
+++ b/repos/system_upgrade/common/actors/repositoriesmapping/tests/unit_test_repositoriesmapping.py
@@ -105,6 +105,36 @@ def test_scan_existing_valid_data(monkeypatch, adjust_cwd):
rhui='',
distro='centos',
),
+ PESIDRepositoryEntry(
+ pesid='pesid8',
+ major_version='8',
+ repoid='some-almalinux-8-repoid1',
+ arch='x86_64',
+ repo_type='rpm',
+ channel='ga',
+ rhui='',
+ distro='almalinux',
+ ),
+ PESIDRepositoryEntry(
+ pesid='pesid9',
+ major_version='9',
+ repoid='some-almalinux-9-repoid1',
+ arch='x86_64',
+ repo_type='rpm',
+ channel='ga',
+ rhui='',
+ distro='almalinux',
+ ),
+ PESIDRepositoryEntry(
+ pesid='pesid10',
+ major_version='10',
+ repoid='some-almalinux-10-repoid1',
+ arch='x86_64',
+ repo_type='rpm',
+ channel='ga',
+ rhui='',
+ distro='almalinux',
+ ),
]
fail_description = 'Expected pesid repo is not present in the deserialization output.'
diff --git a/repos/system_upgrade/common/files/distro/almalinux/gpg-signatures.json b/repos/system_upgrade/common/files/distro/almalinux/gpg-signatures.json
new file mode 100644
index 00000000..51607273
--- /dev/null
+++ b/repos/system_upgrade/common/files/distro/almalinux/gpg-signatures.json
@@ -0,0 +1,25 @@
+{
+ "keys": [
+ "51d6647ec21ad6ea",
+ "d36cb86cb86b3716",
+ "2ae81e8aced7258b",
+ "429785e181b961a5",
+ "d07bf2a08d50eb66"
+ ],
+ "obsoleted-keys": {
+ "7": [],
+ "8": [
+ "gpg-pubkey-2fa658e0-45700c69",
+ "gpg-pubkey-37017186-45761324",
+ "gpg-pubkey-db42a60e-37ea5438"
+ ],
+ "9": [
+ "gpg-pubkey-d4082792-5b32db75",
+ "gpg-pubkey-3abb34f8-5ffd890e",
+ "gpg-pubkey-6275f250-5e26cb2e",
+ "gpg-pubkey-73e3b907-6581b071"
+ ],
+ "10": []
+ }
+
+}
diff --git a/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/10/RPM-GPG-KEY-AlmaLinux-10 b/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/10/RPM-GPG-KEY-AlmaLinux-10
new file mode 100644
index 00000000..5228281c
--- /dev/null
+++ b/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/10/RPM-GPG-KEY-AlmaLinux-10
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l
+ykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu
+8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe
+0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj
+z0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O
+onOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV
+qmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B
+OOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn
+xmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG
+kRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW
+58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB
+tChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB
+CgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC
+AwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW
+Js2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml
+K5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+
+Si1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K
+amS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8
+UvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V
+LxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9
+ikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN
+qHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN
+q/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr
+RQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq
+36vVHBB+dTDg
+=tJCw
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/9/RPM-GPG-KEY-AlmaLinux-9 b/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/9/RPM-GPG-KEY-AlmaLinux-9
new file mode 100644
index 00000000..d4165d58
--- /dev/null
+++ b/repos/system_upgrade/common/files/distro/almalinux/rpm-gpg/9/RPM-GPG-KEY-AlmaLinux-9
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+1WKL
+=jk2t
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json
index 279e6eaa..e9df8d5f 100644
--- a/repos/system_upgrade/common/files/upgrade_paths.json
+++ b/repos/system_upgrade/common/files/upgrade_paths.json
@@ -27,5 +27,12 @@
"9": "9.6",
"10": "10.0"
}
+ },
+ "almalinux": {
+ "default": {
+ "8.10": ["9.0", "9.1", "9.2", "9.3", "9.4", "9.5", "9.6"],
+ "9.5": ["10.0"],
+ "9.6": ["10.0"]
+ }
}
}
diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py
index 7f29c9cd..8d49c758 100644
--- a/repos/system_upgrade/common/libraries/config/version.py
+++ b/repos/system_upgrade/common/libraries/config/version.py
@@ -19,8 +19,8 @@ OP_MAP = {
_SUPPORTED_VERSIONS = {
# 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.6'], 'rhel-saphana': ['9.6']},
+ '8': {'rhel': ['8.10'], 'rhel-saphana': ['8.10'], 'almalinux': ['8.6', '8.7', '8.8', '8.9', '8.10']},
+ '9': {'rhel': ['9.6'], 'rhel-saphana': ['9.6'], 'almalinux': ['9.4', '9.5', '9.6']},
}

8
SPECS/leapp-repository.spec
View File

@ -52,7 +52,7 @@ py2_byte_compile "%1" "%2"}
Name: leapp-repository
Version: 0.22.0
Release: 4%{?dist}
Release: 4.1%{?dist}
Summary: Repositories for leapp
License: ASL 2.0
@ -111,6 +111,7 @@ Patch0040: 0040-Fix-parsing-of-the-kernel-cmdline.patch
Patch0041: 0041-repomap-Process-repositories-based-on-distro.patch
Patch0042: 0042-Update-the-upgrade-data-files-stream-4.0.patch
Patch0043: 0043-unit-tests-suppress-deprecation-warning-for-is_rhel_.patch
Patch0100: leapp-repository-0.22.0-almalinux.patch
%description
%{summary}
@ -321,6 +322,7 @@ Requires: libdb-utils
%patch -P 0041 -p1
%patch -P 0042 -p1
%patch -P 0043 -p1
%patch -P 0100 -p1
%build
@ -402,6 +404,9 @@ done;
# no files here
%changelog
* Fri Jun 27 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.22.0-4.1
- Support of AlmaLinux OS. Phase 1
* Thu Jun 05 2025 Karolina Kula <kkula@redhat.com> - 0.22.0-4
- Fix parsing of the kernel cmdline
- Require leapp data with provided_data_streams 4.0+
@ -1220,4 +1225,3 @@ done;
* Wed Nov 07 2018 Petr Stodulka <pstodulk@redhat.com> - 0.3-1
- Initial RPM
Resolves: #1636481