260 lines
7.4 KiB
Diff
260 lines
7.4 KiB
Diff
From ffcda8a251b7dd6dec51359f403da0757c2a857c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
Date: Thu, 23 May 2019 10:41:22 +0200
|
|
Subject: [PATCH 2/2] rhel: Add rhel-7.7
|
|
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-7-unknown.xml | 24 +++---
|
|
os/redhat.com/rhel-7.7.xml | 139 +++++++++++++++++++++++++++++++
|
|
2 files changed, 151 insertions(+), 12 deletions(-)
|
|
create mode 100644 os/redhat.com/rhel-7.7.xml
|
|
|
|
diff --git a/os/redhat.com/rhel-7-unknown.xml b/os/redhat.com/rhel-7-unknown.xml
|
|
index 1477a1a..7256b09 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.6"/>
|
|
- <derives-from id="http://redhat.com/rhel/7.6"/>
|
|
+ <upgrades id="http://redhat.com/rhel/7.7"/>
|
|
+ <derives-from id="http://redhat.com/rhel/7.7"/>
|
|
|
|
<media arch="x86_64">
|
|
<iso>
|
|
<system-id>LINUX</system-id>
|
|
- <volume-id>.*RHEL-7.([7-9]|[1-9][0-9]).*x86_64.*</volume-id>
|
|
+ <volume-id>.*RHEL-7.([8-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.([7-9]|[1-9][0-9]).*aarch64$</volume-id>
|
|
+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*aarch64$</volume-id>
|
|
</iso>
|
|
</media>
|
|
|
|
<media arch="ppc64">
|
|
<iso>
|
|
<system-id>PPC</system-id>
|
|
- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64$</volume-id>
|
|
+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64$</volume-id>
|
|
</iso>
|
|
</media>
|
|
|
|
<media arch="ppc64le">
|
|
<iso>
|
|
<system-id>PPC</system-id>
|
|
- <volume-id>RHEL[-_]7.([7-9]|[1-9][0-9]).*ppc64le$</volume-id>
|
|
+ <volume-id>RHEL[-_]7.([8-9]|[1-9][0-9]).*ppc64le$</volume-id>
|
|
</iso>
|
|
</media>
|
|
|
|
<media arch="s390x">
|
|
<iso>
|
|
<system-id>LINUX</system-id>
|
|
- <volume-id>RHEL-7.([7-9]|[1-9][0-9]).*s390x$</volume-id>
|
|
+ <volume-id>RHEL-7.([8-9]|[1-9][0-9]).*s390x$</volume-id>
|
|
</iso>
|
|
</media>
|
|
|
|
<tree arch="ppc64">
|
|
<treeinfo>
|
|
<family>Red Hat Enterprise Linux</family>
|
|
- <version>^7.([7-9]|[1-9][0-9])$</version>
|
|
+ <version>^7.([8-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.([7-9]|[1-9][0-9])$</version>
|
|
+ <version>^7.([8-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.([7-9]|[1-9][0-9])$</version>
|
|
+ <version>^7.([8-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.([7-9]|[1-9][0-9])$</version>
|
|
+ <version>^7.([8-9]|[1-9][0-9])$</version>
|
|
<arch>x86_64</arch>
|
|
</treeinfo>
|
|
</tree>
|
|
@@ -134,4 +134,4 @@
|
|
<script id='http://redhat.com/rhel/kickstart/desktop'/>
|
|
</installer>
|
|
</os>
|
|
-</libosinfo>
|
|
\ No newline at end of file
|
|
+</libosinfo>
|
|
diff --git a/os/redhat.com/rhel-7.7.xml b/os/redhat.com/rhel-7.7.xml
|
|
new file mode 100644
|
|
index 0000000..c140542
|
|
--- /dev/null
|
|
+++ b/os/redhat.com/rhel-7.7.xml
|
|
@@ -0,0 +1,139 @@
|
|
+<?xml version="1.0" encoding="UTF-8"?>
|
|
+<libosinfo version="0.0.1">
|
|
+
|
|
+ <os id="http://redhat.com/rhel/7.7">
|
|
+ <short-id>rhel7.7</short-id>
|
|
+ <name>Red Hat Enterprise Linux 7.7</name>
|
|
+ <version>7.7</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.6"/>
|
|
+ <derives-from id="http://redhat.com/rhel/7.6"/>
|
|
+
|
|
+ <release-date>2018-10-30</release-date>
|
|
+
|
|
+ <media arch="x86_64">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>.*RHEL-7.7.*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.7.*aarch64$</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <media arch="ppc64">
|
|
+ <iso>
|
|
+ <system-id>PPC</system-id>
|
|
+ <volume-id>RHEL[-_]7.7.*ppc64$</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <media arch="ppc64le">
|
|
+ <iso>
|
|
+ <system-id>PPC</system-id>
|
|
+ <volume-id>RHEL[-_]7.7.*ppc64le$</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <media arch="s390x">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL-7.7.*s390x$</volume-id>
|
|
+ </iso>
|
|
+ </media>
|
|
+
|
|
+ <tree arch="ppc64">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^7.7$</version>
|
|
+ <arch>ppc64</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="ppc64le">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^7.7$</version>
|
|
+ <arch>ppc64le</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="s390x">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^7.7$</version>
|
|
+ <arch>s390x</arch>
|
|
+ </treeinfo>
|
|
+ </tree>
|
|
+
|
|
+ <tree arch="x86_64">
|
|
+ <treeinfo>
|
|
+ <family>Red Hat Enterprise Linux</family>
|
|
+ <version>^7.7$</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="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
|
|
|