|
 |
fef13e |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
fef13e |
Date: Tue, 2 Dec 2014 11:22:06 -0500
|
|
|
fef13e |
Subject: [PATCH libosinfo] oses: Detect RHEL Server for AArch64 as RHEL 7.0
|
|
|
fef13e |
|
|
|
fef13e |
RHELSA will be it's own release for a short while, but long term it's
|
|
|
fef13e |
expected to just be another RHEL architecture. So piggyback on the rhel7.0
|
|
|
fef13e |
entry for now. If needed we can add a toplevel rhelsa entry later.
|
|
|
fef13e |
---
|
|
|
fef13e |
data/oses/rhel.xml.in | 9 +++++++
|
|
|
fef13e |
data/schemas/libosinfo.rng | 1 +
|
|
|
fef13e |
...ELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt | 29 ++++++++++++++++++++++
|
|
|
fef13e |
3 files changed, 39 insertions(+)
|
|
|
fef13e |
create mode 100644 test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
|
|
|
fef13e |
|
|
|
fef13e |
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
|
|
|
fef13e |
index 791d470..23cc0f2 100644
|
|
|
fef13e |
--- a/data/oses/rhel.xml.in
|
|
|
fef13e |
+++ b/data/oses/rhel.xml.in
|
|
|
fef13e |
@@ -1135,6 +1135,15 @@
|
|
|
fef13e |
<initrd>isolinux/initrd.img</initrd>
|
|
|
fef13e |
</media>
|
|
|
fef13e |
|
|
|
fef13e |
+ <media arch="aarch64">
|
|
|
fef13e |
+ <iso>
|
|
|
fef13e |
+ <system-id>LINUX</system-id>
|
|
|
fef13e |
+ <volume-id>RHELSA-.* Server\.aarch64</volume-id>
|
|
|
fef13e |
+ </iso>
|
|
|
fef13e |
+ <kernel>isolinux/vmlinuz</kernel>
|
|
|
fef13e |
+ <initrd>isolinux/initrd.img</initrd>
|
|
|
fef13e |
+ </media>
|
|
|
fef13e |
+
|
|
|
fef13e |
<resources arch="ppc64">
|
|
|
fef13e |
<minimum>
|
|
|
fef13e |
<n-cpus>1</n-cpus>
|
|
|
fef13e |
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
|
|
|
fef13e |
index 1580d9a..f8ca4d4 100644
|
|
|
fef13e |
--- a/data/schemas/libosinfo.rng
|
|
|
fef13e |
+++ b/data/schemas/libosinfo.rng
|
|
|
fef13e |
@@ -695,6 +695,7 @@
|
|
|
fef13e |
</define>
|
|
|
fef13e |
<define name='archnames'>
|
|
|
fef13e |
<choice>
|
|
|
fef13e |
+ <value>aarch64</value>
|
|
|
fef13e |
<value>alpha</value>
|
|
|
fef13e |
<value>armv7l</value>
|
|
|
fef13e |
<value>cris</value>
|
|
|
fef13e |
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
|
|
|
fef13e |
new file mode 100644
|
|
|
fef13e |
index 0000000..6f017e9
|
|
|
fef13e |
--- /dev/null
|
|
|
fef13e |
+++ b/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
|
|
|
fef13e |
@@ -0,0 +1,29 @@
|
|
|
fef13e |
+CD-ROM is in ISO 9660 format
|
|
|
fef13e |
+System id: LINUX
|
|
|
fef13e |
+Volume id: RHELSA-1.5 Server.aarch64
|
|
|
fef13e |
+Volume set id:
|
|
|
fef13e |
+Publisher id:
|
|
|
fef13e |
+Data preparer id:
|
|
|
fef13e |
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
|
|
|
fef13e |
+Copyright File id:
|
|
|
fef13e |
+Abstract File id:
|
|
|
fef13e |
+Bibliographic File id:
|
|
|
fef13e |
+Volume set size is: 1
|
|
|
fef13e |
+Volume set sequence number is: 1
|
|
|
fef13e |
+Logical block size is: 2048
|
|
|
fef13e |
+Volume size is: 1417692
|
|
|
fef13e |
+El Torito VD version 1 found, boot catalog is in sector 523
|
|
|
fef13e |
+Joliet with UCS level 3 found
|
|
|
fef13e |
+Rock Ridge signatures version 1 found
|
|
|
fef13e |
+Eltorito validation header:
|
|
|
fef13e |
+ Hid 1
|
|
|
fef13e |
+ Arch 239 (Unknown Arch)
|
|
|
fef13e |
+ ID ''
|
|
|
fef13e |
+ Key 55 AA
|
|
|
fef13e |
+ Eltorito defaultboot header:
|
|
|
fef13e |
+ Bootid 88 (bootable)
|
|
|
fef13e |
+ Boot media 0 (No Emulation Boot)
|
|
|
fef13e |
+ Load segment 0
|
|
|
fef13e |
+ Sys type 0
|
|
|
fef13e |
+ Nsect 29E8
|
|
|
fef13e |
+ Bootoff 1DED2 122578
|