Compare commits
No commits in common. "a8" and "a10s-deprecated" have entirely different histories.
a8
...
a10s-depre
66
config.yaml
66
config.yaml
@ -1,39 +1,34 @@
|
|||||||
actions:
|
actions:
|
||||||
- replace:
|
- replace:
|
||||||
- target: "spec"
|
- target: "spec"
|
||||||
find: |
|
find: "# CentOS also defines rhel so we check for centos first"
|
||||||
# CentOS also defines rhel so we check for centos first
|
|
||||||
%if 0%{?centos}
|
|
||||||
|
|
||||||
# CentOS 9 supports building for CentOS 8 and later
|
|
||||||
%if 0%{?centos} >= 9
|
|
||||||
install -m 0644 -vp repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
|
||||||
replace: |
|
replace: |
|
||||||
|
# CentOS also defines rhel so we check for centos first
|
||||||
|
|
||||||
%if 0%{?almalinux}
|
%if 0%{?almalinux}
|
||||||
%if 0%{?almalinux} >= 9
|
# AL10 support all AL versions
|
||||||
install -m 0644 -vp repositories/almalinux-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
%if 0%{?almalinux} >= 10
|
||||||
|
install -m 0644 -vp repositories/almalinux* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
install -m 0644 -vp repositories/kitten-10* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
%else
|
||||||
|
# AL8 supports in AL9 and AL8
|
||||||
|
install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
%if 0%{?rhel} == 9
|
||||||
|
install -m 0644 -vp repositories/almalinux-9* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%else
|
||||||
|
# Check for CentOS
|
||||||
count: 1
|
count: 1
|
||||||
- target: "spec"
|
- target: "spec"
|
||||||
find: |
|
find: "# Fedora can build for all included fedora releases"
|
||||||
# CentOS 8 only supports building for CentOS 8
|
replace: |
|
||||||
install -m 0644 -vp repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
%endif
|
||||||
install -m 0644 -vp repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
|
||||||
|
# Fedora can build for all included fedora releases
|
||||||
%endif
|
|
||||||
%else
|
|
||||||
%if 0%{?rhel}
|
|
||||||
# RHEL 9 supports building for RHEL 8 and later
|
|
||||||
%if 0%{?rhel} >= 9
|
|
||||||
install -m 0644 -vp repositories/rhel-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
|
||||||
|
|
||||||
%else
|
|
||||||
# RHEL 8 only supports building for 8
|
|
||||||
install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
|
|
||||||
|
|
||||||
%endif
|
|
||||||
replace: "install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/"
|
|
||||||
count: 1
|
count: 1
|
||||||
|
|
||||||
- modify_release:
|
- modify_release:
|
||||||
- suffix: ".alma.1"
|
- suffix: ".alma.1"
|
||||||
enabled: true
|
enabled: true
|
||||||
@ -42,13 +37,16 @@ actions:
|
|||||||
- name: "Eduard Abdullin"
|
- name: "Eduard Abdullin"
|
||||||
email: "eabdullin@almalinux.org"
|
email: "eabdullin@almalinux.org"
|
||||||
line:
|
line:
|
||||||
- "Install AlmaLinux repositories"
|
- "Add AlmaLinux support patch"
|
||||||
- "Add AlmaLinux support"
|
- "Add AlmaLinux-Kitten support patch"
|
||||||
|
|
||||||
- add_files:
|
- add_files:
|
||||||
- type: "patch"
|
|
||||||
name: "0001-AlmaLinux-support-patch.patch"
|
|
||||||
number: 100
|
|
||||||
- type: "patch"
|
- type: "patch"
|
||||||
name: "0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch"
|
name: "0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch"
|
||||||
number: 101
|
number: 1001
|
||||||
|
- type: "patch"
|
||||||
|
name: "0002-Add-AlmaLinux-support.patch"
|
||||||
|
number: 1002
|
||||||
|
- type: "patch"
|
||||||
|
name: "0003-Add-AlmaLinux-Kitten-support.patch"
|
||||||
|
number: 1003
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
From a4435c48480b969785d9afbec7ad3657db24f43b Mon Sep 17 00:00:00 2001
|
From 7674af39a9b345c15fb15dc5396e45abaab90465 Mon Sep 17 00:00:00 2001
|
||||||
From: eabdullin <ed.abdullin.1@gmail.com>
|
From: eabdullin <eabdullin@almalinux.org>
|
||||||
Date: Thu, 28 Mar 2024 13:12:22 +0300
|
Date: Thu, 26 Dec 2024 15:52:33 +0300
|
||||||
Subject: [PATCH] Remove libreport-rhel-anaconda-bugzilla from anaconda
|
Subject: [PATCH 1/3] Remove libreport-rhel-anaconda-bugzilla from anaconda
|
||||||
packageset
|
packageset
|
||||||
|
|
||||||
---
|
---
|
||||||
vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
|
.../github.com/osbuild/images/pkg/distro/defs/rhel-8/distro.yaml | 1 -
|
||||||
1 file changed, 1 deletion(-)
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/defs/rhel-8/distro.yaml b/vendor/github.com/osbuild/images/pkg/distro/defs/rhel-8/distro.yaml
|
||||||
index 05c54e5..68b0100 100644
|
index be701b3..a2db923 100644
|
||||||
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
|
--- a/vendor/github.com/osbuild/images/pkg/distro/defs/rhel-8/distro.yaml
|
||||||
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/defs/rhel-8/distro.yaml
|
||||||
@@ -214,7 +214,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
|
@@ -313,7 +313,6 @@
|
||||||
"libibverbs",
|
- "libibverbs"
|
||||||
"libreport-plugin-bugzilla",
|
- "libreport-plugin-bugzilla"
|
||||||
"libreport-plugin-reportuploader",
|
- "libreport-plugin-reportuploader"
|
||||||
- "libreport-rhel-anaconda-bugzilla",
|
- - "libreport-rhel-anaconda-bugzilla"
|
||||||
"librsvg2",
|
- "librsvg2"
|
||||||
"linux-firmware",
|
- "linux-firmware"
|
||||||
"lklug-fonts",
|
- "lklug-fonts"
|
||||||
--
|
--
|
||||||
2.39.3 (Apple Git-146)
|
2.39.5 (Apple Git-154)
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
280
files/0003-Add-AlmaLinux-Kitten-support.patch
Normal file
280
files/0003-Add-AlmaLinux-Kitten-support.patch
Normal file
@ -0,0 +1,280 @@
|
|||||||
|
From b0b3da4737021c8a3ff471f113e729dde5cd69cd Mon Sep 17 00:00:00 2001
|
||||||
|
From: eabdullin <eabdullin@almalinux.org>
|
||||||
|
Date: Thu, 26 Dec 2024 15:57:00 +0300
|
||||||
|
Subject: [PATCH 3/3] Add AlmaLinux Kitten support
|
||||||
|
|
||||||
|
---
|
||||||
|
repositories/kitten-10.json | 66 +++++++++++++++++++
|
||||||
|
.../osbuild/images/pkg/distro/defs/loader.go | 2 +-
|
||||||
|
.../osbuild/images/pkg/distro/host.go | 23 +++++++
|
||||||
|
.../images/pkg/distro/rhel/distribution.go | 19 ++++++
|
||||||
|
.../images/pkg/distro/rhel/imagetype.go | 4 ++
|
||||||
|
.../images/pkg/distro/rhel/rhel10/distro.go | 33 ++++++++++
|
||||||
|
.../images/pkg/distrofactory/distrofactory.go | 1 +
|
||||||
|
.../images/pkg/distroidparser/idparser.go | 1 +
|
||||||
|
8 files changed, 148 insertions(+), 1 deletion(-)
|
||||||
|
create mode 100644 repositories/kitten-10.json
|
||||||
|
|
||||||
|
diff --git a/repositories/kitten-10.json b/repositories/kitten-10.json
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..674b9e5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/repositories/kitten-10.json
|
||||||
|
@@ -0,0 +1,66 @@
|
||||||
|
+{
|
||||||
|
+ "aarch64": [
|
||||||
|
+ {
|
||||||
|
+ "name": "baseos",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/BaseOS/aarch64/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ "name": "appstream",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/AppStream/aarch64/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "ppc64le": [
|
||||||
|
+ {
|
||||||
|
+ "name": "baseos",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/BaseOS/ppc64le/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ "name": "appstream",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/AppStream/ppc64le/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "s390x": [
|
||||||
|
+ {
|
||||||
|
+ "name": "baseos",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/BaseOS/s390x/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ "name": "appstream",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/AppStream/s390x/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "x86_64": [
|
||||||
|
+ {
|
||||||
|
+ "name": "baseos",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/BaseOS/x86_64/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ },
|
||||||
|
+ {
|
||||||
|
+ "name": "appstream",
|
||||||
|
+ "baseurl": "https://kitten.repo.almalinux.org/10-kitten/AppStream/x86_64/os/",
|
||||||
|
+ "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGaP6O8BEACvg8IlAxGayV8zOi9Ex+Pd8lrj2BrBzloG8ri84ORp9o8ojq7l\nykKmIElHe11cQD2Lf/a4lcQQ4Ec3baiD786X6K2eVSlBEAnZMzfjDg8R63SfsBuu\n8Yk+lUyqlBrDnSDYaPruOAzLIz2r82ikIC1jDbipZsMFPFHPI4/hayyWxJ3oGxRe\n0mbtYLB9ElEKngt+/hfo7JLklakbznyIRuVEF3VrZb91XC6r/idqfJoNyBXSKidj\nz0IwqOhgkLUk84rzltDo3AzwGqusd7PEuhOmqinOhp0hMdXsztD4TVyhw82iXu/O\nonOAObZTZYfM6Z8btmDqkoo0aT+oPPCuZ3yC/caU9dhvCSXET/CGoXc3hL55u9PV\nqmcVm/mwvuEImEAvxVc0/dBzEUk+FwW8KsaN3HoUKrC4/NqgmaQz8/42np7u2j+B\nOOJ4hAckNEdWd8rB86CYN00sdxnvLBsp8V3IwEqXLhGOoBsagy61Z8hKCM+siOGn\nxmbbybgaLOs+DPlxt9LrtgLJHODwmD96oysUPJuA0lv8KMiSpId0tSpp9Wn/wHBG\nkRgxGYfzQu7WRvRZqQaleft1JTXXOjNzPur0RkJyb3yFwAoxpePyo/WrupM41OHW\n58cEqdC6riCnJcS4U84RLj+hwvufBVB7areQ75sETnKeyozZW+P16E1t/wARAQAB\ntChBbG1hTGludXggT1MgMTAgPHBhY2thZ2VyQGFsbWFsaW51eC5vcmc+iQJMBBMB\nCgA2FiEE7m23uY9b9e3Z2g3l3uXBHMKh5XIFAmaP6O8CGwMECwkIBwQVCgkIBRYC\nAwEAAh4FAheAAAoJEN7lwRzCoeVy32AP/A2+KI+JhmsxnactSptkAWGyAAf1YBWW\nJs2sc9OJdKj7uIkzszCx7c7VIVeF/VLijIYpM/zwUgir5S5SimzQmY+FumwbKIml\nK5RBsoSog22i7Edho0MLa1pa6qvnKS0nkl9DEcu8EbMUhucWbxGnCG/22EEMTrY+\nSi1IZNkDGtlBHHBKMC+STbqqTxtdy4tAd2NYwWh3sBIh6PF7T4NLRAugu7PZQr5K\namS4z2lV3ebshGjieA0Zoznwh0AXgN0gZ/0pC/LXI25gcgtrvkCyL8Fe0AyZUMd8\nUvZXaRSsm3SkCUIlGjPrvuItn1D7tHmqVSCDKXDM2TqjfiRm1JF+2OFCBNvGz19V\nLxWd/Gf+0qw0dtKxRMKzGh0mxXY40hjtmYZulrPxhG5itNDjStovgrevM1HBsXs9\nikrkOGQ0pFcqizTn4ZKAmMozEMuIuV89Vof2bBCg7pHT1FmXVdAaYJxb6a7A/CgN\nqHjoh8AxBiGw/Q2NM4YJlUVhHqqd+/lUG3WJqACNEnqSlZkYQ3HqNNaKhHVbD4mN\nq/g6v+f8aWWDZDsI6IAfbJUB+KPEnIvQJQleWuHrq7kcUMhEq3dwBMIoTVEHhUUr\nRQKToSEM1rN7PcanaXQM2gy141dS7tFLxhapG8ug75LkIUnEOpPMtUjvrU1ZELGq\n36vVHBB+dTDg\n=tJCw\n-----END PGP PUBLIC KEY BLOCK-----",
|
||||||
|
+ "check_gpg": true,
|
||||||
|
+ "rhsm": false
|
||||||
|
+ }
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||||
|
index 6638138..bb243ab 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/defs/loader.go
|
||||||
|
@@ -88,7 +88,7 @@ func PackageSet(it distro.ImageType, overrideTypeName string, replacements map[s
|
||||||
|
baseDir = distroNameMajorVer
|
||||||
|
case "almalinux":
|
||||||
|
baseDir = fmt.Sprintf("rhel-%s", distroMajorVer)
|
||||||
|
- case "centos":
|
||||||
|
+ case "centos", "almalinux_kitten", "kitten":
|
||||||
|
// centos yaml is just rhel but we have (sadly) no symlinks
|
||||||
|
// in "go:embed" so we have to have this slightly ugly
|
||||||
|
// workaround
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/host.go b/vendor/github.com/osbuild/images/pkg/distro/host.go
|
||||||
|
index 88d1da0..cc408c1 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distro/host.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/host.go
|
||||||
|
@@ -8,6 +8,7 @@ import (
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
"strings"
|
||||||
|
+ "strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
// variable so that it can be overridden in tests
|
||||||
|
@@ -28,6 +29,28 @@ func GetHostDistroName() (string, error) {
|
||||||
|
return "", errors.New("cannot get the host distro name: missing VERSION_ID field in os-release")
|
||||||
|
}
|
||||||
|
|
||||||
|
+ versionParts := strings.Split(osrelease["VERSION_ID"], ".")
|
||||||
|
+ majorVersion, err := strconv.Atoi(versionParts[0])
|
||||||
|
+ if err != nil {
|
||||||
|
+ return "", errors.New("parsing major version failed")
|
||||||
|
+ }
|
||||||
|
+ minorVersion := -1
|
||||||
|
+
|
||||||
|
+ if len(versionParts) > 2 {
|
||||||
|
+ return "", errors.New("too many dots in the OS version")
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if len(versionParts) > 1 {
|
||||||
|
+ minorVersion, err = strconv.Atoi(versionParts[1])
|
||||||
|
+ if err != nil {
|
||||||
|
+ return "", errors.New("parsing minor version failed")
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if osrelease["ID"] == "almalinux" && majorVersion == 10 && minorVersion == -1 {
|
||||||
|
+ osrelease["ID"] = "kitten"
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
name := osrelease["ID"] + "-" + osrelease["VERSION_ID"]
|
||||||
|
|
||||||
|
return name, nil
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go
|
||||||
|
index 8ad6354..3ef61c9 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/distribution.go
|
||||||
|
@@ -101,6 +101,10 @@ func (d *Distribution) IsAlma() bool {
|
||||||
|
return strings.HasPrefix(d.name, "almalinux")
|
||||||
|
}
|
||||||
|
|
||||||
|
+func (d *Distribution) IsAlmaKitten() bool {
|
||||||
|
+ return strings.HasPrefix(d.name, "kitten")
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
func (d *Distribution) GetDefaultImageConfig() *distro.ImageConfig {
|
||||||
|
if d.DefaultImageConfig == nil {
|
||||||
|
return nil
|
||||||
|
@@ -146,6 +150,21 @@ func NewDistribution(name string, major, minor int) (*Distribution, error) {
|
||||||
|
ostreeRefTmpl: fmt.Sprintf("centos/%d/%%s/edge", major),
|
||||||
|
runner: &runner.CentOS{Version: uint64(major)},
|
||||||
|
}
|
||||||
|
+ case "kitten":
|
||||||
|
+ if minor != -1 {
|
||||||
|
+ return nil, fmt.Errorf("AlmaLinux Kitten does not have minor versions, but got %d", minor)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rd = &Distribution{
|
||||||
|
+ name: fmt.Sprintf("kitten-%d", major),
|
||||||
|
+ product: "AlmaLinux Kitten",
|
||||||
|
+ osVersion: fmt.Sprintf("%d-kitten", major),
|
||||||
|
+ releaseVersion: fmt.Sprintf("%d", major),
|
||||||
|
+ modulePlatformID: fmt.Sprintf("platform:el%d", major),
|
||||||
|
+ vendor: "almalinux",
|
||||||
|
+ ostreeRefTmpl: fmt.Sprintf("almalinux/%d/%%s/edge", major),
|
||||||
|
+ runner: &runner.CentOS{Version: uint64(major)},
|
||||||
|
+ }
|
||||||
|
case "almalinux":
|
||||||
|
if minor == -1 {
|
||||||
|
return nil, errors.New("AlmaLinux requires a minor version")
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go
|
||||||
|
index 9fc3ff8..66e60eb 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/imagetype.go
|
||||||
|
@@ -138,6 +138,10 @@ func (t *ImageType) IsAlma() bool {
|
||||||
|
return t.arch.distro.IsAlma()
|
||||||
|
}
|
||||||
|
|
||||||
|
+func (t *ImageType) IsAlmaKitten() bool {
|
||||||
|
+ return t.arch.distro.IsAlmaKitten()
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
func (t *ImageType) ISOLabel() (string, error) {
|
||||||
|
if !t.BootISO {
|
||||||
|
return "", fmt.Errorf("image type %q is not an ISO", t.name)
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go
|
||||||
|
index 86dc59d..225c369 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go
|
||||||
|
@@ -41,10 +41,13 @@ func distroISOLabelFunc(t *rhel.ImageType) string {
|
||||||
|
const RHEL_ISO_LABEL = "RHEL-%s-%s-0-BaseOS-%s"
|
||||||
|
const CS_ISO_LABEL = "CentOS-Stream-%s-BaseOS-%s"
|
||||||
|
const ALMA_ISO_LABEL = "AlmaLinux-%s-%s-%s-dvd"
|
||||||
|
+ const ALMA_KITTEN_ISO_LABEL = "AlmaLinux-Kitten-%s-%s-dvd"
|
||||||
|
|
||||||
|
if t.IsRHEL() {
|
||||||
|
osVer := strings.Split(t.Arch().Distro().OsVersion(), ".")
|
||||||
|
return fmt.Sprintf(RHEL_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name())
|
||||||
|
+ } else if t.IsAlmaKitten() {
|
||||||
|
+ return fmt.Sprintf(ALMA_KITTEN_ISO_LABEL, t.Arch().Distro().Releasever(), t.Arch().Name())
|
||||||
|
} else if t.IsAlma() {
|
||||||
|
osVer := strings.Split(t.Arch().Distro().OsVersion(), ".")
|
||||||
|
return fmt.Sprintf(ALMA_ISO_LABEL, osVer[0], osVer[1], t.Arch().Name())
|
||||||
|
@@ -297,6 +300,28 @@ func ParseID(idStr string) (*distro.ID, error) {
|
||||||
|
return nil, fmt.Errorf("rhel requires minor version, but got: %d", id.MinorVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+ return id, nil
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+func ParseIDKitten(idStr string) (*distro.ID, error) {
|
||||||
|
+ id, err := distro.ParseID(idStr)
|
||||||
|
+ if err != nil {
|
||||||
|
+ return nil, err
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if id.Name != "kitten" {
|
||||||
|
+ return nil, fmt.Errorf("invalid distro name: %s", id.Name)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if id.MajorVersion != 10 {
|
||||||
|
+ return nil, fmt.Errorf("invalid distro major version: %d", id.MajorVersion)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if id.MinorVersion != -1 {
|
||||||
|
+ return nil, fmt.Errorf("AlmaLinux Kitten does not use minor version, but got: %d", id.MinorVersion)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -308,3 +333,11 @@ func DistroFactory(idStr string) distro.Distro {
|
||||||
|
|
||||||
|
return newDistro(id.Name, 10, id.MinorVersion)
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+func DistroFactoryKitten(idStr string) distro.Distro {
|
||||||
|
+ if idStr != "kitten-10" {
|
||||||
|
+ return nil
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return newDistro("kitten", 10, -1)
|
||||||
|
+}
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distrofactory/distrofactory.go b/vendor/github.com/osbuild/images/pkg/distrofactory/distrofactory.go
|
||||||
|
index 4e264b8..b9eea42 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distrofactory/distrofactory.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distrofactory/distrofactory.go
|
||||||
|
@@ -114,6 +114,7 @@ func NewDefault() *Factory {
|
||||||
|
rhel8.DistroFactory,
|
||||||
|
rhel9.DistroFactory,
|
||||||
|
rhel10.DistroFactory,
|
||||||
|
+ rhel10.DistroFactoryKitten,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/vendor/github.com/osbuild/images/pkg/distroidparser/idparser.go b/vendor/github.com/osbuild/images/pkg/distroidparser/idparser.go
|
||||||
|
index 7bd1e72..f21cb71 100644
|
||||||
|
--- a/vendor/github.com/osbuild/images/pkg/distroidparser/idparser.go
|
||||||
|
+++ b/vendor/github.com/osbuild/images/pkg/distroidparser/idparser.go
|
||||||
|
@@ -68,5 +68,6 @@ func NewDefaultParser() *Parser {
|
||||||
|
rhel8.ParseID,
|
||||||
|
rhel9.ParseID,
|
||||||
|
rhel10.ParseID,
|
||||||
|
+ rhel10.ParseIDKitten,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.39.5 (Apple Git-154)
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user