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

import UBI osinfo-db-20250124-2.el9_6

Browse Source
This commit is contained in:
eabdullin 2025-06-24 11:12:00 +00:00
parent 51314773e7
commit 4864951302
4 changed files with 908 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

481
SOURCES/0001-add-rhel-9.6-rhel-9.7-prerelease.patch Normal file
View File

@ -0,0 +1,481 @@
From 335f2b596707070100db911606070b5b96b00554 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 10 Jun 2025 15:31:21 +0200
Subject: [PATCH 1/3] add: rhel 9.6, rhel 9.7 (prerelease)
Update rhel-9-unknown to match 9.8 and later.
f566665d rhel: Add RHEL 9.7 (prerelease)
27b4355f Add rhel 9.6 release date
5a0c2bab rhel: Add RHEL 9.6 (prerelease)
Resolves: RHEL-87787
Signed-off-by: rpm-build <rpm-build>
---
os/redhat.com/rhel-9-unknown.xml | 28 ++---
os/redhat.com/rhel-9.6.xml | 170 +++++++++++++++++++++++++++++++
os/redhat.com/rhel-9.7.xml | 170 +++++++++++++++++++++++++++++++
3 files changed, 354 insertions(+), 14 deletions(-)
create mode 100644 os/redhat.com/rhel-9.6.xml
create mode 100644 os/redhat.com/rhel-9.7.xml
diff --git a/os/redhat.com/rhel-9-unknown.xml b/os/redhat.com/rhel-9-unknown.xml
index f4ce9b7..20a0953 100644
--- a/os/redhat.com/rhel-9-unknown.xml
+++ b/os/redhat.com/rhel-9-unknown.xml
@@ -5,12 +5,12 @@
<os id="http://redhat.com/rhel/9-unknown">
<short-id>rhel9-unknown</short-id>
<name>Red Hat Enterprise Linux 9 Unknown</name>
- <name xml:lang="zh_Hans">Red Hat Enterprise Linux 9 Unknown</name>
+ <name xml:lang="zh-Hans">Red Hat Enterprise Linux 9 Unknown</name>
<name xml:lang="ka">Red Hat Enterprise Linux 9 Unknown</name>
<name xml:lang="ko">Red Hat &#xAE30;&#xC5C5;&#xC6A9; &#xB9AC;&#xB205;&#xC2A4; 9 (&#xC54C; &#xC218; &#xC5C6;&#xC74C;)</name>
<name xml:lang="uk">Red Hat Enterprise Linux 9 &#x43D;&#x435;&#x432;&#x456;&#x434;&#x43E;&#x43C;&#x430;</name>
<name xml:lang="tr">Red Hat Enterprise Linux 9 Bilinmeyen</name>
- <name xml:lang="pt_BR">Red Hat Enterprise Linux 9 desconhecido</name>
+ <name xml:lang="pt-BR">Red Hat Enterprise Linux 9 desconhecido</name>
<name xml:lang="pl">Red Hat Enterprise Linux 9 (nieznany)</name>
<name xml:lang="it">Red Hat Enterprise Linux 9 (sconosciuto)</name>
<name xml:lang="id">Red Hat Enterprise Linux 9 Tak Diketahui</name>
@@ -18,13 +18,13 @@
<name xml:lang="de">Red Hat Enterprise Linux 9 Unknown</name>
<version>9-unknown</version>
<vendor>Red Hat, Inc</vendor>
- <vendor xml:lang="zh_Hans">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="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>
@@ -36,59 +36,59 @@
<family>linux</family>
<distro>rhel</distro>
<codename>Plow</codename>
- <upgrades id="http://redhat.com/rhel/9.4"/>
- <derives-from id="http://redhat.com/rhel/9.4"/>
+ <upgrades id="http://redhat.com/rhel/9.7"/>
+ <derives-from id="http://redhat.com/rhel/9.7"/>
<media arch="x86_64">
<iso>
- <volume-id>.*RHEL-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
+ <volume-id>.*RHEL-9-([8-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-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
+ <volume-id>RHEL-9-([8-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[_-]9[_-]([6-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
+ <volume-id>RHEL[_-]9[_-]([8-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-9-([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ <volume-id>RHEL-9-([8-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>^9.([6-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
+ <version>^9.([8-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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([8-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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([8-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>^9.([6-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
+ <version>^9.([8-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/os/redhat.com/rhel-9.6.xml b/os/redhat.com/rhel-9.6.xml
new file mode 100644
index 0000000..bf12c20
--- /dev/null
+++ b/os/redhat.com/rhel-9.6.xml
@@ -0,0 +1,170 @@
+<?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/9.6">
+ <short-id>rhel9.6</short-id>
+ <name>Red Hat Enterprise Linux 9.6</name>
+ <version>9.6</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>
+ <codename>Plow</codename>
+ <upgrades id="http://redhat.com/rhel/9.5"/>
+ <derives-from id="http://redhat.com/rhel/9.5"/>
+ <release-date>2025-05-16</release-date>
+ <!-- RHEL 9.6 entries have to cope both with 9.6 and 9.6.x regexes for
+ medias' volume-id and trees' version -->
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-9-6-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <volume-id>RHEL[_-]9[_-]6[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-9-6-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <volume-id>RHEL-9-6-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.6(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.6(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.6(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.6(.([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>
diff --git a/os/redhat.com/rhel-9.7.xml b/os/redhat.com/rhel-9.7.xml
new file mode 100644
index 0000000..8f25a83
--- /dev/null
+++ b/os/redhat.com/rhel-9.7.xml
@@ -0,0 +1,170 @@
+<?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/9.7">
+ <short-id>rhel9.7</short-id>
+ <name>Red Hat Enterprise Linux 9.7</name>
+ <version>9.7</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>
+ <codename>Plow</codename>
+ <upgrades id="http://redhat.com/rhel/9.6"/>
+ <derives-from id="http://redhat.com/rhel/9.6"/>
+ <release-status>prerelease</release-status>
+ <!-- RHEL 9.7 entries have to cope both with 9.7 and 9.7.x regexes for
+ medias' volume-id and trees' version -->
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-9-7-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <volume-id>RHEL[_-]9[_-]7[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
+ </iso>
+ <kernel>ppc/ppc64/vmlinuz</kernel>
+ <initrd>ppc/ppc64/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-9-7-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <volume-id>RHEL-9-7-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.7(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.7(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.7(.([0-9]|[1-9][0-9]))?$</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^9.7(.([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.49.0

325
SOURCES/0002-add-rhel-10.0-rhel-10.1-prerelease.patch Normal file
View File

@ -0,0 +1,325 @@
From 8d6dcd880899cc7bcb74197918fea8dbda88d7bd Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 10 Jun 2025 15:33:02 +0200
Subject: [PATCH 2/3] add: rhel 10.0, rhel 10.1 (prerelease)
Update rhel-10-unknown to match 10.2 and later.
62f8adce rhel: Add RHEL 10.1 (prerelease)
2a374acd rhel10: set release date, add test data
Related: RHEL-87787
Signed-off-by: rpm-build <rpm-build>
---
os/redhat.com/rhel-10-unknown.xml | 28 ++---
os/redhat.com/rhel-10.0.xml | 10 +-
os/redhat.com/rhel-10.1.xml | 168 ++++++++++++++++++++++++++++++
3 files changed, 187 insertions(+), 19 deletions(-)
create mode 100644 os/redhat.com/rhel-10.1.xml
diff --git a/os/redhat.com/rhel-10-unknown.xml b/os/redhat.com/rhel-10-unknown.xml
index ee3519e..d464e8e 100644
--- a/os/redhat.com/rhel-10-unknown.xml
+++ b/os/redhat.com/rhel-10-unknown.xml
@@ -15,13 +15,13 @@
<name xml:lang="fr">Red Hat Enterprise Linux 10 inconnu</name>
<version>10-unknown</version>
<vendor>Red Hat, Inc</vendor>
- <vendor xml:lang="zh_Hans">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="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>
@@ -33,59 +33,59 @@
<family>linux</family>
<distro>rhel</distro>
<codename>Coughlan</codename>
- <upgrades id="http://redhat.com/rhel/10.0"/>
- <derives-from id="http://redhat.com/rhel/10.0"/>
+ <upgrades id="http://redhat.com/rhel/10.1"/>
+ <derives-from id="http://redhat.com/rhel/10.1"/>
<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>
+ <volume-id>RHEL-10-([2-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>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/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>
+ <volume-id>RHEL-10-([2-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>
+ <volume-id>RHEL[_-]10[_-]([2-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>
+ <volume-id>RHEL-10-([2-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>
+ <version>^10.([2-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>
+ <version>^10.([2-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>
+ <version>^10.([2-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>
+ <version>^10.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
<arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/os/redhat.com/rhel-10.0.xml b/os/redhat.com/rhel-10.0.xml
index 9f11c48..cdc2b57 100644
--- a/os/redhat.com/rhel-10.0.xml
+++ b/os/redhat.com/rhel-10.0.xml
@@ -15,13 +15,13 @@
<name xml:lang="fr">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="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="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>
@@ -35,13 +35,13 @@
<codename>Coughlan</codename>
<upgrades id="http://redhat.com/rhel/9.5"/>
<derives-from id="http://redhat.com/rhel/9.5"/>
- <release-status>prerelease</release-status>
+ <release-date>2025-05-20</release-date>
<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>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
</media>
<media arch="aarch64">
<iso>
diff --git a/os/redhat.com/rhel-10.1.xml b/os/redhat.com/rhel-10.1.xml
new file mode 100644
index 0000000..16aa649
--- /dev/null
+++ b/os/redhat.com/rhel-10.1.xml
@@ -0,0 +1,168 @@
+<?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.1">
+ <short-id>rhel10.1</short-id>
+ <name>Red Hat Enterprise Linux 10.1</name>
+ <version>10.1</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>
+ <codename>Coughlan</codename>
+ <upgrades id="http://redhat.com/rhel/10.0"/>
+ <derives-from id="http://redhat.com/rhel/10.0"/>
+ <release-status>prerelease</release-status>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>RHEL-10-1(-[0-9]|[1-9][0-9])?.*x86_64</volume-id>
+ </iso>
+ <kernel>images/pxeboot/vmlinuz</kernel>
+ <initrd>images/pxeboot/initrd.img</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <volume-id>RHEL-10-1(-[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([_-]([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(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
+ </iso>
+ </media>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>Red Hat Enterprise Linux</family>
+ <version>^10.1(-[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(.([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(.([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(.([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.49.0

78
SOURCES/0003-add-Windows-Server-2025.patch Normal file
View File

@ -0,0 +1,78 @@
From 4cbcfd01671d9c815338efd22525d6d9ec8f386f Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 10 Jun 2025 15:37:53 +0200
Subject: [PATCH 3/3] add: Windows Server 2025
074e10f2 wink25: add Windows Server 2025
Resolves: RHEL-82513
Signed-off-by: rpm-build <rpm-build>
---
os/microsoft.com/win-2k25.xml | 55 +++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 os/microsoft.com/win-2k25.xml
diff --git a/os/microsoft.com/win-2k25.xml b/os/microsoft.com/win-2k25.xml
new file mode 100644
index 0000000..0fd9526
--- /dev/null
+++ b/os/microsoft.com/win-2k25.xml
@@ -0,0 +1,55 @@
+<?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://microsoft.com/win/2k25">
+ <short-id>win2k25</short-id>
+ <name>Microsoft Windows Server 2025</name>
+ <version>10.0</version>
+ <vendor>Microsoft Corporation</vendor>
+ <vendor xml:lang="zh-Hans">Microsoft Corporation</vendor>
+ <vendor xml:lang="ka">Microsoft Corporation</vendor>
+ <vendor xml:lang="ko">Microsoft Corporation</vendor>
+ <vendor xml:lang="uk">&#x41A;&#x43E;&#x440;&#x43F;&#x43E;&#x440;&#x430;&#x446;&#x456;&#x44F; Microsoft</vendor>
+ <vendor xml:lang="tr">Microsoft Corporation</vendor>
+ <vendor xml:lang="pt-BR">Microsoft Corporation</vendor>
+ <vendor xml:lang="pl">Microsoft Corporation</vendor>
+ <vendor xml:lang="ja">Microsoft Corporation</vendor>
+ <vendor xml:lang="it">Microsoft Corporation</vendor>
+ <vendor xml:lang="id">Microsoft Corporation</vendor>
+ <vendor xml:lang="fr">Microsoft Corporation</vendor>
+ <vendor xml:lang="es">Microsoft Corporation</vendor>
+ <vendor xml:lang="de">Microsoft Corporation</vendor>
+ <vendor xml:lang="ca">Microsoft Corporation</vendor>
+ <family>winnt</family>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k22"/>
+ <upgrades id="http://microsoft.com/win/2k22"/>
+ <release-date>2024-11-01</release-date>
+ <eol-date>2034-10-10</eol-date>
+ <media arch="x86_64">
+ <iso>
+ <volume-id>^(SSS_X64CHK|SSS_X64FREE?|SSS_X64FREV)_</volume-id>
+ <publisher-id>MICROSOFT CORPORATION</publisher-id>
+ <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[A-Z0-9]*_([A-Z]*)</l10n-language>
+ </iso>
+ </media>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>1400000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>536870912</ram>
+ <storage>34359738368</storage>
+ </minimum>
+ <recommended>
+ <cpu>2000000000</cpu>
+ <ram>4294967296</ram>
+ <storage>42949672960</storage>
+ </recommended>
+ <maximum>
+ <!-- 256 TB -->
+ <ram>281474976710656</ram>
+ </maximum>
+ </resources>
+ </os>
+</libosinfo>
--
2.49.0

28
SPECS/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}
@ -8,12 +11,16 @@
Summary: osinfo database files
Name: osinfo-db
Version: 20250124
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
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-add-rhel-9.6-rhel-9.7-prerelease.patch
Patch0002: 0002-add-rhel-10.0-rhel-10.1-prerelease.patch
Patch0003: 0003-add-Windows-Server-2025.patch
BuildRequires: intltool
BuildRequires: git-core
BuildRequires: osinfo-db-tools
BuildArch: noarch
Requires: hwdata
@ -23,16 +30,23 @@ The osinfo database provides information about operating systems and
hypervisor platforms to facilitate the automated configuration and
provisioning of new virtual machines
%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
@ -47,6 +61,12 @@ osinfo-db-import --root %{buildroot} --dir %{mingw64_datadir}/osinfo %{SOURCE0}
%{_datadir}/osinfo/schema
%changelog
* Tue Jun 10 2025 Victor Toso <victortoso@redhat.com> - 20250124-2
- Fix missing rhel 9.6 and related
Resolves: RHEL-87787
- Fix missing windows server 2025
Resolves: RHEL-82513
* Mon Jan 27 2025 Victor Toso <victortoso@redhat.com> - 20250124-1
- Update to new release (v20250124)
Resolves: rhbz#RHEL-76320