155 lines
5.1 KiB
Diff
155 lines
5.1 KiB
Diff
|
From e7a1af1fd70ceaa4b013ea6186a5c3ca7a47e3e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
||
|
|
Date: Wed, 29 May 2019 07:54:04 +0200
|
||
|
|
Subject: [PATCH] rhel-8.0: Update entry to also match 8.0.x
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
||
|
|
---
|
||
|
|
os/redhat.com/rhel-8.0.xml | 94 +++++++++++++++++++++++++++++++++++---
|
||
|
|
1 file changed, 88 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml
|
||
|
|
index a0faf1b..37033c0 100644
|
||
|
|
--- a/os/redhat.com/rhel-8.0.xml
|
||
|
|
+++ b/os/redhat.com/rhel-8.0.xml
|
||
|
|
@@ -11,19 +11,46 @@
|
||
|
|
<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>
|
||
|
|
- <upgrades id="http://redhat.com/rhel/7.5"/>
|
||
|
|
- <derives-from id="http://redhat.com/rhel/7.5"/>
|
||
|
|
+ <codename>Ootpa</codename>
|
||
|
|
+ <upgrades id="http://redhat.com/rhel/7.6"/>
|
||
|
|
+
|
||
|
|
+ <release-date>2018-05-07</release-date>
|
||
|
|
+
|
||
|
|
+ <devices>
|
||
|
|
+ <device id="http://pcisig.com/pci/1b36/0100"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/8086/2415"/>
|
||
|
|
+ <device id="http://usb.org/usb/80ee/0021"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/8086/2668"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1001"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1000"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1003"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1005"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1033/0194"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1b36/0004"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1041"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1042"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1043"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1044"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1045"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1048"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1049"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/1af4/1052"/>
|
||
|
|
+ <device id="http://qemu.org/chipset/x86/q35"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/8086/10d3"/>
|
||
|
|
+ <device id="http://pcisig.com/pci/8086/293e"/>
|
||
|
|
+ </devices>
|
||
|
|
|
||
|
|
<media arch="x86_64">
|
||
|
|
<iso>
|
||
|
|
<system-id>LINUX</system-id>
|
||
|
|
- <volume-id>RHEL-8-0-BaseOS-x86_64</volume-id>
|
||
|
|
+ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
|
||
|
|
</iso>
|
||
|
|
<kernel>isolinux/vmlinuz</kernel>
|
||
|
|
<initrd>isolinux/initrd.img</initrd>
|
||
|
|
@@ -32,7 +59,7 @@
|
||
|
|
<media arch="ppc64le">
|
||
|
|
<iso>
|
||
|
|
<system-id>PPC</system-id>
|
||
|
|
- <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id>
|
||
|
|
+ <volume-id>RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
|
||
|
|
</iso>
|
||
|
|
<kernel>ppc/ppc64/vmlinuz</kernel>
|
||
|
|
<initrd>ppc/ppc64/initrd.img</initrd>
|
||
|
|
@@ -41,17 +68,72 @@
|
||
|
|
<media arch="aarch64">
|
||
|
|
<iso>
|
||
|
|
<system-id>LINUX</system-id>
|
||
|
|
- <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id>
|
||
|
|
+ <volume-id>RHEL-8-0-(([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-0-BaseOS-s390x</volume-id>
|
||
|
|
+ <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
|
||
|
|
</iso>
|
||
|
|
</media>
|
||
|
|
|
||
|
|
+ <tree arch="aarch64">
|
||
|
|
+ <treeinfo>
|
||
|
|
+ <family>Red Hat Enterprise Linux</family>
|
||
|
|
+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
|
||
|
|
+ <arch>aarch64</arch>
|
||
|
|
+ </treeinfo>
|
||
|
|
+ </tree>
|
||
|
|
+
|
||
|
|
+ <tree arch="ppc64le">
|
||
|
|
+ <treeinfo>
|
||
|
|
+ <family>Red Hat Enterprise Linux</family>
|
||
|
|
+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
|
||
|
|
+ <arch>ppc64le</arch>
|
||
|
|
+ </treeinfo>
|
||
|
|
+ </tree>
|
||
|
|
+
|
||
|
|
+ <tree arch="s390x">
|
||
|
|
+ <treeinfo>
|
||
|
|
+ <family>Red Hat Enterprise Linux</family>
|
||
|
|
+ <version>^8.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>^8.0(.([0-9]|[1-9][0-9]))?$</version>
|
||
|
|
+ <arch>x86_64</arch>
|
||
|
|
+ </treeinfo>
|
||
|
|
+ </tree>
|
||
|
|
+
|
||
|
|
+ <tree arch="aarch64">
|
||
|
|
+ <treeinfo>
|
||
|
|
+ <family>Red Hat Enterprise Linux</family>
|
||
|
|
+ <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
|
||
|
|
+ <arch>aarch64</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>
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|