From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 2 Dec 2014 11:22:06 -0500
Subject: [PATCH libosinfo] oses: Detect RHEL Server for AArch64 as RHEL 7.0

RHELSA will be it's own release for a short while, but long term it's
expected to just be another RHEL architecture. So piggyback on the rhel7.0
entry for now. If needed we can add a toplevel rhelsa entry later.
---
 data/oses/rhel.xml.in                              |  9 +++++++
 data/schemas/libosinfo.rng                         |  1 +
 ...ELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt | 29 ++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt

diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 791d470..23cc0f2 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -1135,6 +1135,15 @@
       <initrd>isolinux/initrd.img</initrd>
     </media>
 
+    <media arch="aarch64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHELSA-.* Server\.aarch64</volume-id>
+      </iso>
+       <kernel>isolinux/vmlinuz</kernel>
+       <initrd>isolinux/initrd.img</initrd>
+     </media>
+
     <resources arch="ppc64">
       <minimum>
         <n-cpus>1</n-cpus>
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 1580d9a..f8ca4d4 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -695,6 +695,7 @@
   </define>
   <define name='archnames'>
     <choice>
+      <value>aarch64</value>
       <value>alpha</value>
       <value>armv7l</value>
       <value>cris</value>
diff --git a/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt b/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
new file mode 100644
index 0000000..6f017e9
--- /dev/null
+++ b/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHELSA-1.5 Server.aarch64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1417692
+El Torito VD version 1 found, boot catalog is in sector 523
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 239 (Unknown Arch)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 29E8
+        Bootoff 1DED2 122578