You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
270 lines
7.6 KiB
270 lines
7.6 KiB
From bcce4c7bd04a9ebf0aec0e83b7137972c4bc4dec Mon Sep 17 00:00:00 2001 |
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com> |
|
Date: Mon, 12 Aug 2019 14:42:48 +0200 |
|
Subject: [PATCH] rhel-7.8: Add entry |
|
MIME-Version: 1.0 |
|
Content-Type: text/plain; charset=UTF-8 |
|
Content-Transfer-Encoding: 8bit |
|
|
|
Together with this change, also update the rhel-7-unknown entry to match |
|
7.9+. |
|
|
|
Signed-off-by: Fabiano FidĂȘncio <fidencio@redhat.com> |
|
--- |
|
os/redhat.com/rhel-7-unknown.xml | 22 ++--- |
|
os/redhat.com/rhel-7.8.xml | 154 +++++++++++++++++++++++++++++++ |
|
2 files changed, 165 insertions(+), 11 deletions(-) |
|
create mode 100644 os/redhat.com/rhel-7.8.xml |
|
|
|
diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml |
|
index 5da2bec..189994a 100644 |
|
--- a/os/redhat.com/rhel-7-unknown.xml |
|
+++ b/os/redhat.com/rhel-7-unknown.xml |
|
@@ -19,13 +19,13 @@ |
|
<family>linux</family> |
|
<distro>rhel</distro> |
|
<codename>Maipo</codename> |
|
- <upgrades id="http://redhat.com/rhel/7.7"/> |
|
- <derives-from id="http://redhat.com/rhel/7.7"/> |
|
+ <upgrades id="http://redhat.com/rhel/7.8"/> |
|
+ <derives-from id="http://redhat.com/rhel/7.8"/> |
|
|
|
<media arch="x86_64"> |
|
<iso> |
|
<system-id>LINUX</system-id> |
|
- <volume-id>.*RHEL-7.([89]|[1-9][0-9]).*x86_64.*</volume-id> |
|
+ <volume-id>.*RHEL-7.(9|[1-9][0-9]).*x86_64.*</volume-id> |
|
</iso> |
|
<kernel>isolinux/vmlinuz</kernel> |
|
<initrd>isolinux/initrd.img</initrd> |
|
@@ -34,35 +34,35 @@ |
|
<media arch="aarch64"> |
|
<iso> |
|
<system-id>LINUX</system-id> |
|
- <volume-id>RHEL-7.([89]|[1-9][0-9]).*aarch64$</volume-id> |
|
+ <volume-id>RHEL-7.(9|[1-9][0-9]).*aarch64$</volume-id> |
|
</iso> |
|
</media> |
|
|
|
<media arch="ppc64"> |
|
<iso> |
|
<system-id>PPC</system-id> |
|
- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64$</volume-id> |
|
+ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64$</volume-id> |
|
</iso> |
|
</media> |
|
|
|
<media arch="ppc64le"> |
|
<iso> |
|
<system-id>PPC</system-id> |
|
- <volume-id>RHEL[-_]7.([89]|[1-9][0-9]).*ppc64le$</volume-id> |
|
+ <volume-id>RHEL[-_]7.(9|[1-9][0-9]).*ppc64le$</volume-id> |
|
</iso> |
|
</media> |
|
|
|
<media arch="s390x"> |
|
<iso> |
|
<system-id>LINUX</system-id> |
|
- <volume-id>RHEL-7.([89]|[1-9][0-9]).*s390x$</volume-id> |
|
+ <volume-id>RHEL-7.(9|[1-9][0-9]).*s390x$</volume-id> |
|
</iso> |
|
</media> |
|
|
|
<tree arch="ppc64"> |
|
<treeinfo> |
|
<family>Red Hat Enterprise Linux</family> |
|
- <version>^7.([89]|[1-9][0-9])$</version> |
|
+ <version>^7.(9|[1-9][0-9])$</version> |
|
<arch>ppc64</arch> |
|
</treeinfo> |
|
</tree> |
|
@@ -70,7 +70,7 @@ |
|
<tree arch="ppc64le"> |
|
<treeinfo> |
|
<family>Red Hat Enterprise Linux</family> |
|
- <version>^7.([89]|[1-9][0-9])$</version> |
|
+ <version>^7.(9|[1-9][0-9])$</version> |
|
<arch>ppc64le</arch> |
|
</treeinfo> |
|
</tree> |
|
@@ -78,7 +78,7 @@ |
|
<tree arch="s390x"> |
|
<treeinfo> |
|
<family>Red Hat Enterprise Linux</family> |
|
- <version>^7.([89]|[1-9][0-9])$</version> |
|
+ <version>^7.(9|[1-9][0-9])$</version> |
|
<arch>s390x</arch> |
|
</treeinfo> |
|
</tree> |
|
@@ -86,7 +86,7 @@ |
|
<tree arch="x86_64"> |
|
<treeinfo> |
|
<family>Red Hat Enterprise Linux</family> |
|
- <version>^7.([89]|[1-9][0-9])$</version> |
|
+ <version>^7.(9|[1-9][0-9])$</version> |
|
<arch>x86_64</arch> |
|
</treeinfo> |
|
</tree> |
|
diff --git a/os/redhat.com/rhel-7.8.xml b/os/redhat.com/rhel-7.8.xml |
|
new file mode 100644 |
|
index 0000000..e75ddee |
|
--- /dev/null |
|
+++ b/os/redhat.com/rhel-7.8.xml |
|
@@ -0,0 +1,154 @@ |
|
+<?xml version="1.0" encoding="UTF-8"?> |
|
+<libosinfo version="0.0.1"> |
|
+ |
|
+ <os id="http://redhat.com/rhel/7.8"> |
|
+ <short-id>rhel7.8</short-id> |
|
+ <name>Red Hat Enterprise Linux 7.8</name> |
|
+ <version>7.8</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>Maipo</codename> |
|
+ <upgrades id="http://redhat.com/rhel/7.7"/> |
|
+ <derives-from id="http://redhat.com/rhel/7.7"/> |
|
+ |
|
+ <release-date>2019-08-06</release-date> |
|
+ |
|
+ <media arch="x86_64"> |
|
+ <iso> |
|
+ <system-id>LINUX</system-id> |
|
+ <volume-id>.*RHEL-7.8.*x86_64.*</volume-id> |
|
+ </iso> |
|
+ <kernel>isolinux/vmlinuz</kernel> |
|
+ <initrd>isolinux/initrd.img</initrd> |
|
+ </media> |
|
+ |
|
+ <media arch="aarch64"> |
|
+ <iso> |
|
+ <system-id>LINUX</system-id> |
|
+ <volume-id>RHEL-7.8.*aarch64$</volume-id> |
|
+ </iso> |
|
+ </media> |
|
+ |
|
+ <media arch="ppc64"> |
|
+ <iso> |
|
+ <system-id>PPC</system-id> |
|
+ <volume-id>RHEL[-_]7.8.*ppc64$</volume-id> |
|
+ </iso> |
|
+ </media> |
|
+ |
|
+ <media arch="ppc64le"> |
|
+ <iso> |
|
+ <system-id>PPC</system-id> |
|
+ <volume-id>RHEL[-_]7.8.*ppc64le$</volume-id> |
|
+ </iso> |
|
+ </media> |
|
+ |
|
+ <media arch="s390x"> |
|
+ <iso> |
|
+ <system-id>LINUX</system-id> |
|
+ <volume-id>RHEL-7.8.*s390x$</volume-id> |
|
+ </iso> |
|
+ </media> |
|
+ |
|
+ <tree arch="ppc64"> |
|
+ <treeinfo> |
|
+ <family>Red Hat Enterprise Linux$</family> |
|
+ <version>^7.8$</version> |
|
+ <arch>ppc64$</arch> |
|
+ </treeinfo> |
|
+ </tree> |
|
+ |
|
+ <tree arch="ppc64le"> |
|
+ <treeinfo> |
|
+ <family>Red Hat Enterprise Linux$</family> |
|
+ <version>^7.8$</version> |
|
+ <arch>ppc64le</arch> |
|
+ </treeinfo> |
|
+ </tree> |
|
+ |
|
+ <tree arch="s390x"> |
|
+ <treeinfo> |
|
+ <family>Red Hat Enterprise Linux$</family> |
|
+ <version>^7.8$</version> |
|
+ <arch>s390x</arch> |
|
+ </treeinfo> |
|
+ </tree> |
|
+ |
|
+ <tree arch="x86_64"> |
|
+ <treeinfo> |
|
+ <family>Red Hat Enterprise Linux$</family> |
|
+ <version>^7.8$</version> |
|
+ <arch>x86_64</arch> |
|
+ </treeinfo> |
|
+ </tree> |
|
+ |
|
+ <resources arch="ppc64"> |
|
+ <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="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>1073741824</ram> |
|
+ <storage>10737418240</storage> |
|
+ </minimum> |
|
+ |
|
+ <recommended> |
|
+ <cpu>1000000000</cpu> |
|
+ <ram>1073741824</ram> |
|
+ <storage>10737418240</storage> |
|
+ </recommended> |
|
+ |
|
+ <maximum> |
|
+ <ram>13194139533312</ram> |
|
+ </maximum> |
|
+ |
|
+ <network-install> |
|
+ <ram>1610612736</ram> |
|
+ </network-install> |
|
+ </resources> |
|
+ |
|
+ <installer> |
|
+ <script id='http://redhat.com/rhel/kickstart/jeos'/> |
|
+ <script id='http://redhat.com/rhel/kickstart/desktop'/> |
|
+ </installer> |
|
+ </os> |
|
+</libosinfo> |
|
-- |
|
2.21.0 |
|
|
|
|