rpms/osinfo-db
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add rhel 10.0 and rhel-10-unknown

Browse Source 
Resolves: rhel#RHEL-56104

Signed-off-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Victor Toso 2024-09-05 16:37:49 +02:00
parent 41aaabb585
commit 6b30beff64
4 changed files with 464 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
0001-rhel-Add-RHEL-10.0-prerelease.patch Normal file
View File

@ -0,0 +1,192 @@
From 1e530bc8eef3bc90ba24637e068c7e4a37967d35 Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Thu, 5 Sep 2024 16:28:56 +0200
Subject: [PATCH 1/3] rhel: Add RHEL 10.0 (prerelease)
Based on RHEL 9.5
Patches from:
https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/767
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
os/redhat.com/rhel-10.0.xml | 167 ++++++++++++++++++++++++++++++++++++
1 file changed, 167 insertions(+)
create mode 100644 os/redhat.com/rhel-10.0.xml
diff --git a/os/redhat.com/rhel-10.0.xml b/os/redhat.com/rhel-10.0.xml
new file mode 100644
index 0000000..762376c
--- /dev/null
+++ b/os/redhat.com/rhel-10.0.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://redhat.com/rhel/10.0">
+ <short-id>rhel10.0</short-id>
+ <name>Red Hat Enterprise Linux 10.0</name>
+ <version>10.0</version>
+ <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="zh_Hans">Red Hat, Inc</vendor>
+ <vendor xml:lang="ka">Red Hat, Inc</vendor>
+ <vendor xml:lang="ko">Red Hat, Inc</vendor>
+ <vendor xml:lang="fi">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
+ <vendor xml:lang="tr">Red Hat, Inc</vendor>
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
+ <vendor xml:lang="it">Red Hat, Inc</vendor>
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <upgrades id="http://redhat.com/rhel/9.5"/>
+ <derives-from id="http://redhat.com/rhel/9.5"/>
+ <release-status>prerelease</release-status>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-10-0(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-10-0(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <volume-id>RHEL[_-]10[_-]0([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <volume-id>RHEL-10-0(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.0(-[0-9]|[1-9][0-9])?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.0(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.0(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.0(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <resources arch="ppc64le">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>4000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>35184372088832</ram>
+ </maximum>
+ </resources>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>26388279066624</ram>
+ </maximum>
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
+ <resources arch="s390x">
+ <minimum>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>340</n-cpus>
+ <ram>17592186044416</ram>
+ </maximum>
+ <network-install>
+ <ram>2147483648</ram>
+ </network-install>
+ </resources>
+ <resources arch="aarch64">
+ <minimum>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>256</n-cpus>
+ <ram>1649267441664</ram>
+ </maximum>
+ </resources>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
--
2.46.0

191
0002-rhel-Add-RHEL-10-unknown.patch Normal file
View File

@ -0,0 +1,191 @@
From 734b730416c816df964e93f603a827f1d20932cf Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Thu, 5 Sep 2024 16:29:49 +0200
Subject: [PATCH 2/3] rhel: Add RHEL 10 unknown
Based on RHEL 10.0
Patches from:
https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/767
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
os/redhat.com/rhel-10-unknown.xml | 166 ++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
create mode 100644 os/redhat.com/rhel-10-unknown.xml
diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml
new file mode 100644
index 0000000..b384c03
--- /dev/null
+++ b/os/redhat.com/rhel-10-unknown.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://redhat.com/rhel/10-unknown">
+ <short-id>rhel10-unknown</short-id>
+ <name>Red Hat Enterprise Linux 10 Unknown</name>
+ <version>10-unknown</version>
+ <vendor>Red Hat, Inc</vendor>
+ <vendor xml:lang="zh_Hans">Red Hat, Inc</vendor>
+ <vendor xml:lang="ka">Red Hat, Inc</vendor>
+ <vendor xml:lang="ko">Red Hat, Inc</vendor>
+ <vendor xml:lang="fi">Red Hat, Inc</vendor>
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
+ <vendor xml:lang="tr">Red Hat, Inc</vendor>
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
+ <vendor xml:lang="it">Red Hat, Inc</vendor>
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
+ <vendor xml:lang="de">Red Hat, Inc</vendor>
+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
+ <family>linux</family>
+ <distro>rhel</distro>
+ <upgrades id="http://redhat.com/rhel/10.0"/>
+ <derives-from id="http://redhat.com/rhel/10.0"/>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <volume-id>RHEL[_-]10[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <volume-id>RHEL-10-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <resources arch="ppc64le">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>4000000000</cpu>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>35184372088832</ram>
+ </maximum>
+ </resources>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>768</n-cpus>
+ <ram>26388279066624</ram>
+ </maximum>
+ <network-install>
+ <ram>3221225472</ram>
+ </network-install>
+ </resources>
+ <resources arch="s390x">
+ <minimum>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>340</n-cpus>
+ <ram>17592186044416</ram>
+ </maximum>
+ <network-install>
+ <ram>2147483648</ram>
+ </network-install>
+ </resources>
+ <resources arch="aarch64">
+ <minimum>
+ <ram>2147483648</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <storage>21474836480</storage>
+ </recommended>
+ <maximum>
+ <n-cpus>256</n-cpus>
+ <ram>1649267441664</ram>
+ </maximum>
+ </resources>
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>1610612736</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+ <installer>
+ <script id="http://redhat.com/rhel/kickstart/jeos"/>
+ <script id="http://redhat.com/rhel/kickstart/desktop"/>
+ </installer>
+ </os>
+</libosinfo>
--
2.46.0

64
0003-rhel-Update-rhel-unknown-upgrades-rhel10-unknown.patch Normal file
View File

@ -0,0 +1,64 @@
From eacc2d31118ac155f13fbfe89b8b3b5564864f3a Mon Sep 17 00:00:00 2001
From: Victor Toso <victortoso@redhat.com>
Date: Thu, 5 Sep 2024 16:30:39 +0200
Subject: [PATCH 3/3] rhel: Update rhel-unknown upgrades rhel10-unknown
Patches from:
https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/767
Signed-off-by: Victor Toso <victortoso@redhat.com>
---
os/redhat.com/rhel-unknown.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/os/redhat.com/rhel-unknown.xml b/os/redhat.com/rhel-unknown.xml
index 1fc72c4..a04211c 100644
--- a/os/redhat.com/rhel-unknown.xml
+++ b/os/redhat.com/rhel-unknown.xml
@@ -35,11 +35,11 @@
<vendor xml:lang="ca">Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
- <upgrades id="http://redhat.com/rhel/9-unknown"/>
+ <upgrades id="http://redhat.com/rhel/10-unknown"/>
<media arch="x86_64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>RHEL-[1-9][0-9]-([0-9]|[1-9][0-9]).*x86_64$</volume-id>
+ <volume-id>RHEL-(1[1-9]|[2-9][0-9])-([0-9]|[1-9][0-9]).*x86_64$</volume-id>
</iso>
<kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd>
@@ -47,25 +47,25 @@
<media arch="aarch64">
<iso>
<system-id>LINUX</system-id>
- <volume-id>RHEL-[1-9][0-9]-([0-9]|[1-9][0-9]).*aarch64$</volume-id>
+ <volume-id>RHEL-(1[1-9]|[2-9][0-9])-([0-9]|[1-9][0-9]).*aarch64$</volume-id>
</iso>
</media>
<media arch="ppc64">
<iso>
<system-id>PPC</system-id>
- <volume-id>RHEL-[1-9][0-9]-([0-9]|[1-9][0-9]).*ppc64$</volume-id>
+ <volume-id>RHEL-(1[1-9]|[2-9][0-9])-([0-9]|[1-9][0-9]).*ppc64$</volume-id>
</iso>
</media>
<media arch="ppc64le">
<iso>
<system-id>PPC</system-id>
- <volume-id>RHEL[_-][1-9][0-9][_-]([0-9]|[1-9][0-9]).*ppc64le$</volume-id>
+ <volume-id>RHEL[_-](1[1-9]|[2-9][0-9])[_-]([0-9]|[1-9][0-9]).*ppc64le$</volume-id>
</iso>
</media>
<media arch="s390x">
<iso>
<system-id>LINUX</system-id>
- <volume-id>RHEL-[1-9][0-9]-([0-9]|[1-9][0-9]).*s390x$</volume-id>
+ <volume-id>RHEL-(1[1-9]|[2-9][0-9])-([0-9]|[1-9][0-9]).*s390x$</volume-id>
</iso>
</media>
<resources arch="ppc64">
--
2.46.0

20
osinfo-db.spec
View File

@ -1,5 +1,8 @@
# -*- rpm-spec -*-
%define PatchedSource ../%{name}-%{version}-patched.tar.xz
%define ExtractedSource %{name}-%{version}
%define with_mingw 0
%if 0%{?fedora}
%define with_mingw 0%{!?_without_mingw:1}
@ -13,7 +16,11 @@ License: GPL-2.0-or-later
Source0: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz
Source1: https://fedorahosted.org/releases/l/i/libosinfo/%{name}-%{version}.tar.xz.asc
URL: http://libosinfo.org/
Patch0001: 0001-rhel-Add-RHEL-10.0-prerelease.patch
Patch0002: 0002-rhel-Add-RHEL-10-unknown.patch
Patch0003: 0003-rhel-Update-rhel-unknown-upgrades-rhel10-unknown.patch
BuildRequires: intltool
BuildRequires: git-core
BuildRequires: osinfo-db-tools
BuildArch: noarch
Requires: hwdata
@ -45,16 +52,23 @@ operating systems for use with virtualization provisioning tools
%endif
%prep
%autosetup -S git_am
%build
rm -rf ../%{ExtractedSource}/.git
tar -cvJf %{PatchedSource} ../%{ExtractedSource}/
%install
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo %{PatchedSource}
%if 0%{?rhel}
# Remove the upstream virtio-win / spice-guest-tools drivers
find %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/ -name "win-*.d" -type d -exec rm -rf {} +
%endif
%if %{with_mingw}
osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{SOURCE0}
osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
osinfo-db-import --root %{buildroot} --dir %{mingw32_datadir}/osinfo %{PatchedSource}
osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{PatchedSource}
%endif
%files