238 lines
7.3 KiB
Diff
238 lines
7.3 KiB
Diff
From ea3d294c14e8d43fbe24afe5c59d11f52a96e8ec Mon Sep 17 00:00:00 2001
|
|
From: rpm-build <rpm-build>
|
|
Date: Tue, 10 Dec 2019 10:13:28 +0100
|
|
Subject: [PATCH] rhel: Add 8.2 entry
|
|
|
|
Signed-off-by: rpm-build <rpm-build>
|
|
---
|
|
os/redhat.com/rhel-8-unknown.xml | 20 ++---
|
|
os/redhat.com/rhel-8.2.xml | 134 +++++++++++++++++++++++++++++++
|
|
2 files changed, 144 insertions(+), 10 deletions(-)
|
|
create mode 100644 os/redhat.com/rhel-8.2.xml
|
|
|
|
diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
|
|
index 1480185..82cfb4a 100644
|
|
--- a/os/redhat.com/rhel-8-unknown.xml
|
|
+++ b/os/redhat.com/rhel-8-unknown.xml
|
|
@@ -19,13 +19,13 @@
|
|
<family>linux</family>
|
|
<distro>rhel</distro>
|
|
<codename>Ootpa</codename>
|
|
- <upgrades id="http://redhat.com/rhel/8.1"/>
|
|
- <derives-from id="http://redhat.com/rhel/8.1"/>
|
|
+ <upgrades id="http://redhat.com/rhel/8.2"/>
|
|
+ <derives-from id="http://redhat.com/rhel/8.2"/>
|
|
|
|
<media arch="x86_64">
|
|
<iso>
|
|
<system-id>LINUX</system-id>
|
|
- <volume-id>.*RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
|
|
+ <volume-id>.*RHEL-8-([3-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>
|
|
@@ -34,28 +34,28 @@
|
|
<media arch="aarch64">
|
|
<iso>
|
|
<system-id>LINUX</system-id>
|
|
- <volume-id>RHEL-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
|
|
+ <volume-id>RHEL-8-([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
|
|
</iso>
|
|
</media>
|
|
|
|
<media arch="ppc64le">
|
|
<iso>
|
|
<system-id>PPC</system-id>
|
|
- <volume-id>RHEL[_-]8[_-]([2-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
|
|
+ <volume-id>RHEL[_-]8[_-]([3-9]|[1-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-8-([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
|
|
+ <volume-id>RHEL-8-([3-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>^8.([2-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
|
|
+ <version>^8.([3-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
|
|
<arch>aarch64</arch>
|
|
</treeinfo>
|
|
</tree>
|
|
@@ -63,7 +63,7 @@
|
|
<tree arch="ppc64le">
|
|
<treeinfo>
|
|
<family>Red Hat Enterprise Linux</family>
|
|
- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
|
|
<arch>ppc64le</arch>
|
|
</treeinfo>
|
|
</tree>
|
|
@@ -71,7 +71,7 @@
|
|
<tree arch="s390x">
|
|
<treeinfo>
|
|
<family>Red Hat Enterprise Linux</family>
|
|
- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <version>^8.([3-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
|
|
<arch>s390x</arch>
|
|
</treeinfo>
|
|
</tree>
|
|
@@ -79,7 +79,7 @@
|
|
<tree arch="x86_64">
|
|
<treeinfo>
|
|
<family>Red Hat Enterprise Linux</family>
|
|
- <version>^8.([2-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <version>^8.([3-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-8.2.xml b/os/redhat.com/rhel-8.2.xml
|
|
new file mode 100644
|
|
index 0000000..cfc9599
|
|
--- /dev/null
|
|
+++ b/os/redhat.com/rhel-8.2.xml
|
|
@@ -0,0 +1,134 @@
|
|
+<?xml version="1.0" encoding="UTF-8"?>
|
|
+<libosinfo version="0.0.1">
|
|
+
|
|
+ <os id="http://redhat.com/rhel/8.2">
|
|
+ <short-id>rhel8.2</short-id>
|
|
+ <name>Red Hat Enterprise Linux 8.2</name>
|
|
+ <version>8.2</version>
|
|
+ <vendor>Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="ca">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="de">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="es">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="fr">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="id">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="it">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="ja">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="pl">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="pt_BR">Red Hat, Inc</vendor>
|
|
+ <vendor xml:lang="uk">Red Hat, Inc</vendor>
|
|
+ <family>linux</family>
|
|
+ <distro>rhel</distro>
|
|
+ <codename>Ootpa</codename>
|
|
+ <upgrades id="http://redhat.com/rhel/8.1"/>
|
|
+ <derives-from id="http://redhat.com/rhel/8.1"/>
|
|
+
|
|
+ <release-date>2020-04-28</release-date>
|
|
+
|
|
+ <media arch="x86_64">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL-8-2-(([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>
|
|
+ <system-id>PPC</system-id>
|
|
+ <volume-id>RHEL[_-]8[_-]2[_-](([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>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <media arch="s390x">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL-8-2-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <tree arch="aarch64">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <arch>aarch64</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="ppc64le">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <arch>ppc64le</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="s390x">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^8.2(.([0-9]|[1-9][0-9]))?$</version>
|
|
+ <arch>s390x</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="x86_64">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^8.2(.([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>
|
|
+ </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>
|
|
+
|
|
+ <maximum>
|
|
+ <ram>26388279066624</ram>
|
|
+ </maximum>
|
|
+
|
|
+ <network-install>
|
|
+ <ram>3221225472</ram>
|
|
+ </network-install>
|
|
+ </resources>
|
|
+
|
|
+ <installer>
|
|
+ <script id='http://redhat.com/rhel/kickstart/jeos'/>
|
|
+ <script id='http://redhat.com/rhel/kickstart/desktop'/>
|
|
+ </installer>
|
|
+ </os>
|
|
+</libosinfo>
|
|
\ No newline at end of file
|
|
--
|
|
2.23.0
|
|
|