From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
The libosinfo database is using a arbitrary unchecked mix of
architecture names. Libvirt has defined a canonical set of
architectures, so copy that across to the RNG schema and then
update the data to match.
The main change is that i386, i486, i586, all merge to just
i686, since in practice these differences haven't mattered
for at least 15 years now.
The 'hppa' arch for Ubuntu images is changed to 'parisc'.
---
data/oses/centos.xml.in | 2 +-
data/oses/debian.xml.in | 4 +--
data/oses/fedora.xml.in | 36 +++++++++++-----------
data/oses/openbsd.xml.in | 14 ++++-----
data/oses/opensuse.xml.in | 16 +++++-----
data/oses/rhel.xml.in | 22 +++++++-------
data/oses/ubuntu.xml.in | 76 +++++++++++++++++++++++-----------------------
data/oses/windows.xml.in | 42 ++++++++++++-------------
data/schemas/libosinfo.rng | 50 +++++++++++++++++++++++++++---
9 files changed, 151 insertions(+), 111 deletions(-)
diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
index 03e4b8a..3f09dea 100644
--- a/data/oses/centos.xml.in
+++ b/data/oses/centos.xml.in
@@ -11,7 +11,7 @@
<!-- there is no obvious difference between x86 and x86_64 isos,
maybe we can lookup files on the iso to decide which arch it is? -->
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>CentOS_6.0_Final</volume-id>
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 4e445ad..c30fb37 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -167,7 +167,7 @@
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-dvd/debian-6.0.6-i386-DVD-1.iso</url>
<iso>
<volume-id>Debian 6.0.\d i386 1</volume-id>
@@ -184,7 +184,7 @@
<initrd>install.amd/initrd.gz</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://live.debian.net/cdimage/release/current/i386/iso-hybrid/debian-live-6.0.6-i386-gnome-desktop.iso</url>
<iso>
<volume-id>Debian squeeze.*</volume-id>
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
index 0ed21c3..0002427 100644
--- a/data/oses/fedora.xml.in
+++ b/data/oses/fedora.xml.in
@@ -21,7 +21,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc1.iso</url>
<iso>
<application-id>FC/1 i386</application-id>
@@ -72,7 +72,7 @@
<release-date>2004-05-18</release-date>
<eol-date>2005-04-11</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc1.iso</url>
<iso>
<application-id>FC/2 i386</application-id>
@@ -123,7 +123,7 @@
<release-date>2004-11-08</release-date>
<eol-date>2006-01-16</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc1.iso</url>
<iso>
<application-id>FC/3 i386</application-id>
@@ -174,7 +174,7 @@
<release-date>2005-06-13</release-date>
<eol-date>2006-08-07</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc1.iso</url>
<iso>
<application-id>FC/4 i386</application-id>
@@ -234,7 +234,7 @@
<release-date>2006-03-20</release-date>
<eol-date>2007-07-02</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc1.iso</url>
<iso>
<application-id>FC/5 i386</application-id>
@@ -294,7 +294,7 @@
<release-date>2006-10-24</release-date>
<eol-date>2007-12-07</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc1.iso</url>
<iso>
<application-id>FC(-|/)6 i386</application-id>
@@ -354,7 +354,7 @@
<release-date>2007-05-31</release-date>
<eol-date>2008-06-13</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/iso/F-7-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 7 i386 (DVD|Disc)</volume-id>
@@ -437,7 +437,7 @@
<release-date>2007-11-08</release-date>
<eol-date>2009-01-07</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/iso/Fedora-8-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 8 i386 (DVD|Disc)</volume-id>
@@ -537,7 +537,7 @@
-->
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 9 i386 (DVD|Disc)</volume-id>
@@ -624,7 +624,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 10 i386 (DVD|Disc)</volume-id>
@@ -712,7 +712,7 @@
<device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 11 i386 (DVD|Disc)</volume-id>
@@ -796,7 +796,7 @@
<release-date>2009-11-17</release-date>
<eol-date>2010-12-02</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 12 i386 (DVD|Disc)</volume-id>
@@ -879,7 +879,7 @@
<release-date>2010-05-25</release-date>
<eol-date>2011-06-04</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 13 i386 (DVD|Disc)</volume-id>
@@ -953,7 +953,7 @@
<release-date>2010-11-02</release-date>
<eol-date>2011-12-08</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 14 i386 (DVD|Disc)</volume-id>
@@ -1040,7 +1040,7 @@
<release-date>2011-05-24</release-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 15 i386 (DVD|Disc)</volume-id>
@@ -1127,7 +1127,7 @@
<release-date>2011-11-08</release-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 16 i386 (DVD|Disc)</volume-id>
@@ -1212,7 +1212,7 @@
<upgrades id="http://fedoraproject.org/fedora/16"/>
<derives-from id="http://fedoraproject.org/fedora/16"/>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/iso/Fedora-17-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 17.* i386</volume-id>
@@ -1297,7 +1297,7 @@
<upgrades id="http://fedoraproject.org/fedora/17"/>
<derives-from id="http://fedoraproject.org/fedora/17"/>
- <media arch="i386">
+ <media arch="i686">
<url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
<iso>
<volume-id>Fedora 18.* i386</volume-id>
diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in
index c84ec8f..a74d59e 100644
--- a/data/oses/openbsd.xml.in
+++ b/data/oses/openbsd.xml.in
@@ -8,7 +8,7 @@
<distro>openbsd</distro>
<_vendor>OpenBSD Project</_vendor>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -37,7 +37,7 @@
<upgrades id='http://openbsd.org/openbsd/4.2'/>
<derives-from id='http://openbsd.org/openbsd/4.2'/>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -66,7 +66,7 @@
<upgrades id='http://openbsd.org/openbsd/4.3'/>
<derives-from id='http://openbsd.org/openbsd/4.3'/>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -95,7 +95,7 @@
<upgrades id='http://openbsd.org/openbsd/4.4'/>
<derives-from id='http://openbsd.org/openbsd/4.4'/>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -124,7 +124,7 @@
<upgrades id='http://openbsd.org/openbsd/4.5'/>
<derives-from id='http://openbsd.org/openbsd/4.5'/>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -157,7 +157,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
</devices>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
@@ -188,7 +188,7 @@
<derives-from id='http://openbsd.org/openbsd/4.9'/>
- <media arch='i386'>
+ <media arch='i686'>
<iso>
<publisher-id>The OpenBSD project</publisher-id>
<system-id>OpenBSD</system-id>
diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in
index 9a11b34..48cc98a 100644
--- a/data/oses/opensuse.xml.in
+++ b/data/oses/opensuse.xml.in
@@ -68,7 +68,7 @@
<upgrades id="http://opensuse.org/opensuse/11.2"; />
<derives-from id="http://opensuse.org/opensuse/11.2"; />
- <media arch="i586">
+ <media arch="i686">
<url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-i586.iso</url>
<iso>
<volume-id>openSUSE-DVD-i586-Build0702..001</volume-id>
@@ -89,7 +89,7 @@
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
- <media arch="i586" live="true">
+ <media arch="i686" live="true">
<url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-GNOME-LiveCD-i686.iso</url>
<iso>
<volume-id>openSUSE Live CD.*</volume-id>
@@ -134,7 +134,7 @@
<upgrades id="http://opensuse.org/opensuse/11.3"; />
<derives-from id="http://opensuse.org/opensuse/11.3"; />
- <media arch="i586">
+ <media arch="i686">
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso</url>
<iso>
<volume-id>openSUSE-DVD-i586-Build0024</volume-id>
@@ -155,7 +155,7 @@
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
- <media arch="i586" live="true">
+ <media arch="i686" live="true">
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-GNOME-LiveCD-i686.iso</url>
<iso>
<volume-id>openSUSE Live CD.*</volume-id>
@@ -200,7 +200,7 @@
<upgrades id="http://opensuse.org/opensuse/11.4"; />
<derives-from id="http://opensuse.org/opensuse/11.4"; />
- <media arch="i586">
+ <media arch="i686">
<url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-i586.iso</url>
<iso>
<volume-id>openSUSE-DVD-i586-Build0039</volume-id>
@@ -221,7 +221,7 @@
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
- <media arch="i586" live="true">
+ <media arch="i686" live="true">
<url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-GNOME-LiveCD-i686.iso</url>
<iso>
<volume-id>openSUSE Live CD.*</volume-id>
@@ -267,7 +267,7 @@
<upgrades id="http://opensuse.org/opensuse/12.1"; />
<derives-from id="http://opensuse.org/opensuse/12.1"; />
- <media arch="i586">
+ <media arch="i686">
<url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-DVD-i586.iso</url>
<iso>
<volume-id>openSUSE-DVD-i586-Build0167</volume-id>
@@ -288,7 +288,7 @@
<initrd>boot/x86_64/loader/initrd</initrd>
</media>
- <media arch="i586" live="true">
+ <media arch="i686" live="true">
<url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-GNOME-LiveCD-i686.iso</url>
<iso>
<volume-id>openSUSE Live CD.*</volume-id>
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 7e0db5b..35de243 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -408,7 +408,7 @@
<release-date>2009-05-18</release-date>
<eol-date>2015-02-28</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/4-U8 i386.*</volume-id>
@@ -436,7 +436,7 @@
<release-date>2011-02-16</release-date>
<eol-date>2015-02-28</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL_4.9 i386.*</volume-id>
@@ -527,7 +527,7 @@
<release-date>2009-09-02</release-date>
<eol-date>2020-03-31</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/5.4 i386.*</volume-id>
@@ -555,7 +555,7 @@
<release-date>2010-03-30</release-date>
<eol-date>2020-03-31</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/5.5 i386.*</volume-id>
@@ -588,7 +588,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
</devices>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/5.6 i386.*</volume-id>
@@ -616,7 +616,7 @@
<release-date>2011-07-21</release-date>
<eol-date>2020-03-31</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/5.7 i386.*</volume-id>
@@ -644,7 +644,7 @@
<release-date>2012-02-21</release-date>
<eol-date>2020-03-31</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL/5.8 i386.*</volume-id>
@@ -679,7 +679,7 @@
<device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
</devices>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL_6.0 i386.*</volume-id>
@@ -729,7 +729,7 @@
<release-date>2011-05-19</release-date>
<eol-date>2023-11-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL_6.1 i386.*</volume-id>
@@ -779,7 +779,7 @@
<release-date>2011-12-06</release-date>
<eol-date>2023-11-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL_6.2 i386.*</volume-id>
@@ -829,7 +829,7 @@
<release-date>2012-06-21</release-date>
<eol-date>2023-11-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<system-id>LINUX</system-id>
<volume-id>.*RHEL_6.3 i386.*</volume-id>
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index 300d0f8..a563e62 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -13,7 +13,7 @@
<release-date>2004-10-20</release-date>
<eol-date>2006-04-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-i386.iso</url>
<iso>
<volume-id>Ubuntu 4.10 i386</volume-id>
@@ -32,7 +32,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true" installer="false">
+ <media arch="i686" live="true" installer="false">
<url>http://old-releases.ubuntu.com/releases/warty/warty-release-live-i386.iso</url>
<iso>
<volume-id>Ubuntu 4.10 i386</volume-id>
@@ -58,7 +58,7 @@
<release-date>2005-04-08</release-date>
<eol-date>2006-10-31</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-i386.iso</url>
<iso>
<volume-id>Ubuntu 5.04 i386</volume-id>
@@ -86,7 +86,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true" installer="false">
+ <media arch="i686" live="true" installer="false">
<url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-i386.iso</url>
<iso>
<volume-id>Ubuntu 5.04 i386</volume-id>
@@ -131,7 +131,7 @@
<release-date>2005-10-13</release-date>
<eol-date>2007-04-13</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-i386.iso</url>
<iso>
<volume-id>Ubuntu 5.10 i386</volume-id>
@@ -159,7 +159,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true" installer="false">
+ <media arch="i686" live="true" installer="false">
<url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-i386.iso</url>
<iso>
<volume-id>Ubuntu 5.10 i386</volume-id>
@@ -187,7 +187,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-i386.iso</url>
<iso>
<volume-id>Ubuntu 5.10 i386</volume-id>
@@ -232,7 +232,7 @@
<release-date>2006-06-01</release-date>
<eol-date>2011-06-01</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id>
@@ -259,7 +259,7 @@
<kernel>casper/vmlinuz</kernel>
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="hppa">
+ <media arch="parisc">
<url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url>
<iso>
<volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id>
@@ -287,7 +287,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
@@ -315,7 +315,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url>
<iso>
<volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
@@ -343,7 +343,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="hppa" live="true">
+ <media arch="parisc" live="true">
<url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url>
<iso>
<volume-id>Ubuntu 6.06(.\d)? hppa</volume-id>
@@ -379,7 +379,7 @@
<release-date>2006-10-26</release-date>
<eol-date>2008-04-25</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 6.10 i386</volume-id>
@@ -416,7 +416,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 6.10 i386</volume-id>
@@ -460,7 +460,7 @@
<release-date>2007-04-19</release-date>
<eol-date>2008-10-19</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 7.04 i386</volume-id>
@@ -488,7 +488,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 7.04 i386</volume-id>
@@ -523,7 +523,7 @@
<release-date>2007-10-18</release-date>
<eol-date>2009-04-18</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 7.10 i386</volume-id>
@@ -551,7 +551,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 7.10 i386</volume-id>
@@ -589,7 +589,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id>
@@ -608,7 +608,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
@@ -627,7 +627,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url>
<iso>
<volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
@@ -662,7 +662,7 @@
<release-date>2008-10-30</release-date>
<eol-date>2010-04-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 8.10 i386</volume-id>
@@ -681,7 +681,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 8.10 i386</volume-id>
@@ -720,7 +720,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
</devices>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id>
@@ -739,7 +739,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 9.04(.\d)? i386</volume-id>
@@ -774,7 +774,7 @@
<release-date>2009-10-29</release-date>
<eol-date>2011-04-30</eol-date>
- <media arch="i386">
+ <media arch="i686">
<url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 9.10 i386</volume-id>
@@ -793,7 +793,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 9.10 i386</volume-id>
@@ -840,7 +840,7 @@
<storage>5368709120</storage>
</recommended>
</resources>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id>
@@ -888,7 +888,7 @@
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 10.10 i386</volume-id>
@@ -907,7 +907,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 10.10 i386</volume-id>
@@ -955,7 +955,7 @@
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 11.04 i386</volume-id>
@@ -974,7 +974,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 11.04 i386</volume-id>
@@ -1022,7 +1022,7 @@
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 11.10 i386</volume-id>
@@ -1041,7 +1041,7 @@
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 11.10 i386</volume-id>
@@ -1088,7 +1088,7 @@
<storage>5368709120</storage>
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id>
@@ -1104,7 +1104,7 @@
<kernel>casper/vmlinuz</kernel>
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id>
@@ -1149,7 +1149,7 @@
<storage>16106127360</storage>
</recommended>
</resources>
- <media arch="i386">
+ <media arch="i686">
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
<iso>
<volume-id>Ubuntu-Server 12.10 i386</volume-id>
@@ -1165,7 +1165,7 @@
<kernel>casper/vmlinuz</kernel>
<initrd>casper/initrd.img</initrd>
</media>
- <media arch="i386" live="true">
+ <media arch="i686" live="true">
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
<iso>
<volume-id>Ubuntu 12.10 i386</volume-id>
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 93b8556..6e976d9 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -202,7 +202,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
</devices>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>12000000</cpu>
<ram>4194304</ram>
@@ -224,7 +224,7 @@
<release-date>1998-06-25</release-date>
<eol-date>2006-07-11</eol-date>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>66000000</cpu>
<ram>16777216</ram>
@@ -251,7 +251,7 @@
<release-date>2000-09-14</release-date>
<eol-date>2006-07-11</eol-date>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>150000000</cpu>
<ram>33554432</ram>
@@ -285,7 +285,7 @@
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
</devices>
- <media arch="i386">
+ <media arch="i686">
<iso>
<volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language";>[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
@@ -293,7 +293,7 @@
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>133000000</cpu>
<n-cpus>1</n-cpus>
@@ -329,7 +329,7 @@
<release-date>2001-10-25</release-date>
<eol-date>2009-04-19</eol-date>
- <media arch="i386" installer-reboots="2">
+ <media arch="i686" installer-reboots="2">
<iso>
<volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -345,7 +345,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>233000000</cpu>
<n-cpus>1</n-cpus>
@@ -383,7 +383,7 @@
</installer>
<!-- virtio block device driver -->
- <driver arch="i386" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/winxp/x86"; pre-installable="true">
+ <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/winxp/x86"; pre-installable="true">
<file>viostor.cat</file>
<file>viostor.inf</file>
<file>viostor.sys</file>
@@ -402,7 +402,7 @@
</driver>
<!-- All virtio and QXL device drivers, and spice-vdagent -->
- <driver arch="i386" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst";>
+ <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst";>
<file>spice-guest-tools-0.52.exe</file>
<file>spice-guest-tools-0.52.cmd</file>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -436,7 +436,7 @@
<release-date>2003-04-24</release-date>
<eol-date>2015-07-14</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -458,7 +458,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>133000000</cpu>
<n-cpus>1</n-cpus>
@@ -507,7 +507,7 @@
<release-date>2005-12-06</release-date>
<eol-date>2015-07-14</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -522,7 +522,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>133000000</cpu>
<n-cpus>1</n-cpus>
@@ -571,7 +571,7 @@
<release-date>2008-02-27</release-date>
<eol-date>2013-07-09</eol-date>
- <media arch="i386">
+ <media arch="i686">
<iso>
<volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -586,7 +586,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>1000000000</cpu>
<n-cpus>1</n-cpus>
@@ -732,7 +732,7 @@
<release-date>2009-10-22</release-date>
<eol-date>2015-01-13</eol-date>
- <media arch="i386" installer-reboots="2">
+ <media arch="i686" installer-reboots="2">
<iso>
<volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -747,7 +747,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>1000000000</cpu>
<n-cpus>1</n-cpus>
@@ -775,7 +775,7 @@
</installer>
<!-- virtio block device driver -->
- <driver arch="i386" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/win7/x86"; pre-installable="true">
+ <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/preinst/win7/x86"; pre-installable="true">
<file>viostor.cat</file>
<file>viostor.inf</file>
<file>viostor.sys</file>
@@ -791,7 +791,7 @@
</driver>
<!-- All virtio and QXL device drivers, and spice-vdagent -->
- <driver arch="i386" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst";>
+ <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst";>
<file>spice-guest-tools-0.52.exe</file>
<file>spice-guest-tools-0.52.cmd</file>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -827,7 +827,7 @@
<eol-date></eol-date>
-->
- <media arch="i386">
+ <media arch="i686">
<iso>
<volume-id>(HB1_CCPA_X86FRE|HRM_CCSA_X86FRE|HRM_CCSA_X86CHK|HRM_CCSNA_X86CHK|HRM_CCSNA_X86FRE|HRM_CENA_X86FREV|HRM_CENA_X86CHKV|HRM_CENNA_X86FREV|HRM_CENNA_X86CHKV|HRM_CPRA_X86FREV|HRM_CPRNA_X86FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
@@ -842,7 +842,7 @@
</iso>
</media>
- <resources arch="i386">
+ <resources arch="i686">
<minimum>
<cpu>1000000000</cpu>
<n-cpus>1</n-cpus>
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 90b0dfb..bfa0ddb 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -260,7 +260,7 @@
<define name='resources'>
<element name='resources'>
<attribute name='arch'>
- <text/>
+ <ref name='archnamesorwildcard'/>
</attribute>
<interleave>
<optional>
@@ -310,7 +310,7 @@
<define name='media'>
<element name='media'>
<attribute name='arch'>
- <text/>
+ <ref name='archnames'/>
</attribute>
<optional>
<attribute name="live">
@@ -386,7 +386,7 @@
</optional>
<optional>
<element name='arch'>
- <text/>
+ <text/>
</element>
</optional>
</interleave>
@@ -396,7 +396,7 @@
<define name='tree'>
<element name='tree'>
<attribute name='arch'>
- <text/>
+ <ref name='archnames'/>
</attribute>
<optional>
<element name='url'>
@@ -441,7 +441,7 @@
<define name='driver'>
<element name='driver'>
<attribute name='arch'>
- <text/>
+ <ref name='archnames'/>
</attribute>
<attribute name='location'>
<text/>
@@ -636,6 +636,46 @@
</element>
</define>
+ <define name='archnamesorwildcard'>
+ <choice>
+ <value>all</value>
+ <ref name='archnames'/>
+ </choice>
+ </define>
+ <define name='archnames'>
+ <choice>
+ <value>alpha</value>
+ <value>armv7l</value>
+ <value>cris</value>
+ <value>i686</value>
+ <value>ia64</value>
+ <value>lm32</value>
+ <value>m68k</value>
+ <value>microblaze</value>
+ <value>microblazeel</value>
+ <value>mips</value>
+ <value>mipsel</value>
+ <value>mips64</value>
+ <value>mips64el</value>
+ <value>openrisc</value>
+ <value>parisc</value>
+ <value>parisc64</value>
+ <value>ppc</value>
+ <value>ppc64</value>
+ <value>ppcemb</value>
+ <value>s390</value>
+ <value>s390x</value>
+ <value>sh4</value>
+ <value>sh4eb</value>
+ <value>sparc</value>
+ <value>sparc64</value>
+ <value>unicore32</value>
+ <value>x86_64</value>
+ <value>xtensa</value>
+ <value>xtensaeb</value>
+ </choice>
+ </define>
+
<define name='date'>
<data type="string">
<param name="pattern">[0-9]{4}-[0-9]{2}-[0-9]{2}</param>
--
1.8.1
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
