Add support for sle12sp1 and other upstream patches. OBS-URL: https://build.opensuse.org/request/show/317805 OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=37
302 lines
9.3 KiB
Diff
302 lines
9.3 KiB
Diff
Subject: rhel: Add data about RHEL 7.1
|
|
From: Zeeshan Ali (Khattak) zeeshanak@gnome.org Tue Jul 7 21:05:32 2015 +0100
|
|
Date: Thu Jul 9 14:47:02 2015 +0100:
|
|
Git: 6c3ddecb5e9167c6eff182ac62358c9e96c47d36
|
|
|
|
|
|
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
|
|
index 23cc0f2..2f0d4e8 100644
|
|
--- a/data/oses/rhel.xml.in
|
|
+++ b/data/oses/rhel.xml.in
|
|
@@ -1221,4 +1221,115 @@
|
|
</recommended>
|
|
</resources>
|
|
</os>
|
|
+
|
|
+ <os id="http://redhat.com/rhel/7.1">
|
|
+ <short-id>rhel7.1</short-id>
|
|
+ <_name>Red Hat Enterprise Linux 7.1</_name>
|
|
+ <version>7.1</version>
|
|
+ <_vendor>Red Hat, Inc</_vendor>
|
|
+ <family>linux</family>
|
|
+ <distro>rhel</distro>
|
|
+ <upgrades id="http://redhat.com/rhel/7.0"/>
|
|
+ <derives-from id="http://redhat.com/rhel/7.0"/>
|
|
+
|
|
+ <media arch="i686">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>.*RHEL-7.1.*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.1.*x86_64.*</volume-id>
|
|
+ </iso>
|
|
+ <kernel>isolinux/vmlinuz</kernel>
|
|
+ <initrd>isolinux/initrd.img</initrd>
|
|
+ </media>
|
|
+
|
|
+ <resources arch="ppc64">
|
|
+ <minimum>
|
|
+ <n-cpus>1</n-cpus>
|
|
+ <cpu>1000000000</cpu>
|
|
+ <ram>2147483648</ram>
|
|
+ <storage>10737418240</storage>
|
|
+ </minimum>
|
|
+
|
|
+ <recommended>
|
|
+ <cpu>400000000</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>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>
|
|
+
|
|
+ <os id="http://redhat.com/rhel-atomic/7.1">
|
|
+ <short-id>rhel-atomic-7.1</short-id>
|
|
+ <_name>Red Hat Enterprise Linux Atomic Host 7.1</_name>
|
|
+ <version>7.1</version>
|
|
+ <_vendor>Red Hat, Inc</_vendor>
|
|
+ <family>linux</family>
|
|
+ <distro>rhel</distro>
|
|
+ <upgrades id="http://redhat.com/rhel-atomic/7.0"/>
|
|
+ <derives-from id="http://redhat.com/rhel-atomic/7.0"/>
|
|
+
|
|
+ <!-- 7.1-0 -->
|
|
+ <media arch="x86_64">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id>
|
|
+ <volume-size>652435456</volume-size>
|
|
+ </iso>
|
|
+ <kernel>isolinux/vmlinuz</kernel>
|
|
+ <initrd>isolinux/initrd.img</initrd>
|
|
+ </media>
|
|
+
|
|
+ <!-- 7.1-1 -->
|
|
+ <media arch="x86_64">
|
|
+ <iso>
|
|
+ <system-id>LINUX</system-id>
|
|
+ <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id>
|
|
+ <volume-size>654243840</volume-size>
|
|
+ </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>
|
|
+ </os>
|
|
</libosinfo>
|
|
diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
|
|
new file mode 100644
|
|
index 0000000..10fb7ce
|
|
--- /dev/null
|
|
+++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: RHEL Atomic Host 7 x86_64
|
|
+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: 318572
|
|
+El Torito VD version 1 found, boot catalog is in sector 46
|
|
+Joliet with UCS level 3 found
|
|
+Rock Ridge signatures version 1 found
|
|
+Eltorito validation header:
|
|
+ Hid 1
|
|
+ Arch 0 (x86)
|
|
+ ID ''
|
|
+ Key 55 AA
|
|
+ Eltorito defaultboot header:
|
|
+ Bootid 88 (bootable)
|
|
+ Boot media 0 (No Emulation Boot)
|
|
+ Load segment 0
|
|
+ Sys type 0
|
|
+ Nsect 4
|
|
+ Bootoff 456D 17773
|
|
diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
|
|
new file mode 100644
|
|
index 0000000..f6569fa
|
|
--- /dev/null
|
|
+++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: RHEL Atomic Host 7 x86_64
|
|
+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: 319455
|
|
+El Torito VD version 1 found, boot catalog is in sector 46
|
|
+Joliet with UCS level 3 found
|
|
+Rock Ridge signatures version 1 found
|
|
+Eltorito validation header:
|
|
+ Hid 1
|
|
+ Arch 0 (x86)
|
|
+ ID ''
|
|
+ Key 55 AA
|
|
+ Eltorito defaultboot header:
|
|
+ Bootid 88 (bootable)
|
|
+ Boot media 0 (No Emulation Boot)
|
|
+ Load segment 0
|
|
+ Sys type 0
|
|
+ Nsect 4
|
|
+ Bootoff 458B 17803
|
|
diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
|
|
new file mode 100644
|
|
index 0000000..92b8597
|
|
--- /dev/null
|
|
+++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: RHEL-7.1 Client.x86_64
|
|
+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: 1870122
|
|
+El Torito VD version 1 found, boot catalog is in sector 986
|
|
+Joliet with UCS level 3 found
|
|
+Rock Ridge signatures version 1 found
|
|
+Eltorito validation header:
|
|
+ Hid 1
|
|
+ Arch 0 (x86)
|
|
+ ID ''
|
|
+ Key 55 AA
|
|
+ Eltorito defaultboot header:
|
|
+ Bootid 88 (bootable)
|
|
+ Boot media 0 (No Emulation Boot)
|
|
+ Load segment 0
|
|
+ Sys type 0
|
|
+ Nsect 4
|
|
+ Bootoff 2AE29 175657
|
|
diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
|
|
new file mode 100644
|
|
index 0000000..8aba100
|
|
--- /dev/null
|
|
+++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: RHEL-7.1 Server.x86_64
|
|
+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: 1899146
|
|
+El Torito VD version 1 found, boot catalog is in sector 1102
|
|
+Joliet with UCS level 3 found
|
|
+Rock Ridge signatures version 1 found
|
|
+Eltorito validation header:
|
|
+ Hid 1
|
|
+ Arch 0 (x86)
|
|
+ ID ''
|
|
+ Key 55 AA
|
|
+ Eltorito defaultboot header:
|
|
+ Bootid 88 (bootable)
|
|
+ Boot media 0 (No Emulation Boot)
|
|
+ Load segment 0
|
|
+ Sys type 0
|
|
+ Nsect 4
|
|
+ Bootoff 2AE9E 175774
|
|
diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
|
|
new file mode 100644
|
|
index 0000000..dea75a5
|
|
--- /dev/null
|
|
+++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
|
|
@@ -0,0 +1,29 @@
|
|
+CD-ROM is in ISO 9660 format
|
|
+System id: LINUX
|
|
+Volume id: RHEL-7.1 Workstation.x86_64
|
|
+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: 2152803
|
|
+El Torito VD version 1 found, boot catalog is in sector 1121
|
|
+Joliet with UCS level 3 found
|
|
+Rock Ridge signatures version 1 found
|
|
+Eltorito validation header:
|
|
+ Hid 1
|
|
+ Arch 0 (x86)
|
|
+ ID ''
|
|
+ Key 55 AA
|
|
+ Eltorito defaultboot header:
|
|
+ Bootid 88 (bootable)
|
|
+ Boot media 0 (No Emulation Boot)
|
|
+ Load segment 0
|
|
+ Sys type 0
|
|
+ Nsect 4
|
|
+ Bootoff 2AEB0 175792
|