From 3133d9d9f2ba7071103779f8571094b1497d8141 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu, 10 Oct 2013 17:40:06 +0200
Subject: [PATCH 1/2] rhel: Add info on 6.5 and 7.0

Also fix RHEL 5.8 data.
---
 data/oses/rhel.xml.in | 112 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 2 deletions(-)

diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 6985404..d1942b7 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -638,8 +638,8 @@
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.8"/>
-    <derives-from id="http://redhat.com/rhel/5.8"/>
+    <upgrades id="http://redhat.com/rhel/5.7"/>
+    <derives-from id="http://redhat.com/rhel/5.7"/>
 
     <release-date>2012-02-21</release-date>
     <eol-date>2020-03-31</eol-date>
@@ -914,4 +914,112 @@
       <script id='http://redhat.com/scripts/rhel/desktop'/>
     </installer>
   </os>
+
+  <os id="http://redhat.com/rhel/6.5">
+    <short-id>rhel6.5</short-id>
+    <_name>Red Hat Enterprise Linux 6.5</_name>
+    <version>6.5</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.4"/>
+    <derives-from id="http://redhat.com/rhel/6.4"/>
+
+    <release-date>2013-11-21</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.5 i386.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.5 x86_64.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+
+  <!-- If you add a new 6.x entry here, please don't forget to update the
+       'upgrades' node under 'rhel7.0' entry below. -->
+
+  <os id="http://redhat.com/rhel/7.0">
+    <short-id>rhel7.0</short-id>
+    <_name>Red Hat Enterprise Linux 7.0</_name>
+    <version>7.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <upgrades id="http://redhat.com/rhel/6.5"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+    </devices>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL-7.0.*i386.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL-7.0.*x86_64.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
 </libosinfo>
-- 
1.8.4.2