From berrange at redhat.com  Wed Sep  2 09:01:54 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed,  2 Sep 2015 10:01:54 +0100
Subject: [Libosinfo] [PATCH] Fix sun/oracle confusion in solaris metadata
Message-ID: <1441184514-25380-1-git-send-email-berrange@redhat.com>

There are multiple mistakes in the solaris metadata

 - Solaris 11 was released after Oracle acquisition, so vendor
   should be Oracle
 - The product name of Solaris >= 11 includes "Oracle" and
   not "Sun", so should be "Oracle Solaris 11"
 - The original product names for earlier versions of Solaris
   did not include "Sun", so just "Solaris 10"
 - The domain name in the URL for OpenSolaris should be sun.com
   not oracle.com
 - The domain name in the URL for Solaris 11 should be oracle.com

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1257151

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/oses/solaris.xml.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in
index 89a6ec8..8c7c276 100644
--- a/data/oses/solaris.xml.in
+++ b/data/oses/solaris.xml.in
@@ -2,7 +2,7 @@
 
   <os id="http://sun.com/solaris/9">
     <short-id>solaris9</short-id>
-    <_name>Sun Solaris 9</_name>
+    <_name>Solaris 9</_name>
     <version>9</version>
     <_vendor>Sun</_vendor>
     <family>solaris</family>
@@ -11,7 +11,7 @@
 
   <os id="http://sun.com/solaris/10">
     <short-id>solaris10</short-id>
-    <_name>Sun Solaris 10</_name>
+    <_name>Solaris 10</_name>
     <version>10</version>
     <_vendor>Sun</_vendor>
     <family>solaris</family>
@@ -23,19 +23,19 @@
     </devices>
   </os>
 
-  <os id="http://sun.com/solaris/11">
+  <os id="http://oracle.com/solaris/11">
     <short-id>solaris11</short-id>
-    <_name>Sun Solaris 11</_name>
+    <_name>Oracle Solaris 11</_name>
     <version>11</version>
-    <_vendor>Sun</_vendor>
+    <_vendor>Oracle</_vendor>
     <family>solaris</family>
     <distro>solaris</distro>
     <upgrades id="http://sun.com/solaris/10"/>
   </os>
 
-  <os id="http://oracle.com/opensolaris/2009.06">
+  <os id="http://sun.com/opensolaris/2009.06">
     <short-id>opensolaris2009.06</short-id>
-    <_name>Sun OpenSolaris 2009.06</_name>
+    <_name>OpenSolaris 2009.06</_name>
     <version>2009.06</version>
     <_vendor>Sun</_vendor>
     <family>solaris</family>
-- 
2.4.3



From ffidenci at redhat.com  Wed Sep  2 09:15:43 2015
From: ffidenci at redhat.com (Fabiano Fidencio)
Date: Wed, 2 Sep 2015 11:15:43 +0200
Subject: [Libosinfo] [PATCH] Fix sun/oracle confusion in solaris metadata
In-Reply-To: <1441184514-25380-1-git-send-email-berrange@redhat.com>
References: <1441184514-25380-1-git-send-email-berrange@redhat.com>
Message-ID: <CAAY6XsdVdh5sBQa7Wn=a3fpShYVCTybnt4W_eoypVL5pCso7kw@mail.gmail.com>

On Wed, Sep 2, 2015 at 11:01 AM, Daniel P. Berrange <berrange at redhat.com> wrote:
> There are multiple mistakes in the solaris metadata
>
>  - Solaris 11 was released after Oracle acquisition, so vendor
>    should be Oracle
>  - The product name of Solaris >= 11 includes "Oracle" and
>    not "Sun", so should be "Oracle Solaris 11"
>  - The original product names for earlier versions of Solaris
>    did not include "Sun", so just "Solaris 10"
>  - The domain name in the URL for OpenSolaris should be sun.com
>    not oracle.com
>  - The domain name in the URL for Solaris 11 should be oracle.com
>
> Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1257151
>
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
>  data/oses/solaris.xml.in | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in
> index 89a6ec8..8c7c276 100644
> --- a/data/oses/solaris.xml.in
> +++ b/data/oses/solaris.xml.in
> @@ -2,7 +2,7 @@
>
>    <os id="http://sun.com/solaris/9">
>      <short-id>solaris9</short-id>
> -    <_name>Sun Solaris 9</_name>
> +    <_name>Solaris 9</_name>
>      <version>9</version>
>      <_vendor>Sun</_vendor>
>      <family>solaris</family>
> @@ -11,7 +11,7 @@
>
>    <os id="http://sun.com/solaris/10">
>      <short-id>solaris10</short-id>
> -    <_name>Sun Solaris 10</_name>
> +    <_name>Solaris 10</_name>
>      <version>10</version>
>      <_vendor>Sun</_vendor>
>      <family>solaris</family>
> @@ -23,19 +23,19 @@
>      </devices>
>    </os>
>
> -  <os id="http://sun.com/solaris/11">
> +  <os id="http://oracle.com/solaris/11">
>      <short-id>solaris11</short-id>
> -    <_name>Sun Solaris 11</_name>
> +    <_name>Oracle Solaris 11</_name>
>      <version>11</version>
> -    <_vendor>Sun</_vendor>
> +    <_vendor>Oracle</_vendor>
>      <family>solaris</family>
>      <distro>solaris</distro>
>      <upgrades id="http://sun.com/solaris/10"/>
>    </os>
>
> -  <os id="http://oracle.com/opensolaris/2009.06">
> +  <os id="http://sun.com/opensolaris/2009.06">
>      <short-id>opensolaris2009.06</short-id>
> -    <_name>Sun OpenSolaris 2009.06</_name>
> +    <_name>OpenSolaris 2009.06</_name>
>      <version>2009.06</version>
>      <_vendor>Sun</_vendor>
>      <family>solaris</family>
> --
> 2.4.3
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo


ACK!
-- 
Fabiano Fid?ncio



From marc.deslauriers at canonical.com  Wed Sep  9 13:34:09 2015
From: marc.deslauriers at canonical.com (Marc Deslauriers)
Date: Wed, 9 Sep 2015 09:34:09 -0400
Subject: [Libosinfo] [PATCH] ubuntu: Update Ubuntu information
Message-ID: <55F03551.2090606@canonical.com>

>From 6b7a04ba6684ab14f2a9fa081f20bb41c83c0b5e Mon Sep 17 00:00:00 2001
From: Marc Deslauriers <marc.deslauriers at ubuntu.com>
Date: Wed, 9 Sep 2015 09:27:03 -0400
Subject: [PATCH] ubuntu: Update Ubuntu information

- Fix typos
- Use official release names instead of codenames
- Update release and eol dates
- Update repo URLs for eol releases
---
 data/oses/ubuntu.xml.in | 164 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 119 insertions(+), 45 deletions(-)

diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index 15edc0d..4624d2c 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -3,14 +3,14 @@
   <os id="http://ubuntu.com/ubuntu/4.10">
     <short-id>ubuntu4.10</short-id>
     <short-id>ubuntuwarty</short-id>
-    <_name>Ubuntu Warty Warthog</_name>
+    <_name>Ubuntu 4.10</_name>
     <version>4.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Warty Warthog</codename>

-    <release-date>2004-10-20</release-date>
+    <release-date>2004-10-26</release-date>
     <eol-date>2006-04-30</eol-date>

     <media arch="i686">
@@ -46,7 +46,7 @@
   <os id="http://ubuntu.com/ubuntu/5.04">
     <short-id>ubuntu5.04</short-id>
     <short-id>ubuntuhoary</short-id>
-    <_name>Ubuntu Hoary Hedgehog</_name>
+    <_name>Ubuntu 5.04</_name>
     <version>5.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -119,7 +119,7 @@
   <os id="http://ubuntu.com/ubuntu/5.10">
     <short-id>ubuntu5.10</short-id>
     <short-id>ubuntubreezy</short-id>
-    <_name>Ubuntu Breezy Badger</_name>
+    <_name>Ubuntu 5.10</_name>
     <version>5.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -128,7 +128,7 @@
     <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
     <derives-from id="http://ubuntu.com/ubuntu/5.04"/>

-    <release-date>2005-10-13</release-date>
+    <release-date>2005-10-12</release-date>
     <eol-date>2007-04-13</eol-date>

     <media arch="i686">
@@ -220,7 +220,7 @@
   <os id="http://ubuntu.com/ubuntu/6.06">
     <short-id>ubuntu6.06</short-id>
     <short-id>ubuntudapper</short-id>
-    <_name>Ubuntu Dapper Drake LTS</_name>
+    <_name>Ubuntu 6.06 LTS</_name>
     <version>6.06</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -367,7 +367,7 @@
   <os id="http://ubuntu.com/ubuntu/6.10">
     <short-id>ubuntu6.10</short-id>
     <short-id>ubuntuedgy</short-id>
-    <_name>Ubuntu Edgy Eft</_name>
+    <_name>Ubuntu 6.10</_name>
     <version>6.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -377,7 +377,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/6.06"/>

     <release-date>2006-10-26</release-date>
-    <eol-date>2008-04-25</eol-date>
+    <eol-date>2008-04-26</eol-date>

     <media arch="i686">

<url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
@@ -448,7 +448,7 @@
   <os id="http://ubuntu.com/ubuntu/7.04">
     <short-id>ubuntu7.04</short-id>
     <short-id>ubuntufeisty</short-id>
-    <_name>Ubuntu Feisty Fawn</_name>
+    <_name>Ubuntu 7.04</_name>
     <version>7.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -511,7 +511,7 @@
   <os id="http://ubuntu.com/ubuntu/7.10">
     <short-id>ubuntu7.10</short-id>
     <short-id>ubuntugutsy</short-id>
-    <_name>Ubuntu Gutsy Gibbon</_name>
+    <_name>Ubuntu 7.10</_name>
     <version>7.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -574,7 +574,7 @@
   <os id="http://ubuntu.com/ubuntu/8.04">
     <short-id>ubuntu8.04</short-id>
     <short-id>ubuntuhardy</short-id>
-    <_name>Ubuntu Hardy Heron LTS</_name>
+    <_name>Ubuntu 8.04 LTS</_name>
     <version>8.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -584,6 +584,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/7.10"/>

     <release-date>2008-04-24</release-date>
+    <eol-date>2013-05-09</eol-date>

     <devices>
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -650,7 +651,7 @@
   <os id="http://ubuntu.com/ubuntu/8.10">
     <short-id>ubuntu8.10</short-id>
     <short-id>ubuntuintrepid</short-id>
-    <_name>Ubuntu Intrepid Ibex</_name>
+    <_name>Ubuntu 8.10</_name>
     <version>8.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -704,7 +705,7 @@
   <os id="http://ubuntu.com/ubuntu/9.04">
     <short-id>ubuntu9.04</short-id>
     <short-id>ubuntujaunty</short-id>
-    <_name>Ubuntu Jaunty Jackalope</_name>
+    <_name>Ubuntu 9.04</_name>
     <version>9.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -762,7 +763,7 @@
   <os id="http://ubuntu.com/ubuntu/9.10">
     <short-id>ubuntu9.10</short-id>
     <short-id>ubuntukarmic</short-id>
-    <_name>Ubuntu Karmic Koala</_name>
+    <_name>Ubuntu 9.10</_name>
     <version>9.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -816,7 +817,7 @@
   <os id="http://ubuntu.com/ubuntu/10.04">
     <short-id>ubuntu10.04</short-id>
     <short-id>ubuntulucid</short-id>
-    <_name>Ubuntu Lucid Lynx LTS</_name>
+    <_name>Ubuntu 10.04 LTS</_name>
     <version>10.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -826,6 +827,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/9.10"/>

     <release-date>2010-04-29</release-date>
+    <eol-date>2015-04-30</eol-date>

     <resources arch="all">
       <minimum>
@@ -863,7 +865,7 @@
   <os id="http://ubuntu.com/ubuntu/10.10">
     <short-id>ubuntu10.10</short-id>
     <short-id>ubuntumaverick</short-id>
-    <_name>Ubuntu Maverick Meerkat</_name>
+    <_name>Ubuntu 10.10</_name>
     <version>10.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -873,6 +875,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/10.04"/>

     <release-date>2010-10-10</release-date>
+    <eol-date>2012-04-10</eol-date>

     <resources arch="all">
       <minimum>
@@ -930,7 +933,7 @@
   <os id="http://ubuntu.com/ubuntu/11.04">
     <short-id>ubuntu11.04</short-id>
     <short-id>ubuntunatty</short-id>
-    <_name>Ubuntu Natty Narwhal</_name>
+    <_name>Ubuntu 11.04</_name>
     <version>11.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -940,6 +943,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/10.10"/>

     <release-date>2011-04-28</release-date>
+    <eol-date>2012-10-28</eol-date>

     <resources arch="all">
       <minimum>
@@ -997,7 +1001,7 @@
   <os id="http://ubuntu.com/ubuntu/11.10">
     <short-id>ubuntu11.10</short-id>
     <short-id>ubuntuoneiric</short-id>
-    <_name>Ubuntu Oneiric Ocelot</_name>
+    <_name>Ubuntu 11.10</_name>
     <version>11.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1007,6 +1011,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/11.04"/>

     <release-date>2011-10-13</release-date>
+    <eol-date>2013-05-09</eol-date>

     <resources arch="all">
       <minimum>
@@ -1060,7 +1065,7 @@
   <os id="http://ubuntu.com/ubuntu/12.04">
     <short-id>ubuntu12.04</short-id>
     <short-id>ubuntuprecise</short-id>
-    <_name>Ubuntu Precise Pangolin LTS</_name>
+    <_name>Ubuntu 12.04 LTS</_name>
     <version>12.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1070,6 +1075,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/11.10"/>

     <release-date>2012-04-26</release-date>
+    <eol-date>2017-04-26</eol-date>

     <resources arch="all">
       <minimum>
@@ -1125,7 +1131,7 @@
   <os id="http://ubuntu.com/ubuntu/12.10">
     <short-id>ubuntu12.10</short-id>
     <short-id>ubuntuquantal</short-id>
-    <_name>Ubuntu Quantal Quetzal</_name>
+    <_name>Ubuntu 12.10</_name>
     <version>12.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1135,6 +1141,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/12.04"/>

     <release-date>2012-10-18</release-date>
+    <eol-date>2014-05-16</eol-date>

     <resources arch="all">
       <minimum>
@@ -1150,7 +1157,7 @@
       </recommended>
     </resources>
     <media arch="i686">
-
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 12.10 i386</volume-id>
       </iso>
@@ -1158,7 +1165,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
       </iso>
@@ -1166,7 +1173,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 12.10 i386</volume-id>
       </iso>
@@ -1174,7 +1181,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-
<url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 12.10 amd64</volume-id>
       </iso>
@@ -1190,16 +1197,17 @@
   <os id="http://ubuntu.com/ubuntu/13.04">
     <short-id>ubuntu13.04</short-id>
     <short-id>ubunturaring</short-id>
-    <_name>Ubuntu Raring Ringtails</_name>
+    <_name>Ubuntu 13.04</_name>
     <version>13.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
-    <codename>Raring Ringtails</codename>
+    <codename>Raring Ringtail</codename>
     <upgrades id="http://ubuntu.com/ubuntu/12.10"/>
     <derives-from id="http://ubuntu.com/ubuntu/12.10"/>

     <release-date>2013-04-25</release-date>
+    <eol-date>2014-01-27</eol-date>

     <resources arch="all">
       <minimum>
@@ -1215,7 +1223,7 @@
       </recommended>
     </resources>
     <media arch="i686">
-
<url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 13.04 i386</volume-id>
       </iso>
@@ -1223,7 +1231,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-
<url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 13.04 amd64</volume-id>
       </iso>
@@ -1231,7 +1239,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-
<url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 13.04 i386</volume-id>
       </iso>
@@ -1239,7 +1247,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-
<url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 13.04 amd64</volume-id>
       </iso>
@@ -1255,7 +1263,7 @@
   <os id="http://ubuntu.com/ubuntu/13.10">
     <short-id>ubuntu13.10</short-id>
     <short-id>ubuntusaucy</short-id>
-    <_name>Ubuntu Saucy Salamander</_name>
+    <_name>Ubuntu 13.10</_name>
     <version>13.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1265,6 +1273,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/13.04"/>

     <release-date>2013-10-17</release-date>
+    <eol-date>2014-07-17</eol-date>

     <resources arch="all">
       <minimum>
@@ -1280,7 +1289,7 @@
       </recommended>
     </resources>
     <media arch="i686">
-
<url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 13.10 i386</volume-id>
       </iso>
@@ -1288,7 +1297,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64">
-
<url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 13.10 amd64</volume-id>
       </iso>
@@ -1296,7 +1305,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="i686" live="true">
-
<url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 13.10 i386</volume-id>
       </iso>
@@ -1304,7 +1313,7 @@
       <initrd>casper/initrd.img</initrd>
     </media>
     <media arch="x86_64" live="true">
-
<url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
+
<url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 13.10 amd64</volume-id>
       </iso>
@@ -1320,7 +1329,7 @@
   <os id="http://ubuntu.com/ubuntu/14.04">
     <short-id>ubuntu14.04</short-id>
     <short-id>ubuntutrusty</short-id>
-    <_name>Ubuntu Trusty Tahr LTS</_name>
+    <_name>Ubuntu 14.04 LTS</_name>
     <version>14.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1329,8 +1338,8 @@
     <upgrades id="http://ubuntu.com/ubuntu/13.10"/>
     <derives-from id="http://ubuntu.com/ubuntu/13.10"/>

-    <release-date>2014-04-26</release-date>
-    <eol-date>2019-04-01</eol-date>
+    <release-date>2014-04-17</release-date>
+    <eol-date>2019-04-17</eol-date>

     <resources arch="all">
       <minimum>
@@ -1387,7 +1396,7 @@
   <os id="http://ubuntu.com/ubuntu/14.10">
     <short-id>ubuntu14.10</short-id>
     <short-id>ubuntututopic</short-id>
-    <_name>Ubuntu Utopic Unicorn</_name>
+    <_name>Ubuntu 14.10</_name>
     <version>14.10</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
@@ -1397,8 +1406,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/14.04"/>

     <release-date>2014-10-23</release-date>
-    <!--
https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions -->
-    <!--<eol-date>2015-07</eol-date>-->
+    <eol-date>2015-07-23</eol-date>

     <resources arch="all">
       <minimum>
@@ -1455,18 +1463,17 @@
   <os id="http://ubuntu.com/ubuntu/15.04">
     <short-id>ubuntu15.04</short-id>
     <short-id>ubuntutvivid</short-id>
-    <_name>Ubuntu Vivid Varvet</_name>
+    <_name>Ubuntu 15.04</_name>
     <version>15.04</version>
     <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
-    <codename>Vivid Varvet</codename>
+    <codename>Vivid Vervet</codename>
     <upgrades id="http://ubuntu.com/ubuntu/14.10"/>
     <derives-from id="http://ubuntu.com/ubuntu/14.10"/>

     <release-date>2015-04-23</release-date>
-    <!--
https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions -->
-    <!--<eol-date>2016-01</eol-date>-->
+    <eol-date>2016-01-23</eol-date>

     <resources arch="all">
       <minimum>
@@ -1519,4 +1526,71 @@
       <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
     </installer>
   </os>
+
+  <os id="http://ubuntu.com/ubuntu/15.10">
+    <short-id>ubuntu15.10</short-id>
+    <short-id>ubuntutwily</short-id>
+    <_name>Ubuntu 15.10</_name>
+    <version>15.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Wily Werewolf</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/15.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/15.04"/>
+
+    <release-date>2015-10-22</release-date>
+    <eol-date>2016-07-22</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+
<url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+
<url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+
<url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+
<url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
 </libosinfo>
-- 
2.1.4



From berrange at redhat.com  Wed Sep  9 13:40:03 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Wed, 9 Sep 2015 14:40:03 +0100
Subject: [Libosinfo] [PATCH] ubuntu: Update Ubuntu information
In-Reply-To: <55F03551.2090606@canonical.com>
References: <55F03551.2090606@canonical.com>
Message-ID: <20150909134003.GI22200@redhat.com>

On Wed, Sep 09, 2015 at 09:34:09AM -0400, Marc Deslauriers wrote:
> >From 6b7a04ba6684ab14f2a9fa081f20bb41c83c0b5e Mon Sep 17 00:00:00 2001
> From: Marc Deslauriers <marc.deslauriers at ubuntu.com>
> Date: Wed, 9 Sep 2015 09:27:03 -0400
> Subject: [PATCH] ubuntu: Update Ubuntu information
> 
> - Fix typos
> - Use official release names instead of codenames
> - Update release and eol dates
> - Update repo URLs for eol releases
> ---
>  data/oses/ubuntu.xml.in | 164 +++++++++++++++++++++++++++++++++++-------------
>  1 file changed, 119 insertions(+), 45 deletions(-)
> 
> diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
> index 15edc0d..4624d2c 100644
> --- a/data/oses/ubuntu.xml.in
> +++ b/data/oses/ubuntu.xml.in
> @@ -3,14 +3,14 @@
>    <os id="http://ubuntu.com/ubuntu/4.10">
>      <short-id>ubuntu4.10</short-id>
>      <short-id>ubuntuwarty</short-id>
> -    <_name>Ubuntu Warty Warthog</_name>
> +    <_name>Ubuntu 4.10</_name>

I guess we used the codenames here originally, because most end users
seem to refer to codenames and never use the version numbers, so code
names seemd more familiar. That said, this is really a user interface
issue. eg virt-manager could easily present the user with "$NAME ($CODENAME)"
based on the two separate fields, so this change looks fine.

>      <version>4.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
>      <distro>ubuntu</distro>
>      <codename>Warty Warthog</codename>
> 
> -    <release-date>2004-10-20</release-date>
> +    <release-date>2004-10-26</release-date>
>      <eol-date>2006-04-30</eol-date>
> 
>      <media arch="i686">
> @@ -46,7 +46,7 @@
>    <os id="http://ubuntu.com/ubuntu/5.04">
>      <short-id>ubuntu5.04</short-id>
>      <short-id>ubuntuhoary</short-id>
> -    <_name>Ubuntu Hoary Hedgehog</_name>
> +    <_name>Ubuntu 5.04</_name>
>      <version>5.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -119,7 +119,7 @@
>    <os id="http://ubuntu.com/ubuntu/5.10">
>      <short-id>ubuntu5.10</short-id>
>      <short-id>ubuntubreezy</short-id>
> -    <_name>Ubuntu Breezy Badger</_name>
> +    <_name>Ubuntu 5.10</_name>
>      <version>5.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -128,7 +128,7 @@
>      <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
>      <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
> 
> -    <release-date>2005-10-13</release-date>
> +    <release-date>2005-10-12</release-date>
>      <eol-date>2007-04-13</eol-date>
> 
>      <media arch="i686">
> @@ -220,7 +220,7 @@
>    <os id="http://ubuntu.com/ubuntu/6.06">
>      <short-id>ubuntu6.06</short-id>
>      <short-id>ubuntudapper</short-id>
> -    <_name>Ubuntu Dapper Drake LTS</_name>
> +    <_name>Ubuntu 6.06 LTS</_name>
>      <version>6.06</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -367,7 +367,7 @@
>    <os id="http://ubuntu.com/ubuntu/6.10">
>      <short-id>ubuntu6.10</short-id>
>      <short-id>ubuntuedgy</short-id>
> -    <_name>Ubuntu Edgy Eft</_name>
> +    <_name>Ubuntu 6.10</_name>
>      <version>6.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -377,7 +377,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
> 
>      <release-date>2006-10-26</release-date>
> -    <eol-date>2008-04-25</eol-date>
> +    <eol-date>2008-04-26</eol-date>
> 
>      <media arch="i686">
> 
> <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
> @@ -448,7 +448,7 @@
>    <os id="http://ubuntu.com/ubuntu/7.04">
>      <short-id>ubuntu7.04</short-id>
>      <short-id>ubuntufeisty</short-id>
> -    <_name>Ubuntu Feisty Fawn</_name>
> +    <_name>Ubuntu 7.04</_name>
>      <version>7.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -511,7 +511,7 @@
>    <os id="http://ubuntu.com/ubuntu/7.10">
>      <short-id>ubuntu7.10</short-id>
>      <short-id>ubuntugutsy</short-id>
> -    <_name>Ubuntu Gutsy Gibbon</_name>
> +    <_name>Ubuntu 7.10</_name>
>      <version>7.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -574,7 +574,7 @@
>    <os id="http://ubuntu.com/ubuntu/8.04">
>      <short-id>ubuntu8.04</short-id>
>      <short-id>ubuntuhardy</short-id>
> -    <_name>Ubuntu Hardy Heron LTS</_name>
> +    <_name>Ubuntu 8.04 LTS</_name>
>      <version>8.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -584,6 +584,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
> 
>      <release-date>2008-04-24</release-date>
> +    <eol-date>2013-05-09</eol-date>
> 
>      <devices>
>        <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
> @@ -650,7 +651,7 @@
>    <os id="http://ubuntu.com/ubuntu/8.10">
>      <short-id>ubuntu8.10</short-id>
>      <short-id>ubuntuintrepid</short-id>
> -    <_name>Ubuntu Intrepid Ibex</_name>
> +    <_name>Ubuntu 8.10</_name>
>      <version>8.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -704,7 +705,7 @@
>    <os id="http://ubuntu.com/ubuntu/9.04">
>      <short-id>ubuntu9.04</short-id>
>      <short-id>ubuntujaunty</short-id>
> -    <_name>Ubuntu Jaunty Jackalope</_name>
> +    <_name>Ubuntu 9.04</_name>
>      <version>9.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -762,7 +763,7 @@
>    <os id="http://ubuntu.com/ubuntu/9.10">
>      <short-id>ubuntu9.10</short-id>
>      <short-id>ubuntukarmic</short-id>
> -    <_name>Ubuntu Karmic Koala</_name>
> +    <_name>Ubuntu 9.10</_name>
>      <version>9.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -816,7 +817,7 @@
>    <os id="http://ubuntu.com/ubuntu/10.04">
>      <short-id>ubuntu10.04</short-id>
>      <short-id>ubuntulucid</short-id>
> -    <_name>Ubuntu Lucid Lynx LTS</_name>
> +    <_name>Ubuntu 10.04 LTS</_name>
>      <version>10.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -826,6 +827,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
> 
>      <release-date>2010-04-29</release-date>
> +    <eol-date>2015-04-30</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -863,7 +865,7 @@
>    <os id="http://ubuntu.com/ubuntu/10.10">
>      <short-id>ubuntu10.10</short-id>
>      <short-id>ubuntumaverick</short-id>
> -    <_name>Ubuntu Maverick Meerkat</_name>
> +    <_name>Ubuntu 10.10</_name>
>      <version>10.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -873,6 +875,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
> 
>      <release-date>2010-10-10</release-date>
> +    <eol-date>2012-04-10</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -930,7 +933,7 @@
>    <os id="http://ubuntu.com/ubuntu/11.04">
>      <short-id>ubuntu11.04</short-id>
>      <short-id>ubuntunatty</short-id>
> -    <_name>Ubuntu Natty Narwhal</_name>
> +    <_name>Ubuntu 11.04</_name>
>      <version>11.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -940,6 +943,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
> 
>      <release-date>2011-04-28</release-date>
> +    <eol-date>2012-10-28</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -997,7 +1001,7 @@
>    <os id="http://ubuntu.com/ubuntu/11.10">
>      <short-id>ubuntu11.10</short-id>
>      <short-id>ubuntuoneiric</short-id>
> -    <_name>Ubuntu Oneiric Ocelot</_name>
> +    <_name>Ubuntu 11.10</_name>
>      <version>11.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1007,6 +1011,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
> 
>      <release-date>2011-10-13</release-date>
> +    <eol-date>2013-05-09</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1060,7 +1065,7 @@
>    <os id="http://ubuntu.com/ubuntu/12.04">
>      <short-id>ubuntu12.04</short-id>
>      <short-id>ubuntuprecise</short-id>
> -    <_name>Ubuntu Precise Pangolin LTS</_name>
> +    <_name>Ubuntu 12.04 LTS</_name>
>      <version>12.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1070,6 +1075,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/11.10"/>
> 
>      <release-date>2012-04-26</release-date>
> +    <eol-date>2017-04-26</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1125,7 +1131,7 @@
>    <os id="http://ubuntu.com/ubuntu/12.10">
>      <short-id>ubuntu12.10</short-id>
>      <short-id>ubuntuquantal</short-id>
> -    <_name>Ubuntu Quantal Quetzal</_name>
> +    <_name>Ubuntu 12.10</_name>
>      <version>12.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1135,6 +1141,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/12.04"/>
> 
>      <release-date>2012-10-18</release-date>
> +    <eol-date>2014-05-16</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1150,7 +1157,7 @@
>        </recommended>
>      </resources>
>      <media arch="i686">
> -
> <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 12.10 i386</volume-id>
>        </iso>
> @@ -1158,7 +1165,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64">
> -
> <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
>        </iso>
> @@ -1166,7 +1173,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="i686" live="true">
> -
> <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu 12.10 i386</volume-id>
>        </iso>
> @@ -1174,7 +1181,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64" live="true">
> -
> <url>http://releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu 12.10 amd64</volume-id>
>        </iso>
> @@ -1190,16 +1197,17 @@
>    <os id="http://ubuntu.com/ubuntu/13.04">
>      <short-id>ubuntu13.04</short-id>
>      <short-id>ubunturaring</short-id>
> -    <_name>Ubuntu Raring Ringtails</_name>
> +    <_name>Ubuntu 13.04</_name>
>      <version>13.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
>      <distro>ubuntu</distro>
> -    <codename>Raring Ringtails</codename>
> +    <codename>Raring Ringtail</codename>
>      <upgrades id="http://ubuntu.com/ubuntu/12.10"/>
>      <derives-from id="http://ubuntu.com/ubuntu/12.10"/>
> 
>      <release-date>2013-04-25</release-date>
> +    <eol-date>2014-01-27</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1215,7 +1223,7 @@
>        </recommended>
>      </resources>
>      <media arch="i686">
> -
> <url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 13.04 i386</volume-id>
>        </iso>
> @@ -1223,7 +1231,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64">
> -
> <url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 13.04 amd64</volume-id>
>        </iso>
> @@ -1231,7 +1239,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="i686" live="true">
> -
> <url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu 13.04 i386</volume-id>
>        </iso>
> @@ -1239,7 +1247,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64" live="true">
> -
> <url>http://releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu 13.04 amd64</volume-id>
>        </iso>
> @@ -1255,7 +1263,7 @@
>    <os id="http://ubuntu.com/ubuntu/13.10">
>      <short-id>ubuntu13.10</short-id>
>      <short-id>ubuntusaucy</short-id>
> -    <_name>Ubuntu Saucy Salamander</_name>
> +    <_name>Ubuntu 13.10</_name>
>      <version>13.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1265,6 +1273,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/13.04"/>
> 
>      <release-date>2013-10-17</release-date>
> +    <eol-date>2014-07-17</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1280,7 +1289,7 @@
>        </recommended>
>      </resources>
>      <media arch="i686">
> -
> <url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 13.10 i386</volume-id>
>        </iso>
> @@ -1288,7 +1297,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64">
> -
> <url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu-Server 13.10 amd64</volume-id>
>        </iso>
> @@ -1296,7 +1305,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="i686" live="true">
> -
> <url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
>        <iso>
>          <volume-id>Ubuntu 13.10 i386</volume-id>
>        </iso>
> @@ -1304,7 +1313,7 @@
>        <initrd>casper/initrd.img</initrd>
>      </media>
>      <media arch="x86_64" live="true">
> -
> <url>http://releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
> +
> <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
>        <iso>
>          <volume-id>Ubuntu 13.10 amd64</volume-id>
>        </iso>
> @@ -1320,7 +1329,7 @@
>    <os id="http://ubuntu.com/ubuntu/14.04">
>      <short-id>ubuntu14.04</short-id>
>      <short-id>ubuntutrusty</short-id>
> -    <_name>Ubuntu Trusty Tahr LTS</_name>
> +    <_name>Ubuntu 14.04 LTS</_name>
>      <version>14.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1329,8 +1338,8 @@
>      <upgrades id="http://ubuntu.com/ubuntu/13.10"/>
>      <derives-from id="http://ubuntu.com/ubuntu/13.10"/>
> 
> -    <release-date>2014-04-26</release-date>
> -    <eol-date>2019-04-01</eol-date>
> +    <release-date>2014-04-17</release-date>
> +    <eol-date>2019-04-17</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1387,7 +1396,7 @@
>    <os id="http://ubuntu.com/ubuntu/14.10">
>      <short-id>ubuntu14.10</short-id>
>      <short-id>ubuntututopic</short-id>
> -    <_name>Ubuntu Utopic Unicorn</_name>
> +    <_name>Ubuntu 14.10</_name>
>      <version>14.10</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
> @@ -1397,8 +1406,7 @@
>      <derives-from id="http://ubuntu.com/ubuntu/14.04"/>
> 
>      <release-date>2014-10-23</release-date>
> -    <!--
> https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions -->
> -    <!--<eol-date>2015-07</eol-date>-->
> +    <eol-date>2015-07-23</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1455,18 +1463,17 @@
>    <os id="http://ubuntu.com/ubuntu/15.04">
>      <short-id>ubuntu15.04</short-id>
>      <short-id>ubuntutvivid</short-id>
> -    <_name>Ubuntu Vivid Varvet</_name>
> +    <_name>Ubuntu 15.04</_name>
>      <version>15.04</version>
>      <_vendor>Canonical Ltd</_vendor>
>      <family>linux</family>
>      <distro>ubuntu</distro>
> -    <codename>Vivid Varvet</codename>
> +    <codename>Vivid Vervet</codename>
>      <upgrades id="http://ubuntu.com/ubuntu/14.10"/>
>      <derives-from id="http://ubuntu.com/ubuntu/14.10"/>
> 
>      <release-date>2015-04-23</release-date>
> -    <!--
> https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions -->
> -    <!--<eol-date>2016-01</eol-date>-->
> +    <eol-date>2016-01-23</eol-date>
> 
>      <resources arch="all">
>        <minimum>
> @@ -1519,4 +1526,71 @@
>        <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
>      </installer>
>    </os>
> +
> +  <os id="http://ubuntu.com/ubuntu/15.10">
> +    <short-id>ubuntu15.10</short-id>
> +    <short-id>ubuntutwily</short-id>
> +    <_name>Ubuntu 15.10</_name>
> +    <version>15.10</version>
> +    <_vendor>Canonical Ltd</_vendor>
> +    <family>linux</family>
> +    <distro>ubuntu</distro>
> +    <codename>Wily Werewolf</codename>
> +    <upgrades id="http://ubuntu.com/ubuntu/15.04"/>
> +    <derives-from id="http://ubuntu.com/ubuntu/15.04"/>
> +
> +    <release-date>2015-10-22</release-date>
> +    <eol-date>2016-07-22</eol-date>
> +
> +    <resources arch="all">
> +      <minimum>
> +        <cpu>1000000000</cpu>
> +        <n-cpus>1</n-cpus>
> +        <ram>1073741824</ram>
> +        <storage>5368709120</storage>
> +      </minimum>
> +      <recommended>
> +        <cpu>1000000000</cpu>
> +        <ram>1073741824</ram>
> +        <storage>16106127360</storage>
> +      </recommended>
> +    </resources>
> +
> +    <media arch="i686">
> +
> <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-i386.iso</url>
> +      <iso>
> +        <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
> +      </iso>
> +      <kernel>casper/vmlinuz</kernel>
> +      <initrd>casper/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64">
> +
> <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-amd64.iso</url>
> +      <iso>
> +        <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
> +      </iso>
> +      <kernel>casper/vmlinuz</kernel>
> +      <initrd>casper/initrd.img</initrd>
> +    </media>
> +    <media arch="i686" live="true">
> +
> <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-i386.iso</url>
> +      <iso>
> +        <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
> +      </iso>
> +      <kernel>casper/vmlinuz</kernel>
> +      <initrd>casper/initrd.img</initrd>
> +    </media>
> +    <media arch="x86_64" live="true">
> +
> <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-amd64.iso</url>
> +      <iso>
> +        <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
> +      </iso>
> +      <kernel>casper/vmlinuz</kernel>
> +      <initrd>casper/initrd.img</initrd>
> +    </media>
> +
> +    <installer>
> +      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
> +    </installer>
> +  </os>
>  </libosinfo>

ACK,

Those as a general point in future I'd suggest always having separate
commits for general fixes to existing content, vs new content.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From cfergeau at redhat.com  Thu Sep 10 09:30:03 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 10 Sep 2015 11:30:03 +0200
Subject: [Libosinfo] [PATCH] Add Windows 10 Education volume-id
Message-ID: <1441877403-4217-1-git-send-email-cfergeau@redhat.com>

---
 data/oses/windows.xml.in                           | 49 ++++++++++++++++++++++
 ...en_windows_10_education_x86_dvd_6848121.iso.txt | 29 +++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index a06d18a..0ab5cd1 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1059,4 +1059,53 @@
     </media>
   </os>
 
+  <os id="http://microsoft.com/win/10">
+    <short-id>win10</short-id>
+    <_name>Microsoft Windows 10</_name>
+    <version>10.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8.1"/>
+    <upgrades id="http://microsoft.com/win/8.1"/>
+
+    <release-date>2015-07-29</release-date>
+
+    <variant id="education">
+      <_name>Microsoft Windows 10 Education</_name>
+    </variant>
+
+    <!-- Education -->
+    <media arch="x86_64">
+      <variant id="education"/>
+      <iso>
+        <volume-id>J_CEDA_X86FRE_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+
 </libosinfo>
diff --git a/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt b/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
new file mode 100644
index 0000000..f9b0ce5
--- /dev/null
+++ b/test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: J_CEDA_X86FRE_EN-US_DV5
+Volume set id: J_CEDA_X86FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1426630
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 222 546
-- 
2.4.3



From berrange at redhat.com  Thu Sep 10 09:31:59 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 10 Sep 2015 10:31:59 +0100
Subject: [Libosinfo] [PATCH] Add Windows 10 Education volume-id
In-Reply-To: <1441877403-4217-1-git-send-email-cfergeau@redhat.com>
References: <1441877403-4217-1-git-send-email-cfergeau@redhat.com>
Message-ID: <20150910093159.GG11366@redhat.com>

On Thu, Sep 10, 2015 at 11:30:03AM +0200, Christophe Fergeau wrote:
> ---
>  data/oses/windows.xml.in                           | 49 ++++++++++++++++++++++
>  ...en_windows_10_education_x86_dvd_6848121.iso.txt | 29 +++++++++++++
>  2 files changed, 78 insertions(+)
>  create mode 100644 test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt

ACK


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Sep 10 09:37:53 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 10 Sep 2015 10:37:53 +0100
Subject: [Libosinfo] [PATCH] ubuntu: Update Ubuntu information
In-Reply-To: <55F03551.2090606@canonical.com>
References: <55F03551.2090606@canonical.com>
Message-ID: <20150910093753.GH11366@redhat.com>

On Wed, Sep 09, 2015 at 09:34:09AM -0400, Marc Deslauriers wrote:
> >From 6b7a04ba6684ab14f2a9fa081f20bb41c83c0b5e Mon Sep 17 00:00:00 2001
> From: Marc Deslauriers <marc.deslauriers at ubuntu.com>
> Date: Wed, 9 Sep 2015 09:27:03 -0400
> Subject: [PATCH] ubuntu: Update Ubuntu information
> 
> - Fix typos
> - Use official release names instead of codenames
> - Update release and eol dates
> - Update repo URLs for eol releases
> ---
>  data/oses/ubuntu.xml.in | 164 +++++++++++++++++++++++++++++++++++-------------
>  1 file changed, 119 insertions(+), 45 deletions(-)

I tried to apply this to git, but your email client has mangled
whitespace introducing line breaks, preventing the patch from
applying. Could you resend either as an attachment, or with
thunderbird configured to not mangle whitespace from inline
text

https://www.kernel.org/doc/Documentation/email-clients.txt

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From cfergeau at redhat.com  Thu Sep 10 09:57:13 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 10 Sep 2015 11:57:13 +0200
Subject: [Libosinfo] [PATCH] Add Windows 10 Education volume-id
In-Reply-To: <20150910093159.GG11366@redhat.com>
References: <1441877403-4217-1-git-send-email-cfergeau@redhat.com>
	<20150910093159.GG11366@redhat.com>
Message-ID: <20150910095713.GR29506@edamame.cdg.redhat.com>

On Thu, Sep 10, 2015 at 10:31:59AM +0100, Daniel P. Berrange wrote:
> On Thu, Sep 10, 2015 at 11:30:03AM +0200, Christophe Fergeau wrote:
> > ---
> >  data/oses/windows.xml.in                           | 49 ++++++++++++++++++++++
> >  ...en_windows_10_education_x86_dvd_6848121.iso.txt | 29 +++++++++++++
> >  2 files changed, 78 insertions(+)
> >  create mode 100644 test/isodata/windows/win10/en_windows_10_education_x86_dvd_6848121.iso.txt
> 
> ACK

Thanks, pushed. I've fixed the arch of the media I added as it was wrong
in the initial patch.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150910/f94bab8b/attachment.sig>

From diaz.bastian at openmailbox.org  Thu Sep 10 15:21:30 2015
From: diaz.bastian at openmailbox.org (=?UTF-8?Q?Basti=C3=A1n_D=C3=ADaz?=)
Date: Thu, 10 Sep 2015 12:21:30 -0300
Subject: [Libosinfo] ReactOS is not recognized in libosinfo
Message-ID: <bc6b9744f6de9b19930e69ad5b2d8527@openmailbox.org>

Hello, I am sending iso information from ReactOS due to a request from a 
developer gnome-boxes. See: 
https://bugzilla.gnome.org/show_bug.cgi?id=754436

ReactOS-BootCD.iso

--8<--
CD-ROM is in ISO 9660 format
System id:
Volume id: REACTOS
Volume set id:
Publisher id:
Data preparer id:
Application id:
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: 52797
El Torito VD version 1 found, boot catalog is in sector 20
Joliet with UCS level 3 found
NO Rock Ridge present
Eltorito validation header:
     Hid 1
     Arch 0 (x86)
     ID 'ReactOS Foundation'
     Key 55 AA
     Eltorito defaultboot header:
         Bootid 88 (bootable)
         Boot media 0 (No Emulation Boot)
         Load segment 0
         Sys type 0
         Nsect 4
         Bootoff 15 21
--8<--

I hope this information is helpful.

Cheers

-- 
Basti?n D?az



From cfergeau at redhat.com  Thu Sep 10 15:50:17 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 10 Sep 2015 17:50:17 +0200
Subject: [Libosinfo] ReactOS is not recognized in libosinfo
In-Reply-To: <bc6b9744f6de9b19930e69ad5b2d8527@openmailbox.org>
References: <bc6b9744f6de9b19930e69ad5b2d8527@openmailbox.org>
Message-ID: <20150910155017.GE19040@edamame.cdg.redhat.com>

Hey,

On Thu, Sep 10, 2015 at 12:21:30PM -0300, Basti?n D?az wrote:
> Hello, I am sending iso information from ReactOS due to a request from a
> developer gnome-boxes. See:
> https://bugzilla.gnome.org/show_bug.cgi?id=754436
> 
> ReactOS-BootCD.iso
> 
> --8<--
> CD-ROM is in ISO 9660 format
> System id:
> Volume id: REACTOS

This should help identify a reactos ISO, but detection would be more
accurate if there was some kind of version number in the volume id too
(though at worse we can use Logical block size and Volume size instead).

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150910/b51b8484/attachment.sig>

From diaz.bastian at openmailbox.org  Thu Sep 10 16:03:33 2015
From: diaz.bastian at openmailbox.org (=?UTF-8?Q?Basti=C3=A1n_D=C3=ADaz?=)
Date: Thu, 10 Sep 2015 13:03:33 -0300
Subject: [Libosinfo] ReactOS is not recognized in libosinfo
In-Reply-To: <20150910155017.GE19040@edamame.cdg.redhat.com>
References: <bc6b9744f6de9b19930e69ad5b2d8527@openmailbox.org>
	<20150910155017.GE19040@edamame.cdg.redhat.com>
Message-ID: <a286a893289d4e07a200640b3a8d2809@openmailbox.org>

El 10-09-2015 12:50, Christophe Fergeau escribi?:
>> 
>> --8<--
>> CD-ROM is in ISO 9660 format
>> System id:
>> Volume id: REACTOS
> 
> This should help identify a reactos ISO, but detection would be more
> accurate if there was some kind of version number in the volume id too
> (though at worse we can use Logical block size and Volume size 
> instead).
> 
> Christophe

You think it's good thoughts make a request ReactOS developers? What 
other information is useful for the case?

Cheers

-- 
Basti?n D?az



From cfergeau at redhat.com  Fri Sep 11 07:39:03 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 09:39:03 +0200
Subject: [Libosinfo] ReactOS is not recognized in libosinfo
In-Reply-To: <a286a893289d4e07a200640b3a8d2809@openmailbox.org>
References: <bc6b9744f6de9b19930e69ad5b2d8527@openmailbox.org>
	<20150910155017.GE19040@edamame.cdg.redhat.com>
	<a286a893289d4e07a200640b3a8d2809@openmailbox.org>
Message-ID: <20150911073903.GF19040@edamame.cdg.redhat.com>

On Thu, Sep 10, 2015 at 01:03:33PM -0300, Basti?n D?az wrote:
> El 10-09-2015 12:50, Christophe Fergeau escribi?:
> >>
> >>--8<--
> >>CD-ROM is in ISO 9660 format
> >>System id:
> >>Volume id: REACTOS
> >
> >This should help identify a reactos ISO, but detection would be more
> >accurate if there was some kind of version number in the volume id too
> >(though at worse we can use Logical block size and Volume size instead).
> >
> >Christophe
> 
> You think it's good thoughts make a request ReactOS developers? What other
> information is useful for the case?

I don't know how often ReactOS releases new ISOs. If they are doing
regular versioned releases, it definitely would be useful to ask them if
they could improve their ISO labels.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150911/e7bb4dad/attachment.sig>

From cfergeau at redhat.com  Fri Sep 11 16:21:58 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:21:58 +0200
Subject: [Libosinfo] [PATCH 0/9] Add volume IDs from rhbz#1212599
Message-ID: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=1212599 has a lot of test files
which are not currently identified by libosinfo. This patch series adds most of
these.

One thing which I was not always sure about is what to make a Windows variant
and what not. There are Debug Checked builds, Volume Licences builds, 'N'
versions (without Windows Media Player), "with Updates" ISOs, ...
Some of these I made first class variants, others I did not, but this was a bit
arbitrary ;)

Christophe




From cfergeau at redhat.com  Fri Sep 11 16:21:59 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:21:59 +0200
Subject: [Libosinfo] [PATCH 1/9] win: Fix wrong comment added in 7b454eff
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-2-git-send-email-cfergeau@redhat.com>

'debug' variant is introduced by a /* Starter */ comment.
---
 data/oses/windows.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 004489e..259c95a 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -755,7 +755,7 @@
       <_name>Microsoft Windows 7 Ultimate</_name>
     </variant>
 
-    <!-- Starter -->
+    <!-- Debug -->
     <media arch="i686" installer-reboots="2">
       <variant id="starter"/>
       <iso>
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:00 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:00 +0200
Subject: [Libosinfo] [PATCH 2/9] win: Add Windows Server 2012 volume ids
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-3-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/windows.xml.in                           | 54 ++++++++++++++++++++++
 ...2012_debug_checked_build_x64_dvd_917521.iso.txt | 29 ++++++++++++
 ...soft_hyper-v_server_2012_x64_dvd_915600.iso.txt | 29 ++++++++++++
 ..._server_2012_essentials_x64_dvd_1022281.iso.txt | 29 ++++++++++++
 ...2012_debug_checked_build_x64_dvd_917505.iso.txt | 29 ++++++++++++
 ...ge_server_and_foundation_x64_dvd_915793.iso.txt | 29 ++++++++++++
 ...n_windows_server_2012_vl_x64_dvd_917758.iso.txt | 29 ++++++++++++
 .../en_windows_server_2012_x64_dvd_915478.iso.txt  | 29 ++++++++++++
 8 files changed, 257 insertions(+)
 create mode 100644 test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
 create mode 100644 test/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 259c95a..5516a41 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1036,6 +1036,60 @@
     <upgrades id="http://microsoft.com/win/2k8r2"/>
 
     <release-date>2012-09-04</release-date>
+
+    <variant id="storage">
+      <_name>Windows Server 2012 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 Volume License</_name>
+    </variant>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(HRM_SFST_X64FREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(HRM_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
   </os>
 
   <os id="http://microsoft.com/win/2k12r2">
diff --git a/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt b/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
new file mode 100644
index 0000000..03e8742
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_debug_checked_build_x64_dvd_917521.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SHV_X64CHK_EN-US_DV5
+Volume set id: HRM_SHV_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 886717
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
diff --git a/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt b/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
new file mode 100644
index 0000000..8fb48f4
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_microsoft_hyper-v_server_2012_x64_dvd_915600.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SHV_X64FRE_EN-US_DV5
+Volume set id: HRM_SHV_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 867796
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
diff --git a/test/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt b/test/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
new file mode 100644
index 0000000..bd6a0e2
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_server_install_disc_windows_server_2012_essentials_x64_dvd_1022281.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SSSO_X64FRE_EN-US_DV5
+Volume set id: HRM_SSSO_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2106454
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 867 2151
diff --git a/test/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt b/test/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
new file mode 100644
index 0000000..6da02e0
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_windows_server_2012_debug_checked_build_x64_dvd_917505.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SSS_X64CHK_EN-US_DV5
+Volume set id: HRM_SSS_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1872030
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
diff --git a/test/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt b/test/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
new file mode 100644
index 0000000..1d4f25d
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_windows_server_2012_storage_server_and_foundation_x64_dvd_915793.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SFST_X64FREO_EN-US_DV5
+Volume set id: HRM_SFST_X64FREO_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1741405
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
diff --git a/test/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt b/test/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
new file mode 100644
index 0000000..8d439c7
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_windows_server_2012_vl_x64_dvd_917758.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SSS_X64FREV_EN-US_DV5
+Volume set id: HRM_SSS_X64FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1803767
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
diff --git a/test/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt b/test/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
new file mode 100644
index 0000000..e682bc5
--- /dev/null
+++ b/test/isodata/windows/win2k12/en_windows_server_2012_x64_dvd_915478.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_SSS_X64FRE_EN-US_DV5
+Volume set id: HRM_SSS_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1804287
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 863 2147
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:01 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:01 +0200
Subject: [Libosinfo] [PATCH 3/9] win: Add Windows Server 2012 R2 volume ids
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-4-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/windows.xml.in                           | 47 +++++++++++++++++++++-
 ...r_2012_r2_debug_checked_x64_dvd_2708216.iso.txt | 29 +++++++++++++
 ..._hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt | 29 +++++++++++++
 ...r_2012_r2_debug_checked_x64_dvd_2707937.iso.txt | 29 +++++++++++++
 ...ssentials_debug_checked_x64_dvd_2707170.iso.txt | 29 +++++++++++++
 ..._essentials_with_update_x64_dvd_6052824.iso.txt | 29 +++++++++++++
 ...rver_2012_r2_essentials_x64_dvd_2707177.iso.txt | 29 +++++++++++++
 ..._2012_r2_vl_with_update_x64_dvd_6052766.iso.txt | 29 +++++++++++++
 ...ndows_server_2012_r2_vl_x64_dvd_3319595.iso.txt | 29 +++++++++++++
 ...ver_2012_r2_with_update_x64_dvd_4065220.iso.txt | 29 +++++++++++++
 ...ver_2012_r2_with_update_x64_dvd_6052708.iso.txt | 29 +++++++++++++
 ...rver_2012_r2_foundation_x64_dvd_2708426.iso.txt | 29 +++++++++++++
 ..._foundation_with_update_x64_dvd_6052810.iso.txt | 29 +++++++++++++
 13 files changed, 394 insertions(+), 1 deletion(-)
 create mode 100644 test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
 create mode 100644 test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 5516a41..49043f7 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1102,11 +1102,56 @@
     <derives-from id="http://microsoft.com/win/2k12"/>
     <upgrades id="http://microsoft.com/win/2k12"/>
 
+    <variant id="storage">
+      <_name>Windows Server 2012 R2 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 R2 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 R2 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 R2 Volume License</_name>
+    </variant>
+
     <release-date>2013-10-18</release-date>
 
     <media arch="x86_64">
       <iso>
-        <volume-id>(IRM_SSS_X64FRE)_</volume-id>
+        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff --git a/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt b/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
new file mode 100644
index 0000000..934e7ef
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_debug_checked_x64_dvd_2708216.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SHV_X64CHK_EN-US_DV5
+Volume set id: IRM_SHV_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 940608
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt b/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
new file mode 100644
index 0000000..4ae6f79
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_microsoft_hyper-v_server_2012_r2_x64_dvd_2708236.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SHV_X64FRE_EN-US_DV5
+Volume set id: IRM_SHV_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 981556
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
new file mode 100644
index 0000000..76b9427
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_debug_checked_x64_dvd_2707937.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SSS_X64CHK_EN-US_DV5
+Volume set id: IRM_SSS_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2077379
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
new file mode 100644
index 0000000..d309efe
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_debug_checked_x64_dvd_2707170.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SSSO_X64CHK_EN-US_DV5
+Volume set id: IRM_SSSO_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1950182
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
new file mode 100644
index 0000000..1a3a2bc
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_with_update_x64_dvd_6052824.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_SSSO_X64FRE_EN-US_DV9
+Volume set id: IR5_SSSO_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2472408
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
new file mode 100644
index 0000000..49a1eca
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_essentials_x64_dvd_2707177.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SSSO_X64FRE_EN-US_DV5
+Volume set id: IRM_SSSO_X64FRE_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1976914
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
new file mode 100644
index 0000000..a361e3f
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_SSS_X64FREV_EN-US_DV9
+Volume set id: IR5_SSS_X64FREV_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2636775
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
new file mode 100644
index 0000000..2e0c2eb
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_vl_x64_dvd_3319595.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR2_SSS_X64FREV_EN-US_DV5
+Volume set id: IR2_SSS_X64FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2186310
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
new file mode 100644
index 0000000..717533d
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR3_SSS_X64FRE_EN-US_DV9
+Volume set id: IR3_SSS_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2218385
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
new file mode 100644
index 0000000..a5da1bf
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_SSS_X64FRE_EN-US_DV9
+Volume set id: IR5_SSS_X64FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2635688
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt b/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
new file mode 100644
index 0000000..adff0f1
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_and_windows_server_2012_r2_foundation_x64_dvd_2708426.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_SFST_X64FREO_EN-US_DV5
+Volume set id: IRM_SFST_X64FREO_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1976406
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
diff --git a/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt b/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
new file mode 100644
index 0000000..99dc8bc
--- /dev/null
+++ b/test/isodata/windows/win2k12r2/en_windows_storage_server_2012_r2_windows_server_2012_r2_foundation_with_update_x64_dvd_6052810.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR5_SFST_X64FREO_EN-US_DV9
+Volume set id: IR5_SFST_X64FREO_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2535998
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 876 2166
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:02 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:02 +0200
Subject: [Libosinfo] [PATCH 4/9] win: Add Windows 7 volume ids
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-5-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/windows.xml.in                           | 49 +++++++++++++++++++---
 ...ws_7_debug_checked_build_dvd_x64_398741.iso.txt | 29 +++++++++++++
 ...ws_7_debug_checked_build_dvd_x86_398742.iso.txt | 29 +++++++++++++
 ..._7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt | 29 +++++++++++++
 ..._7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt | 29 +++++++++++++
 ..._7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt | 29 +++++++++++++
 ..._windows_7_home_basic_x86_dvd_x15-65654.iso.txt | 29 +++++++++++++
 ...ome_premium_n_with_sp1_x64_dvd_u_676825.iso.txt | 29 +++++++++++++
 ...ome_premium_n_with_sp1_x86_dvd_u_676913.iso.txt | 29 +++++++++++++
 ...dows_7_home_premium_n_x64_dvd_x16-13459.iso.txt | 29 +++++++++++++
 ...dows_7_home_premium_n_x86_dvd_x16-13457.iso.txt | 29 +++++++++++++
 ..._home_premium_with_sp1_x86_dvd_u_676701.iso.txt | 29 +++++++++++++
 ...indows_7_home_premium_x64_dvd_x15-65733.iso.txt | 29 +++++++++++++
 ...indows_7_home_premium_x86_dvd_x15-65732.iso.txt | 29 +++++++++++++
 ...dows_7_professional_n_x64_dvd_x16-13550.iso.txt | 29 +++++++++++++
 ...dows_7_professional_n_x86_dvd_x16-13548.iso.txt | 29 +++++++++++++
 ...professional_vl_build_x64_dvd_x15-71037.iso.txt | 29 +++++++++++++
 ...professional_vl_build_x86_dvd_x15-71033.iso.txt | 29 +++++++++++++
 ...onal_with_sp1_vl_build_x64_dvd_u_677791.iso.txt | 29 +++++++++++++
 ...onal_with_sp1_vl_build_x86_dvd_u_677896.iso.txt | 29 +++++++++++++
 ...indows_7_professional_x86_dvd_x15-65804.iso.txt | 29 +++++++++++++
 ...s_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt | 29 +++++++++++++
 ...n_windows_7_starter_n_x86_dvd_x16-15928.iso.txt | 29 +++++++++++++
 .../en_windows_7_starter_x86_dvd_x15-68956.iso.txt | 29 +++++++++++++
 ..._windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt | 29 +++++++++++++
 ..._windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt | 29 +++++++++++++
 ...ws_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt | 29 +++++++++++++
 ..._sp1_debug_checked_build_x86_dvd_619602.iso.txt | 29 +++++++++++++
 28 files changed, 827 insertions(+), 5 deletions(-)
 create mode 100644 test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
 create mode 100644 test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 49043f7..6ed7be4 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -736,6 +736,9 @@
     <release-date>2009-10-22</release-date>
     <eol-date>2015-01-13</eol-date>
 
+    <variant id="debug">
+      <_name>Microsoft Windows 7 Debug Checked Build</_name>
+    </variant>
     <variant id="starter">
       <_name>Microsoft Windows 7 Starter</_name>
     </variant>
@@ -757,19 +760,55 @@
 
     <!-- Debug -->
     <media arch="i686" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCXCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Starter -->
+    <media arch="i686" installer-reboots="2">
       <variant id="starter"/>
       <iso>
-        <volume-id>(GSP1RMCSTFREO)_</volume-id>
+        <volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Home Basic -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-basic"/>
+      <iso>
+        <volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
     </media>
 
     <!-- Home Premium -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-premium"/>
+      <iso>
+        <volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
     <media arch="x86_64" installer-reboots="2">
       <variant id="home-premium"/>
       <iso>
-        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER)_</volume-id>
+        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -779,7 +818,7 @@
     <media arch="i686" installer-reboots="2">
       <variant id="professional"/>
       <iso>
-        <volume-id>(GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
+        <volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -787,7 +826,7 @@
     <media arch="x86_64" installer-reboots="2">
       <variant id="professional"/>
       <iso>
-        <volume-id>(GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
+        <volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
@@ -797,7 +836,7 @@
     <media arch="i686" installer-reboots="2">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL)_</volume-id>
+        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
       </iso>
diff --git a/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt b/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
new file mode 100644
index 0000000..d9852aa
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x64_398741.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCXCHK_EN_DVD
+Volume set id: GRMCXCHK_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1543824
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2E2 738
diff --git a/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt b/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
new file mode 100644
index 0000000..04a5825
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_debug_checked_build_dvd_x86_398742.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCCHK_EN_DVD
+Volume set id: GRMCCHK_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1189413
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2E3 739
diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
new file mode 100644
index 0000000..f0ebfb0
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x64_dvd_u_677651.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCENXVOL_EN_DVD
+Volume set id: GSP1RMCENXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1554006
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
new file mode 100644
index 0000000..7243fad
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCENVOL_EN_DVD
+Volume set id: GSP1RMCENVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1188722
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt b/test/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
new file mode 100644
index 0000000..65fa647
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_basic_with_sp1_x86_dvd_u_676470.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCHBFRER_EN_DVD
+Volume set id: GSP1RMCHBFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1252186
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt b/test/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
new file mode 100644
index 0000000..1e000e3
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_basic_x86_dvd_x15-65654.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCHBFRER_EN_DVD
+Volume set id: GRMCHBFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1221628
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
new file mode 100644
index 0000000..1838b04
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x64_dvd_u_676825.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCNHPXFRER_EN_DVD
+Volume set id: GSP1RMCNHPXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1452418
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
new file mode 100644
index 0000000..c24f2a9
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_n_with_sp1_x86_dvd_u_676913.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCNHPFRER_EN_DVD
+Volume set id: GSP1RMCNHPFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1108598
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
new file mode 100644
index 0000000..b8b4b27
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_n_x64_dvd_x16-13459.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNHPXFRER_EN_DVD
+Volume set id: GRMCNHPXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1420193
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
new file mode 100644
index 0000000..6fcda6f
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_n_x86_dvd_x16-13457.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNHPFRER_EN_DVD
+Volume set id: GRMCNHPFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1088204
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
new file mode 100644
index 0000000..a5fd5f4
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_with_sp1_x86_dvd_u_676701.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCHPFRER_EN_DVD
+Volume set id: GSP1RMCHPFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1252186
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
new file mode 100644
index 0000000..1f35e80
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_x64_dvd_x15-65733.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCHPXFRER_EN_DVD
+Volume set id: GRMCHPXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1574554
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt b/test/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
new file mode 100644
index 0000000..ed8aaf0
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_home_premium_x86_dvd_x15-65732.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCHPFRER_EN_DVD
+Volume set id: GRMCHPFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1221628
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
new file mode 100644
index 0000000..2d92088
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_n_x64_dvd_x16-13550.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNPRXFRER_EN_DVD
+Volume set id: GRMCNPRXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1420193
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
new file mode 100644
index 0000000..38cf354
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_n_x86_dvd_x16-13548.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNPRFRER_EN_DVD
+Volume set id: GRMCNPRFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1088204
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
new file mode 100644
index 0000000..cf39a8f
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_vl_build_x64_dvd_x15-71037.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCPRXVOL_EN_DVD
+Volume set id: GRMCPRXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1523954
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
new file mode 100644
index 0000000..1be0c47
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_vl_build_x86_dvd_x15-71033.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCPRVOL_EN_DVD
+Volume set id: GRMCPRVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1171992
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
new file mode 100644
index 0000000..8b6e3eb
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCPRXVOL_EN_DVD
+Volume set id: GSP1RMCPRXVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1554220
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
new file mode 100644
index 0000000..5079d7f
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCPRVOL_EN_DVD
+Volume set id: GSP1RMCPRVOL_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1188753
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt b/test/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
new file mode 100644
index 0000000..5e8cfaa
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_professional_x86_dvd_x15-65804.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCPRFRER_EN_DVD
+Volume set id: GRMCPRFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1221628
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt b/test/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
new file mode 100644
index 0000000..4deea6e
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_starter_n_with_sp1_x86_dvd_u_678339.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCNSTFREO_EN_DVD
+Volume set id: GSP1RMCNSTFREO_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1108598
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt b/test/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
new file mode 100644
index 0000000..d4d58f8
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_starter_n_x86_dvd_x16-15928.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNSTFREO_EN_DVD
+Volume set id: GRMCNSTFREO_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1088204
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt b/test/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
new file mode 100644
index 0000000..72a176a
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_starter_x86_dvd_x15-68956.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCSTFREO_EN_DVD
+Volume set id: GRMCSTFREO_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1221628
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
new file mode 100644
index 0000000..fafea58
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_n_x64_dvd_x16-13641.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNULXFRER_EN_DVD
+Volume set id: GRMCNULXFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1420193
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DE 734
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
new file mode 100644
index 0000000..cb98a99
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_n_x86_dvd_x16-13640.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCNULFRER_EN_DVD
+Volume set id: GRMCNULFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1088204
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt b/test/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
new file mode 100644
index 0000000..e4537ee
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_ultimate_with_sp1_x86_dvd_u_677460.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GSP1RMCULFRER_EN_DVD
+Volume set id: GSP1RMCULFRER_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1252186
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2DF 735
diff --git a/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt b/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
new file mode 100644
index 0000000..b661d5d
--- /dev/null
+++ b/test/isodata/windows/win7/en_windows_7_with_sp1_debug_checked_build_x86_dvd_619602.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: GRMCCHK_EN_DVD
+Volume set id: GRMCCHK_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
+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: 1193100
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 2E3 739
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:07 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:07 +0200
Subject: [Libosinfo] [PATCH 9/9] fedora: Add Fedora 20 for PowerPC volume id
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-10-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/fedora.xml.in                                  |  9 +++++++++
 .../fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt      | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 test/isodata/fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt

diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
index b81f3c9..cddb969 100644
--- a/data/oses/fedora.xml.in
+++ b/data/oses/fedora.xml.in
@@ -3812,6 +3812,15 @@
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
     </media>
+    <media arch="ppc64">
+      <url>http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso</url>
+
+      <iso>
+        <volume-id>Fedora_20_ppc64</volume-id>
+        <system-id>PPC</system-id>
+        <volume-size>356321280</volume-size>
+      </iso>
+    </media>
 
     <!-- GNOME -->
     <media arch="i686" live="true">
diff --git a/test/isodata/fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt b/test/isodata/fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt
new file mode 100644
index 0000000..b4aa081
--- /dev/null
+++ b/test/isodata/fedora/fedora20/Fedora-20-ppc64-netinst.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: PPC
+Volume id: Fedora_20_ppc64
+Volume set id: 20
+Publisher id: 
+Data preparer id: 
+Application id: Fedora 20
+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: 173985
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:03 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:03 +0200
Subject: [Libosinfo] [PATCH 5/9] win: Add more Windows 8 test cases
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-6-git-send-email-cfergeau@redhat.com>

These ISOs are already covered by libosinfo volume ids.

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 ...b_windows_8_enterprise_n_x64_dvd_918053.iso.txt | 29 ++++++++++++++++++++++
 ...b_windows_8_enterprise_n_x86_dvd_918708.iso.txt | 29 ++++++++++++++++++++++
 ...-gb_windows_8_enterprise_x64_dvd_922086.iso.txt | 29 ++++++++++++++++++++++
 ...-gb_windows_8_enterprise_x86_dvd_917588.iso.txt | 29 ++++++++++++++++++++++
 .../win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt  | 29 ++++++++++++++++++++++
 .../win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt  | 29 ++++++++++++++++++++++
 ...en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt | 29 ++++++++++++++++++++++
 ...en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt | 29 ++++++++++++++++++++++
 .../en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt  | 29 ++++++++++++++++++++++
 .../en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt  | 29 ++++++++++++++++++++++
 .../win8/en-gb_windows_8_x64_dvd_915412.iso.txt    | 29 ++++++++++++++++++++++
 11 files changed, 319 insertions(+)
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
 create mode 100644 test/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt

diff --git a/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
new file mode 100644
index 0000000..e0f9d78
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x64_dvd_918053.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CENNA_X64FREV_EN-GB_DV5
+Volume set id: HRM_CENNA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1613107
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
diff --git a/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
new file mode 100644
index 0000000..65476f8
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_enterprise_n_x86_dvd_918708.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CENNA_X86FREV_EN-GB_DV5
+Volume set id: HRM_CENNA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1174517
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B8 1464
diff --git a/test/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
new file mode 100644
index 0000000..04274b8
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_enterprise_x64_dvd_922086.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CENA_X64FREV_EN-GB_DV5
+Volume set id: HRM_CENA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1669449
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
diff --git a/test/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
new file mode 100644
index 0000000..1befd89
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_enterprise_x86_dvd_917588.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CENA_X86FREV_EN-GB_DV5
+Volume set id: HRM_CENA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1210639
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B8 1464
diff --git a/test/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
new file mode 100644
index 0000000..f157359
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_n_x64_dvd_915799.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CCSNA_X64FRE_EN-GB_DV5
+Volume set id: HRM_CCSNA_X64FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1629459
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
diff --git a/test/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
new file mode 100644
index 0000000..a5aee98
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_n_x86_dvd_916086.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CCSNA_X86FRE_EN-GB_DV5
+Volume set id: HRM_CCSNA_X86FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1187670
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B8 1464
diff --git a/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
new file mode 100644
index 0000000..5245fac
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x64_dvd_918679.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CPRNA_X64FREV_EN-GB_DV5
+Volume set id: HRM_CPRNA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1611750
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
diff --git a/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
new file mode 100644
index 0000000..d86d2eb
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_pro_n_vl_x86_dvd_918878.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CPRNA_X86FREV_EN-GB_DV5
+Volume set id: HRM_CPRNA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1173386
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B8 1464
diff --git a/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
new file mode 100644
index 0000000..c5ffd75
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x64_dvd_917700.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CPRA_X64FREV_EN-GB_DV5
+Volume set id: HRM_CPRA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1668094
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
diff --git a/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
new file mode 100644
index 0000000..b553868
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_pro_vl_x86_dvd_917831.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CPRA_X86FREV_EN-GB_DV5
+Volume set id: HRM_CPRA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1209531
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B8 1464
diff --git a/test/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt b/test/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
new file mode 100644
index 0000000..a1d2c65
--- /dev/null
+++ b/test/isodata/windows/win8/en-gb_windows_8_x64_dvd_915412.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: HRM_CCSA_X64FRE_EN-GB_DV5
+Volume set id: HRM_CCSA_X64FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1714218
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86C 2156
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:05 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:05 +0200
Subject: [Libosinfo] [PATCH 7/9] freebsd: Add FreeBSD 10.1 volume id
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-8-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/freebsd.xml.in                           | 25 +++++++++++++++++++
 .../FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt        | 29 ++++++++++++++++++++++
 test/test-isodetect.c                              |  7 ++++++
 3 files changed, 61 insertions(+)
 create mode 100644 test/isodata/freebsd/freebsd10.1/FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt

diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in
index d8f45b5..59c84d8 100644
--- a/data/oses/freebsd.xml.in
+++ b/data/oses/freebsd.xml.in
@@ -606,5 +606,30 @@
     </devices>
   </os>
 
+  <os id="http://freebsd.org/freebsd/10.1">
+    <short-id>freebsd10.1</short-id>
+    <_name>FreeBSD 10.1</_name>
+    <version>10.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/10.0"/>
+    <derives-from id="http://freebsd.org/freebsd/10.0"/>
+
+    <release-date>2014-11-14</release-date>
+    <eol-date>2016-12-31</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>FreeBSD</system-id>
+        <volume-id>10_1_RELEASE_AMD64_DVD</volume-id>
+      </iso>
+    </media>
+  </os>
 
 </libosinfo>
diff --git a/test/isodata/freebsd/freebsd10.1/FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt b/test/isodata/freebsd/freebsd10.1/FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt
new file mode 100644
index 0000000..3116f4d
--- /dev/null
+++ b/test/isodata/freebsd/freebsd10.1/FreeBSD-10.1-RELEASE-amd64-dvd1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: FreeBSD
+Volume id: 10_1_RELEASE_AMD64_DVD
+Volume set id: 
+Publisher id: THE FREEBSD PROJECT.  HTTP://WWW.FREEBSD.ORG/
+Data preparer id: 
+Application id: 
+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: 1262071
+El Torito VD version 1 found, boot catalog is in sector 19
+NO Joliet present
+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 14 20
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 9b391b3..b48d8fb 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -382,6 +382,12 @@ START_TEST(test_windows)
 }
 END_TEST
 
+START_TEST(test_freebsd)
+{
+    test_one("freebsd");
+}
+END_TEST
+
 START_TEST(test_openbsd)
 {
     test_one("openbsd");
@@ -442,6 +448,7 @@ list_suite(void)
     tcase_add_test(tc, test_ubuntu);
     tcase_add_test(tc, test_debian);
     tcase_add_test(tc, test_windows);
+    tcase_add_test(tc, test_freebsd);
     tcase_add_test(tc, test_openbsd);
     tcase_add_test(tc, test_opensuse);
     tcase_add_test(tc, test_centos);
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:06 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:06 +0200
Subject: [Libosinfo] [PATCH 8/9] centos: Add CentOS 6.3 Live volume id
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-9-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/centos.xml.in                            |  8 ++++++
 .../centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt    | 29 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 test/isodata/centos/centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt

diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
index 3c79918..15d9895 100644
--- a/data/oses/centos.xml.in
+++ b/data/oses/centos.xml.in
@@ -165,6 +165,14 @@
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
     </media>
+    <media arch="x86_64" live="true">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-6.3-x86_64-LiveDVD</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
 
     <resources arch="all">
       <minimum>
diff --git a/test/isodata/centos/centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt b/test/isodata/centos/centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt
new file mode 100644
index 0000000..bfa6623
--- /dev/null
+++ b/test/isodata/centos/centos6.3/CentOS-6.3-x86_64-LiveDVD.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: CentOS-6.3-x86_64-LiveDVD
+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: 860127
+El Torito VD version 1 found, boot catalog is in sector 40
+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 29 41
-- 
2.4.3



From cfergeau at redhat.com  Fri Sep 11 16:22:04 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Fri, 11 Sep 2015 18:22:04 +0200
Subject: [Libosinfo] [PATCH 6/9] win: Add Windows 8.1 volume ids
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1441988527-2917-7-git-send-email-cfergeau@redhat.com>

Data provided by John Snow in
https://bugzilla.redhat.com/show_bug.cgi?id=1212599
---
 data/oses/windows.xml.in                           | 86 ++++++++++++++++++++++
 ...indows_8_1_enterprise_n_x64_dvd_2971847.iso.txt | 29 ++++++++
 ...indows_8_1_enterprise_n_x86_dvd_2971852.iso.txt | 29 ++++++++
 ..._windows_8_1_enterprise_x64_dvd_2971910.iso.txt | 29 ++++++++
 ..._windows_8_1_enterprise_x86_dvd_2972291.iso.txt | 29 ++++++++
 .../en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt    | 29 ++++++++
 .../en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt    | 29 ++++++++
 ...gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt | 29 ++++++++
 ...gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt | 29 ++++++++
 ...n-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt | 29 ++++++++
 ...n-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt | 29 ++++++++
 .../en-gb_windows_8_1_x64_dvd_2707421.iso.txt      | 29 ++++++++
 .../en-gb_windows_8_1_x86_dvd_2707543.iso.txt      | 29 ++++++++
 ...nterprise_n_with_update_x64_dvd_4065163.iso.txt | 29 ++++++++
 ...ndows_8_1_debug_checked_x64_dvd_2707208.iso.txt | 29 ++++++++
 ...ndows_8_1_debug_checked_x86_dvd_2707387.iso.txt | 29 ++++++++
 ...nterprise_debug_checked_x64_dvd_2756358.iso.txt | 29 ++++++++
 ...nterprise_debug_checked_x86_dvd_2756359.iso.txt | 29 ++++++++
 ...erprise_n_debug_checked_x64_dvd_2942525.iso.txt | 29 ++++++++
 ...erprise_n_debug_checked_x86_dvd_2942527.iso.txt | 29 ++++++++
 ...indows_8_1_enterprise_n_x64_dvd_2971845.iso.txt | 29 ++++++++
 ...indows_8_1_enterprise_n_x86_dvd_2971850.iso.txt | 29 ++++++++
 ..._windows_8_1_enterprise_x86_dvd_2972289.iso.txt | 29 ++++++++
 ...ows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt | 29 ++++++++
 ...ows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt | 29 ++++++++
 ...en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt | 29 ++++++++
 ...en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt | 29 ++++++++
 .../en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt  | 29 ++++++++
 .../en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt  | 29 ++++++++
 29 files changed, 898 insertions(+)
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 6ed7be4..9ab420c 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1026,6 +1026,92 @@
     <eol-date></eol-date>
 -->
 
+    <variant id="debug">
+      <_name>Microsoft Windows 8.1 Debug Checked Build</_name>
+    </variant>
+    <variant id="enterprise-debug">
+      <_name>Microsoft Windows 8.1 Enterprise Debug Checked Build</_name>
+    </variant>
+    <variant id="professional">
+      <_name>Microsoft Windows 8.1 Professional</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 8.1 Enterprise</_name>
+    </variant>
+
+    <!-- Debug -->
+    <media arch="i686">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise Debug -->
+    <media arch="i686">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Professional -->
+    <media arch="i686">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR1_CENNA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR[13]_CENNA_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Variant unknown -->
     <media arch="i686">
       <iso>
         <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
new file mode 100644
index 0000000..b217bde
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x64_dvd_2971847.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENNA_X64FREV_EN-GB_DV5
+Volume set id: IR1_CENNA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1812292
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
new file mode 100644
index 0000000..04fd490
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_n_x86_dvd_2971852.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENNA_X86FREV_EN-GB_DV5
+Volume set id: IR1_CENNA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1369589
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
new file mode 100644
index 0000000..5130b2e
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x64_dvd_2971910.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENA_X64FREV_EN-GB_DV5
+Volume set id: IR1_CENA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1884892
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
new file mode 100644
index 0000000..6504185
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_enterprise_x86_dvd_2972291.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENA_X86FREV_EN-GB_DV5
+Volume set id: IR1_CENA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1419097
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
new file mode 100644
index 0000000..2b46cdd
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x64_dvd_2707898.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSNA_X64FRE_EN-GB_DV5
+Volume set id: IRM_CCSNA_X64FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1813111
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
new file mode 100644
index 0000000..a91fb78
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_n_x86_dvd_2707897.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSNA_X86FRE_EN-GB_DV5
+Volume set id: IRM_CCSNA_X86FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1355762
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
new file mode 100644
index 0000000..112be95
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x64_dvd_2971976.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRNA_X64FREV_EN-GB_DV5
+Volume set id: IR1_CPRNA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1809980
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
new file mode 100644
index 0000000..e0e0fb4
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_n_vl_x86_dvd_2972710.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRNA_X86FREV_EN-GB_DV5
+Volume set id: IR1_CPRNA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1368708
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
new file mode 100644
index 0000000..c6510c6
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x64_dvd_2971955.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRA_X64FREV_EN-GB_DV5
+Volume set id: IR1_CPRA_X64FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1882827
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
new file mode 100644
index 0000000..0ae0dd3
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_pro_vl_x86_dvd_2972634.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRA_X86FREV_EN-GB_DV5
+Volume set id: IR1_CPRA_X86FREV_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1417857
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
new file mode 100644
index 0000000..9e5680c
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_x64_dvd_2707421.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSA_X64FRE_EN-GB_DV5
+Volume set id: IRM_CCSA_X64FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1906311
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt b/test/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
new file mode 100644
index 0000000..03775bd
--- /dev/null
+++ b/test/isodata/windows/win8.1/en-gb_windows_8_1_x86_dvd_2707543.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSA_X86FRE_EN-GB_DV5
+Volume set id: IRM_CCSA_X86FRE_EN-GB_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1425756
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
new file mode 100644
index 0000000..c18c734
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_n_with_update_x64_dvd_4065163.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR3_CENNA_X64FREV_EN-US_DV9
+Volume set id: IR3_CENNA_X64FREV_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1848910
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
new file mode 100644
index 0000000..7ae49a6
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x64_dvd_2707208.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSA_X64CHK_EN-US_DV5
+Volume set id: IRM_CCSA_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1846895
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
new file mode 100644
index 0000000..7bc31d6
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_debug_checked_x86_dvd_2707387.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSA_X86CHK_EN-US_DV5
+Volume set id: IRM_CCSA_X86CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1359561
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
new file mode 100644
index 0000000..e90fad9
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x64_dvd_2756358.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CENA_X64CHKV_EN-US_DV5
+Volume set id: IRM_CENA_X64CHKV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1800500
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
new file mode 100644
index 0000000..b203140
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_debug_checked_x86_dvd_2756359.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CENA_X86CHKV_EN-US_DV5
+Volume set id: IRM_CENA_X86CHKV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1318362
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
new file mode 100644
index 0000000..fe1cd97
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x64_dvd_2942525.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CENNA_X64CHKV_EN-US_DV5
+Volume set id: IRM_CENNA_X64CHKV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1733308
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
new file mode 100644
index 0000000..1557fff
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_debug_checked_x86_dvd_2942527.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CENNA_X86CHKV_EN-US_DV5
+Volume set id: IRM_CENNA_X86CHKV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1273074
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
new file mode 100644
index 0000000..81121a2
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x64_dvd_2971845.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENNA_X64FREV_EN-US_DV5
+Volume set id: IR1_CENNA_X64FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1810146
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
new file mode 100644
index 0000000..5e26b7b
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_n_x86_dvd_2971850.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENNA_X86FREV_EN-US_DV5
+Volume set id: IR1_CENNA_X86FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1366994
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
new file mode 100644
index 0000000..3574500
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_enterprise_x86_dvd_2972289.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CENA_X86FREV_EN-US_DV5
+Volume set id: IR1_CENA_X86FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1417237
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
new file mode 100644
index 0000000..231e310
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x64_dvd_2707894.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSNA_X64CHK_EN-US_DV5
+Volume set id: IRM_CCSNA_X64CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1750702
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
new file mode 100644
index 0000000..80a95ae
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_n_debug_checked_x86_dvd_2707893.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IRM_CCSNA_X86CHK_EN-US_DV5
+Volume set id: IRM_CCSNA_X86CHK_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1286780
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
new file mode 100644
index 0000000..54669ab
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x64_dvd_2971969.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRNA_X64FREV_EN-US_DV5
+Volume set id: IR1_CPRNA_X64FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1808341
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
new file mode 100644
index 0000000..9244da0
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_n_vl_x86_dvd_2972709.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRNA_X86FREV_EN-US_DV5
+Volume set id: IR1_CPRNA_X86FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1366161
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
new file mode 100644
index 0000000..a94510a
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x64_dvd_2971948.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRA_X64FREV_EN-US_DV5
+Volume set id: IR1_CPRA_X64FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1880929
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
new file mode 100644
index 0000000..85364fc
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8_1_pro_vl_x86_dvd_2972633.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: IR1_CPRA_X86FREV_EN-US_DV5
+Volume set id: IR1_CPRA_X86FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1416441
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
-- 
2.4.3



From zeeshanak at gnome.org  Thu Sep 17 12:01:35 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Thu, 17 Sep 2015 13:01:35 +0100
Subject: [Libosinfo] [PATCH 0/9] Add volume IDs from rhbz#1212599
In-Reply-To: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFM56Fmz0Lv4ErazJ+6HE0zWfRmrwsMvGAPpDdx45Ttcqw@mail.gmail.com>

Hi,

On Fri, Sep 11, 2015 at 5:21 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1212599 has a lot of test files
> which are not currently identified by libosinfo. This patch series adds most of
> these.

Series looks good to me. One minor nitpick though: If you could write
"ID" instead of "id" and even "IDs" instead of "Ids", it would be best
IMHO. ACK either way.

> One thing which I was not always sure about is what to make a Windows variant
> and what not. There are Debug Checked builds, Volume Licences builds, 'N'
> versions (without Windows Media Player), "with Updates" ISOs, ...
> Some of these I made first class variants, others I did not, but this was a bit
> arbitrary ;)

Ideally I guess they are all variants but not sure we need to be so
specific, unless the info is needed by installer scripts.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From berrange at redhat.com  Thu Sep 17 12:45:49 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 17 Sep 2015 13:45:49 +0100
Subject: [Libosinfo] RFC: Splitting off database into separate package
In-Reply-To: <20150724155457.GW6880@redhat.com>
References: <20150722104623.GF12010@redhat.com>
	<20150724145034.GG6048@edamame.cdg.redhat.com>
	<20150724155457.GW6880@redhat.com>
Message-ID: <20150917124549.GB32498@redhat.com>

On Fri, Jul 24, 2015 at 04:54:57PM +0100, Daniel P. Berrange wrote:
> On Fri, Jul 24, 2015 at 04:50:34PM +0200, Christophe Fergeau wrote:
> > >  - Should we restructure the database ?
> > > 
> > >    eg, we have a single data/oses/fedora.xml file that contains
> > >    the data for every Fedora release. This is already 200kb in
> > >    size and will grow forever. If we split up all the files
> > >    so there is only ever one entity (os, hypervisor, device, etc)
> > >    in each XML file, each file will be smaller in size. This would
> > >    also let us potentially do database minimization. eg we could
> > >    provide a download that contains /all/ OS, and another download
> > >    that contains only non-end-of-life OS.
> > 
> > I was about to make the same comment as Zeeshan, GNOME has had issues in
> > the past with data scattered among too many small files, in general this
> > is solved by adding a cache file containing a concatenated version of
> > all the files (possibly pre-parsed to some domain-specific format).
> 
> If we can avoid loading the entire database, and only load the subset
> of files we want info on, we'd hopefully not have such problems. I
> could see benefit in having some "index" file perhaps which says
> which entity is defined in which file, as a way to avoid dictating
> a filename/dirname convention.

FYI, I wrote a simple perl script to process our current XML files
and split them up into 1 file per entity... This resulted in 438
individual XML files.

I timed libosinfo speed of loading the database with the current
database structure, and with the split structure. There as no
measurable difference in load time. I repeated  using vm.drop_caches=3
to clear the FS cache between timing, and still found no difference
in load time. So I think our load time is not dominated by the
number of files we have - most likely the XML parsing & object
allocation is our main timesink.

FWIW, with warm cache it was ~250ms, with cold cache it was 1.9s, though
in the latter number I don't know how much of that time is from loading
the ELF libraries, vs the database. Anyway, it wasn't different according
to file split.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Sep 17 13:06:31 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 17 Sep 2015 14:06:31 +0100
Subject: [Libosinfo] Restructuring loading of the database
Message-ID: <20150917130631.GI24971@redhat.com>

As mentioned previously I'd like us to move towards splitting the database
off from the code

  https://www.redhat.com/archives/libosinfo/2015-July/msg00010.html

There were many items in that mail, but the one I want to address first
is the database file/dir structure and the way we load it.

Currently we have 3 locations we'll load from by default:

 - System path (aka $INSTALL_PREFIX/share/libosinfo/db)
 - Local path (aka $INSTALL_PREFIX/etc/libosinfo/db)
 - User path  (aka $XDG_CONFIG_DIR/libosinfo/db - usually $HOME/.config)

We we process each directory in that order, and load all XML files we
find there. We have subdirectories for different types of entity, but
this is merely by convention, there is nothing in the loader code that
requires these named subdirectories.

If there are XML files that use the same entity ID in multiple directories
we are entirely additive.

eg if there is some extra info you want to record against an operating
system, you can put it in $HOME/.config/libosinfo/db and it will extend
the information already defined in /usr/share/libosinfo/db for that
operating system.

libosinfo attributes are all multi-valued, so if you define a new value
for the an existing attribute, it is added to what's already there. There
is no mechanism to either remove data already defined, or to replace data.

When thinking about alternative ideas, I realized that systemd has already
figured out a nice solution to this probem. Given a file "foo.unit" in
/lib/systemd/system/, if you create a file 'foo.unit' in /etc/systemd/system
it will completely replace the earlier defined unit. If you create a file
'foo-custom.conf' in /etc/system/system/foo.unit.d, it will augment the
earlier defined unit. If you create a symlink /etc/systemd/system/foo.unit
pointing to /dev/null, it will completely delete the previously defined
unit.

This works nicely, assuming you have one entity being defined per file.
So I'm suggesting we rework libosinfo to follow a similar scheme.

 - One file per entity being defined.
 - The filename for an entity becomes part of the ABI of the database.
 - To completely replace an entity create a new file with the smae name
 - To augment the existing entity, create a file in a $FILE.d directory
 - To delete a previously entity, create a file symlinked to /dev/null.

So, eg considering "fedora-20" entity:

 - Master file /usr/share/libosinfo/db/os/fedora-20.xml
 - Replace it with /etc/libosinfo/db/os/fedora-20.xml
 - Augment it with /etc/libosinfo/db/os/fedora-20.d/foo.xml
 - Delete it with  /etc/libosinfo/db/os/fedora-20.d/foo.xml -> /dev/null

I think we can do this without creating serious backcompat problems
with existing loader code, as we're not changing the XML schema. Existing
code will treat all files as augmenting existing info, so won't handle
the replace/delete semantics, but that's no worse than what they have
today.

The only real question I have is whether we should define a formal
naming convention for the files. We could define a mapping based on
the ID URI for an entity. eg

  <os id="http://fedoraproject.org/fedora/20">

Goes into a file

   fedoraproject.org-fedora-20.xml

ie replace all non-a-Z0-9 characters in the URI with a -. This works
but I feel it isn't too user friendly, because the filenames get
pretty long. We could use the short-id defined for operating systems,
but other entity types don't have short-ids, and also there can be
multiple short-ids.

So at this point my inclination, is to not have a formal requirement
for the file name. Simply a suggestion that the filename be like the
short-id or equivalent. The only requirement would be that we must
*NEVER* change the filename for a given entity once it is defined.
This ensures local user overrides for an entity, don't break when
the master database is updated.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From berrange at redhat.com  Thu Sep 17 16:38:44 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Thu, 17 Sep 2015 17:38:44 +0100
Subject: [Libosinfo] Restructuring loading of the database
In-Reply-To: <20150917130631.GI24971@redhat.com>
References: <20150917130631.GI24971@redhat.com>
Message-ID: <20150917163844.GY24971@redhat.com>

On Thu, Sep 17, 2015 at 02:06:31PM +0100, Daniel P. Berrange wrote:
> As mentioned previously I'd like us to move towards splitting the database
> off from the code
> 
>   https://www.redhat.com/archives/libosinfo/2015-July/msg00010.html
> 
> There were many items in that mail, but the one I want to address first
> is the database file/dir structure and the way we load it.
> 
> Currently we have 3 locations we'll load from by default:
> 
>  - System path (aka $INSTALL_PREFIX/share/libosinfo/db)
>  - Local path (aka $INSTALL_PREFIX/etc/libosinfo/db)
>  - User path  (aka $XDG_CONFIG_DIR/libosinfo/db - usually $HOME/.config)
> 
> We we process each directory in that order, and load all XML files we
> find there. We have subdirectories for different types of entity, but
> this is merely by convention, there is nothing in the loader code that
> requires these named subdirectories.
> 
> If there are XML files that use the same entity ID in multiple directories
> we are entirely additive.
> 
> eg if there is some extra info you want to record against an operating
> system, you can put it in $HOME/.config/libosinfo/db and it will extend
> the information already defined in /usr/share/libosinfo/db for that
> operating system.
> 
> libosinfo attributes are all multi-valued, so if you define a new value
> for the an existing attribute, it is added to what's already there. There
> is no mechanism to either remove data already defined, or to replace data.
> 
> When thinking about alternative ideas, I realized that systemd has already
> figured out a nice solution to this probem. Given a file "foo.unit" in
> /lib/systemd/system/, if you create a file 'foo.unit' in /etc/systemd/system
> it will completely replace the earlier defined unit. If you create a file
> 'foo-custom.conf' in /etc/system/system/foo.unit.d, it will augment the
> earlier defined unit. If you create a symlink /etc/systemd/system/foo.unit
> pointing to /dev/null, it will completely delete the previously defined
> unit.
> 
> This works nicely, assuming you have one entity being defined per file.
> So I'm suggesting we rework libosinfo to follow a similar scheme.
> 
>  - One file per entity being defined.
>  - The filename for an entity becomes part of the ABI of the database.
>  - To completely replace an entity create a new file with the smae name
>  - To augment the existing entity, create a file in a $FILE.d directory
>  - To delete a previously entity, create a file symlinked to /dev/null.
> 
> So, eg considering "fedora-20" entity:
> 
>  - Master file /usr/share/libosinfo/db/os/fedora-20.xml
>  - Replace it with /etc/libosinfo/db/os/fedora-20.xml
>  - Augment it with /etc/libosinfo/db/os/fedora-20.d/foo.xml
>  - Delete it with  /etc/libosinfo/db/os/fedora-20.d/foo.xml -> /dev/null
> 
> I think we can do this without creating serious backcompat problems
> with existing loader code, as we're not changing the XML schema. Existing
> code will treat all files as augmenting existing info, so won't handle
> the replace/delete semantics, but that's no worse than what they have
> today.
> 
> The only real question I have is whether we should define a formal
> naming convention for the files. We could define a mapping based on
> the ID URI for an entity. eg
> 
>   <os id="http://fedoraproject.org/fedora/20">
> 
> Goes into a file
> 
>    fedoraproject.org-fedora-20.xml
> 
> ie replace all non-a-Z0-9 characters in the URI with a -. This works
> but I feel it isn't too user friendly, because the filenames get
> pretty long. We could use the short-id defined for operating systems,
> but other entity types don't have short-ids, and also there can be
> multiple short-ids.
> 
> So at this point my inclination, is to not have a formal requirement
> for the file name. Simply a suggestion that the filename be like the
> short-id or equivalent. The only requirement would be that we must
> *NEVER* change the filename for a given entity once it is defined.
> This ensures local user overrides for an entity, don't break when
> the master database is updated.

An alternative way would be to allow 'short-id' against any type of
entity, not just OsinfoProduct subclasses, and then say that the
first short-id listed in the file must be used as the name. This is
somewhat appealing to me, as it gives clear guidance on naming.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|



From zeeshanak at gnome.org  Tue Sep 22 13:28:49 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Tue, 22 Sep 2015 14:28:49 +0100
Subject: [Libosinfo] Restructuring loading of the database
In-Reply-To: <20150917163844.GY24971@redhat.com>
References: <20150917130631.GI24971@redhat.com>
	<20150917163844.GY24971@redhat.com>
Message-ID: <CAAa3hFPPUP=X5c+WYc+5HBnV-vayABa_x829MT5UXrU652_uNg@mail.gmail.com>

Hi Daniel,

On Thu, Sep 17, 2015 at 5:38 PM, Daniel P. Berrange <berrange at redhat.com> wrote:
> On Thu, Sep 17, 2015 at 02:06:31PM +0100, Daniel P. Berrange wrote:
>> As mentioned previously I'd like us to move towards splitting the database
>> off from the code
>>
>>   https://www.redhat.com/archives/libosinfo/2015-July/msg00010.html
>>
>> There were many items in that mail, but the one I want to address first
>> is the database file/dir structure and the way we load it.
>>
>> Currently we have 3 locations we'll load from by default:
>>
>>  - System path (aka $INSTALL_PREFIX/share/libosinfo/db)
>>  - Local path (aka $INSTALL_PREFIX/etc/libosinfo/db)
>>  - User path  (aka $XDG_CONFIG_DIR/libosinfo/db - usually $HOME/.config)
>>
>> We we process each directory in that order, and load all XML files we
>> find there. We have subdirectories for different types of entity, but
>> this is merely by convention, there is nothing in the loader code that
>> requires these named subdirectories.
>>
>> If there are XML files that use the same entity ID in multiple directories
>> we are entirely additive.
>>
>> eg if there is some extra info you want to record against an operating
>> system, you can put it in $HOME/.config/libosinfo/db and it will extend
>> the information already defined in /usr/share/libosinfo/db for that
>> operating system.
>>
>> libosinfo attributes are all multi-valued, so if you define a new value
>> for the an existing attribute, it is added to what's already there. There
>> is no mechanism to either remove data already defined, or to replace data.
>>
>> When thinking about alternative ideas, I realized that systemd has already
>> figured out a nice solution to this probem. Given a file "foo.unit" in
>> /lib/systemd/system/, if you create a file 'foo.unit' in /etc/systemd/system
>> it will completely replace the earlier defined unit. If you create a file
>> 'foo-custom.conf' in /etc/system/system/foo.unit.d, it will augment the
>> earlier defined unit. If you create a symlink /etc/systemd/system/foo.unit
>> pointing to /dev/null, it will completely delete the previously defined
>> unit.
>>
>> This works nicely, assuming you have one entity being defined per file.
>> So I'm suggesting we rework libosinfo to follow a similar scheme.
>>
>>  - One file per entity being defined.
>>  - The filename for an entity becomes part of the ABI of the database.
>>  - To completely replace an entity create a new file with the smae name
>>  - To augment the existing entity, create a file in a $FILE.d directory
>>  - To delete a previously entity, create a file symlinked to /dev/null.
>>
>> So, eg considering "fedora-20" entity:
>>
>>  - Master file /usr/share/libosinfo/db/os/fedora-20.xml
>>  - Replace it with /etc/libosinfo/db/os/fedora-20.xml
>>  - Augment it with /etc/libosinfo/db/os/fedora-20.d/foo.xml
>>  - Delete it with  /etc/libosinfo/db/os/fedora-20.d/foo.xml -> /dev/null
>>
>> I think we can do this without creating serious backcompat problems
>> with existing loader code, as we're not changing the XML schema. Existing
>> code will treat all files as augmenting existing info, so won't handle
>> the replace/delete semantics, but that's no worse than what they have
>> today.
>>
>> The only real question I have is whether we should define a formal
>> naming convention for the files. We could define a mapping based on
>> the ID URI for an entity. eg
>>
>>   <os id="http://fedoraproject.org/fedora/20">
>>
>> Goes into a file
>>
>>    fedoraproject.org-fedora-20.xml
>>
>> ie replace all non-a-Z0-9 characters in the URI with a -. This works
>> but I feel it isn't too user friendly, because the filenames get
>> pretty long. We could use the short-id defined for operating systems,
>> but other entity types don't have short-ids, and also there can be
>> multiple short-ids.
>>
>> So at this point my inclination, is to not have a formal requirement
>> for the file name. Simply a suggestion that the filename be like the
>> short-id or equivalent. The only requirement would be that we must
>> *NEVER* change the filename for a given entity once it is defined.
>> This ensures local user overrides for an entity, don't break when
>> the master database is updated.
>
> An alternative way would be to allow 'short-id' against any type of
> entity, not just OsinfoProduct subclasses, and then say that the
> first short-id listed in the file must be used as the name. This is
> somewhat appealing to me, as it gives clear guidance on naming.

Yeah, this sounds better to me too.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Wed Sep 23 08:44:34 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 23 Sep 2015 10:44:34 +0200
Subject: [Libosinfo] [PATCH 0/9] Add volume IDs from rhbz#1212599
In-Reply-To: <CAAa3hFM56Fmz0Lv4ErazJ+6HE0zWfRmrwsMvGAPpDdx45Ttcqw@mail.gmail.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
	<CAAa3hFM56Fmz0Lv4ErazJ+6HE0zWfRmrwsMvGAPpDdx45Ttcqw@mail.gmail.com>
Message-ID: <20150923084434.GB4739@edamame.cdg.redhat.com>

On Thu, Sep 17, 2015 at 01:01:35PM +0100, Zeeshan Ali (Khattak) wrote:
> Hi,
> 
> On Fri, Sep 11, 2015 at 5:21 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > https://bugzilla.redhat.com/show_bug.cgi?id=1212599 has a lot of test files
> > which are not currently identified by libosinfo. This patch series adds most of
> > these.
> 
> Series looks good to me. One minor nitpick though: If you could write
> "ID" instead of "id" and even "IDs" instead of "Ids", it would be best
> IMHO. ACK either way.

Changed and pushed, thanks.

> 
> > One thing which I was not always sure about is what to make a Windows variant
> > and what not. There are Debug Checked builds, Volume Licences builds, 'N'
> > versions (without Windows Media Player), "with Updates" ISOs, ...
> > Some of these I made first class variants, others I did not, but this was a bit
> > arbitrary ;)
> 
> Ideally I guess they are all variants but not sure we need to be so
> specific, unless the info is needed by installer scripts.

My goal would be to show the same label in libosinfo as the one on the
Windows box/CD, even if the distinction is not useful to the installer
scripts.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150923/7a00805d/attachment.sig>

From cfergeau at redhat.com  Wed Sep 23 08:52:45 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 23 Sep 2015 10:52:45 +0200
Subject: [Libosinfo] [PATCH 1/2] win8.1: Add 2 more volume IDs
Message-ID: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>

The regex matching x86-64 enterprise variants is not as strict as it
could: it's going to match IR5_CENNA_X64FREV or IR1_CENA_X64FREV for
example for which we don't have test cases.
However, I'm confident this will match
en_windows_8.1_enterprise_n_with_update_x64_dvd.iso and
en_windows_8.1_enterprise_x64_dvd.iso
if such ISOs exist, and that it's not going to give us false
positives. Since it might allow us to identify unknown ISOs
without false positives, I went for it.

Data was provided Vaclav Ehrlich
---
 data/oses/windows.xml.in                           | 11 +++++++-
 ..._enterprise_with_update_x64_dvd_6054382.iso.txt | 30 ++++++++++++++++++++++
 ...ndows_8.1_n_with_update_x86_dvd_6051704.iso.txt | 30 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
 create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index 9ab420c..fe4f862 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1105,7 +1105,16 @@
     <media arch="x86_64">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(IR[13]_CENNA_X64FREV)_</volume-id>
+        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- No variant -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
new file mode 100644
index 0000000..017df86
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: IR5_CENA_X64FREV_EN-US_DV9
+Volume set id: IR5_CENA_X64FREV_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052,
+(425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 2021076
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 86A 2154
diff --git a/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
new file mode 100644
index 0000000..c3badf7
--- /dev/null
+++ b/test/isodata/windows/win8.1/en_windows_8.1_n_with_update_x86_dvd_6051704.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: IR5_CCSNA_X86FRE_EN-US_DV9
+Volume set id: IR5_CCSNA_X86FRE_EN-US_DV9
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052,
+(425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1476196
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 5B4 1460
-- 
2.4.3



From cfergeau at redhat.com  Wed Sep 23 08:52:46 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 23 Sep 2015 10:52:46 +0200
Subject: [Libosinfo] [PATCH 2/2] win10: Add one volume ID
In-Reply-To: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
References: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1442998366-21301-2-git-send-email-cfergeau@redhat.com>

Data was provided by Vaclav Ehrlich
---
 data/oses/windows.xml.in                           | 13 ++++++++++
 ...n_windows_10_enterprise_x86_dvd_6851156.iso.txt | 30 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 test/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index fe4f862..bbe1852 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -1307,6 +1307,9 @@
     <variant id="education">
       <_name>Microsoft Windows 10 Education</_name>
     </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 10 Enterprise</_name>
+    </variant>
 
     <!-- Education -->
     <media arch="i686">
@@ -1318,6 +1321,16 @@
       </iso>
     </media>
 
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>J_CENA_X86FREV_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
     <resources arch="i686">
       <minimum>
         <cpu>1000000000</cpu>
diff --git a/test/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt b/test/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
new file mode 100644
index 0000000..eaeaf6b
--- /dev/null
+++ b/test/isodata/windows/win10/en_windows_10_enterprise_x86_dvd_6851156.iso.txt
@@ -0,0 +1,30 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: J_CENA_X86FREV_EN-US_DV5
+Volume set id: J_CENA_X86FREV_EN-US_DV5
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052,
+(425) 882-8080
+Application id: CDIMAGE 2.53 (01/01/2005 TM)
+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: 1420691
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+NO Rock Ridge present
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Microsoft Corporation'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 8
+        Bootoff 222 546
-- 
2.4.3



From cfergeau at redhat.com  Wed Sep 23 09:21:54 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 23 Sep 2015 11:21:54 +0200
Subject: [Libosinfo] [PATCH 1/2] rhel: Narrow down RHELSA 7.0 volume ID
	regexp
Message-ID: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>

It's currently matching RHELSA.*aarch64 regardless of the version number
present in the volume ID. This means it will likely match all RHELSA 7.x
releases in addition to RHELSA 7.0
---
 data/oses/rhel.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 2f0d4e8..b680a40 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -1138,7 +1138,7 @@
     <media arch="aarch64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>RHELSA-.* Server\.aarch64</volume-id>
+        <volume-id>RHELSA-1.5 Server\.aarch64</volume-id>
       </iso>
        <kernel>isolinux/vmlinuz</kernel>
        <initrd>isolinux/initrd.img</initrd>
-- 
2.4.3



From cfergeau at redhat.com  Wed Sep 23 09:21:55 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Wed, 23 Sep 2015 11:21:55 +0200
Subject: [Libosinfo] [PATCH 2/2] rhel: Add RHELSA 7.1 volume ID
In-Reply-To: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
References: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
Message-ID: <1443000115-5170-2-git-send-email-cfergeau@redhat.com>

---
 data/oses/rhel.xml.in                              |  9 +++++++
 ...ELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt | 29 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 test/isodata/rhel/rhel7.1/RHELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt

diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index b680a40..8bfbbcd 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -1249,6 +1249,15 @@
       <initrd>isolinux/initrd.img</initrd>
     </media>
 
+    <media arch="aarch64">
+       <iso>
+         <system-id>LINUX</system-id>
+         <volume-id>RHELSA-7.1.*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/test/isodata/rhel/rhel7.1/RHELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt
new file mode 100644
index 0000000..6ed014f
--- /dev/null
+++ b/test/isodata/rhel/rhel7.1/RHELSA-7.1-20150616.0-Server-aarch64-dvd1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHELSA-7.1 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: 1423849
+El Torito VD version 1 found, boot catalog is in sector 517
+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 29EC
+        Bootoff 1D979 121209
-- 
2.4.3



From zeeshanak at gnome.org  Wed Sep 23 13:56:45 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 23 Sep 2015 14:56:45 +0100
Subject: [Libosinfo] [PATCH 0/9] Add volume IDs from rhbz#1212599
In-Reply-To: <20150923084434.GB4739@edamame.cdg.redhat.com>
References: <1441988527-2917-1-git-send-email-cfergeau@redhat.com>
	<CAAa3hFM56Fmz0Lv4ErazJ+6HE0zWfRmrwsMvGAPpDdx45Ttcqw@mail.gmail.com>
	<20150923084434.GB4739@edamame.cdg.redhat.com>
Message-ID: <CAAa3hFM4O7vV+W=xZOcBG3k2qYYOY0gsEPENpmgjKQWu5i37iw@mail.gmail.com>

On Wed, Sep 23, 2015 at 9:44 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> On Thu, Sep 17, 2015 at 01:01:35PM +0100, Zeeshan Ali (Khattak) wrote:
>> Hi,
>>
>> On Fri, Sep 11, 2015 at 5:21 PM, Christophe Fergeau <cfergeau at redhat.com> wrote:
>> > https://bugzilla.redhat.com/show_bug.cgi?id=1212599 has a lot of test files
>> > which are not currently identified by libosinfo. This patch series adds most of
>> > these.
>>
>> Series looks good to me. One minor nitpick though: If you could write
>> "ID" instead of "id" and even "IDs" instead of "Ids", it would be best
>> IMHO. ACK either way.
>
> Changed and pushed, thanks.
>
>>
>> > One thing which I was not always sure about is what to make a Windows variant
>> > and what not. There are Debug Checked builds, Volume Licences builds, 'N'
>> > versions (without Windows Media Player), "with Updates" ISOs, ...
>> > Some of these I made first class variants, others I did not, but this was a bit
>> > arbitrary ;)
>>
>> Ideally I guess they are all variants but not sure we need to be so
>> specific, unless the info is needed by installer scripts.
>
> My goal would be to show the same label in libosinfo as the one on the
> Windows box/CD, even if the distinction is not useful to the installer
> scripts.

Ah, a worthy goal indeed. Although I can't be sure either how
perfectly we want to achieve this goal.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Wed Sep 23 17:13:51 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 23 Sep 2015 18:13:51 +0100
Subject: [Libosinfo] [PATCH 1/2] win8.1: Add 2 more volume IDs
In-Reply-To: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
References: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFNTGAwt44f04p+eyBD00=Urs-Npn4OHauq711EQwDybZQ@mail.gmail.com>

Hey,

On Wed, Sep 23, 2015 at 9:52 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> The regex matching x86-64 enterprise variants is not as strict as it
> could: it's going to match IR5_CENNA_X64FREV or IR1_CENA_X64FREV for
> example for which we don't have test cases.
> However, I'm confident this will match
> en_windows_8.1_enterprise_n_with_update_x64_dvd.iso and
> en_windows_8.1_enterprise_x64_dvd.iso
> if such ISOs exist, and that it's not going to give us false
> positives. Since it might allow us to identify unknown ISOs
> without false positives, I went for it.

If you are confident about this, so am I. :) Honestly, looking at
these Windows volume-ids give me headache, but kudos to MS for
ensuring unique volume-ids though.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Wed Sep 23 17:14:20 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 23 Sep 2015 18:14:20 +0100
Subject: [Libosinfo] [PATCH 1/2] win8.1: Add 2 more volume IDs
In-Reply-To: <CAAa3hFNTGAwt44f04p+eyBD00=Urs-Npn4OHauq711EQwDybZQ@mail.gmail.com>
References: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
	<CAAa3hFNTGAwt44f04p+eyBD00=Urs-Npn4OHauq711EQwDybZQ@mail.gmail.com>
Message-ID: <CAAa3hFNseDnuuCxB6HZZ0auh3_twS4Je9kU1ZZOzSOGjxvoVgA@mail.gmail.com>

On Wed, Sep 23, 2015 at 6:13 PM, Zeeshan Ali (Khattak)
<zeeshanak at gnome.org> wrote:
> Hey,
>
> On Wed, Sep 23, 2015 at 9:52 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
>> The regex matching x86-64 enterprise variants is not as strict as it
>> could: it's going to match IR5_CENNA_X64FREV or IR1_CENA_X64FREV for
>> example for which we don't have test cases.
>> However, I'm confident this will match
>> en_windows_8.1_enterprise_n_with_update_x64_dvd.iso and
>> en_windows_8.1_enterprise_x64_dvd.iso
>> if such ISOs exist, and that it's not going to give us false
>> positives. Since it might allow us to identify unknown ISOs
>> without false positives, I went for it.
>
> If you are confident about this, so am I. :)

Oh, I meant to write: ACK for both patches.

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Wed Sep 23 17:14:54 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 23 Sep 2015 18:14:54 +0100
Subject: [Libosinfo] [PATCH 1/2] rhel: Narrow down RHELSA 7.0 volume ID
	regexp
In-Reply-To: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
References: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFOd8j0aYuReFW3SN2e4AZDjz3V-79BaxgV7c-9x-dFw2w@mail.gmail.com>

On Wed, Sep 23, 2015 at 10:21 AM, Christophe Fergeau
<cfergeau at redhat.com> wrote:
> It's currently matching RHELSA.*aarch64 regardless of the version number
> present in the volume ID. This means it will likely match all RHELSA 7.x
> releases in addition to RHELSA 7.0
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From zeeshanak at gnome.org  Wed Sep 23 17:28:34 2015
From: zeeshanak at gnome.org (Zeeshan Ali (Khattak))
Date: Wed, 23 Sep 2015 18:28:34 +0100
Subject: [Libosinfo] [PATCH 2/2] rhel: Add RHELSA 7.1 volume ID
In-Reply-To: <1443000115-5170-2-git-send-email-cfergeau@redhat.com>
References: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
	<1443000115-5170-2-git-send-email-cfergeau@redhat.com>
Message-ID: <CAAa3hFOoTvFP4w9bWP3FFx5=mcfVFkxoD4x4SdSB8xWuQNhaQA@mail.gmail.com>

On Wed, Sep 23, 2015 at 10:21 AM, Christophe Fergeau
<cfergeau at redhat.com> wrote:
> ---

ACK

-- 
Regards,

Zeeshan Ali (Khattak)
________________________________________
Befriend GNOME: http://www.gnome.org/friends/



From cfergeau at redhat.com  Thu Sep 24 07:39:15 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 24 Sep 2015 09:39:15 +0200
Subject: [Libosinfo] [PATCH 2/2] rhel: Add RHELSA 7.1 volume ID
In-Reply-To: <CAAa3hFOoTvFP4w9bWP3FFx5=mcfVFkxoD4x4SdSB8xWuQNhaQA@mail.gmail.com>
References: <1443000115-5170-1-git-send-email-cfergeau@redhat.com>
	<1443000115-5170-2-git-send-email-cfergeau@redhat.com>
	<CAAa3hFOoTvFP4w9bWP3FFx5=mcfVFkxoD4x4SdSB8xWuQNhaQA@mail.gmail.com>
Message-ID: <20150924073915.GE24877@edamame.cdg.redhat.com>

On Wed, Sep 23, 2015 at 06:28:34PM +0100, Zeeshan Ali (Khattak) wrote:
> On Wed, Sep 23, 2015 at 10:21 AM, Christophe Fergeau
> <cfergeau at redhat.com> wrote:
> > ---
> 
> ACK

Thanks, pushed series.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150924/dbb67d02/attachment.sig>

From cfergeau at redhat.com  Thu Sep 24 07:40:56 2015
From: cfergeau at redhat.com (Christophe Fergeau)
Date: Thu, 24 Sep 2015 09:40:56 +0200
Subject: [Libosinfo] [PATCH 1/2] win8.1: Add 2 more volume IDs
In-Reply-To: <CAAa3hFNTGAwt44f04p+eyBD00=Urs-Npn4OHauq711EQwDybZQ@mail.gmail.com>
References: <1442998366-21301-1-git-send-email-cfergeau@redhat.com>
	<CAAa3hFNTGAwt44f04p+eyBD00=Urs-Npn4OHauq711EQwDybZQ@mail.gmail.com>
Message-ID: <20150924074056.GF24877@edamame.cdg.redhat.com>

On Wed, Sep 23, 2015 at 06:13:51PM +0100, Zeeshan Ali (Khattak) wrote:
> Hey,
> 
> On Wed, Sep 23, 2015 at 9:52 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> > The regex matching x86-64 enterprise variants is not as strict as it
> > could: it's going to match IR5_CENNA_X64FREV or IR1_CENA_X64FREV for
> > example for which we don't have test cases.
> > However, I'm confident this will match
> > en_windows_8.1_enterprise_n_with_update_x64_dvd.iso and
> > en_windows_8.1_enterprise_x64_dvd.iso
> > if such ISOs exist, and that it's not going to give us false
> > positives. Since it might allow us to identify unknown ISOs
> > without false positives, I went for it.
> 
> If you are confident about this, so am I. :) Honestly, looking at
> these Windows volume-ids give me headache, but kudos to MS for
> ensuring unique volume-ids though.

"reverse-engineering" the scheme used for these labels do not seem that
hard actually, by comparing the different labels of the ISO variants,
it's quite easy to figure out the meaning of the various group of
letters.

I've pushed these patches.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150924/e570f6d4/attachment.sig>

From berrange at redhat.com  Fri Sep 25 11:34:19 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Fri, 25 Sep 2015 12:34:19 +0100
Subject: [Libosinfo] [PATCH] build: fix VPATH based builds
Message-ID: <1443180859-14407-1-git-send-email-berrange@redhat.com>

The VPATH build fails because the enum generator is told to
look for two generated files in the $srcdir instead of builddir.
We should not in fact loom the generated files at all when building
enums, so they can be removed.

The g-ir-scanner is also missing a -I$(build_dir) to let it find
the generated files.

Finally the gtk-doc tools were not being told to look in the
$(build_dir)

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---

Pushed to git under broken build fix rule.

 docs/reference/Makefile.am | 6 +++---
 osinfo/Makefile.am         | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c7f4c7b..5b516ed 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -3,7 +3,7 @@ DOC_MODULE=Libosinfo
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
-DOC_SOURCE_DIR=$(top_srcdir)/osinfo
+DOC_SOURCE_DIR=$(top_srcdir)/osinfo $(top_builddir)/osinfo
 
 SCANGOBJ_OPTIONS=
 
@@ -17,8 +17,8 @@ MKHTML_OPTIONS=
 
 FIXXREF_OPTIONS=
 
-HFILE_GLOB=$(top_srcdir)/osinfo/*.h
-CFILE_GLOB=$(top_srcdir)/osinfo/*.c
+HFILE_GLOB=$(top_srcdir)/osinfo/*.h $(top_builddir)/osinfo/*.h
+CFILE_GLOB=$(top_srcdir)/osinfo/*.c $(top_builddir)/osinfo/*.c
 
 IGNORE_HFILES=
 
diff --git a/osinfo/Makefile.am b/osinfo/Makefile.am
index 8f5685c..c07d362 100644
--- a/osinfo/Makefile.am
+++ b/osinfo/Makefile.am
@@ -30,6 +30,7 @@ libosinfo_1_0_la_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	$(LIBXML_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
@@ -94,11 +95,11 @@ OSINFO_HEADER_FILES =			\
   osinfo_resourceslist.h		\
   osinfo_tree.h				\
   osinfo_treelist.h			\
-  osinfo_version.h			\
   $(NULL)
 
 libosinfo_1_0_include_HEADERS =		\
   $(OSINFO_HEADER_FILES)		\
+  osinfo_version.h			\
   osinfo_enum_types.h			\
   $(NULL)
 
@@ -149,10 +150,10 @@ libosinfo_1_0_la_SOURCES =		\
   $(NULL)
 
 osinfo_enum_types.h: $(OSINFO_HEADER_FILES) osinfo_enum_types.h.template
-	$(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.h.template $(libosinfo_1_0_include_HEADERS:%=$(srcdir)/%) ) > $@
+	$(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.h.template $(OSINFO_HEADER_FILES:%=$(srcdir)/%) ) > $@
 
 osinfo_enum_types.c: $(OSINFO_HEADER_FILES) osinfo_enum_types.c.template osinfo_enum_types.h
-	$(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.c.template $(libosinfo_1_0_include_HEADERS:%=$(srcdir)/%) ) > $@
+	$(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/osinfo_enum_types.c.template $(OSINFO_HEADER_FILES:%=$(srcdir)/%) ) > $@
 
 DISTCLEANFILES +=				\
 	osinfo_enum_types.c			\
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 10:49:14 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 11:49:14 +0100
Subject: [Libosinfo] [PATCH] data: remove most information about PCI devices
Message-ID: <1443437354-32061-1-git-send-email-berrange@redhat.com>

We already load PCI/USB information from the pci.ids/usb.ids
files, so should not duplicate it again in XML files. The
only info we need to retain are the device classes.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/devices/qemu-pci.xml.in   | 61 +-----------------------------------------
 data/devices/qemu-usb.xml.in   |  5 ----
 data/devices/virtio-pci.xml.in | 25 -----------------
 3 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
index 0d0fbc9..e880434 100644
--- a/data/devices/qemu-pci.xml.in
+++ b/data/devices/qemu-pci.xml.in
@@ -5,12 +5,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012">
     <name>lsi</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>LSI Logic / Symbios Logic</_vendor>
-    <vendor-id>1000</vendor-id>
-    <product>53c895a</product>
-    <product-id>0012</product-id>
   </device>
 
   <!-- Video devices -->
@@ -27,73 +22,39 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8">
     <name>cirrus</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Cirrus Logic</_vendor>
-    <vendor-id>1013</vendor-id>
-    <product>GD 5446</product>
-    <product-id>00b8</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710">
     <name>vmvga</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>VMWare</_vendor>
-    <vendor-id>15ad</vendor-id>
-    <product>VGA</product>
-    <product-id>0710</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100">
     <name>qxl</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1b36</vendor-id>
-    <product>QXL</product>
-    <product-id>0100</product-id>
   </device>
 
 
   <!-- Network devices -->
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029">
     <name>ne2k_pci</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8029(AS)</product>
-    <product-id>8029</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000">
     <name>pcnet</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Advanced Micro Devices [AMD]</_vendor>
-    <vendor-id>1022</vendor-id>
-    <product>79c970 [PCnet32 LANCE]</product>
-    <product-id>2000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139">
     <name>rtl8139</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8139/8139C/8139C+</product>
-    <product-id>8139</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e">
     <name>e1000</name>
-    <bus-type>pci</bus-type>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82540EM Gigabit Ethernet Controller</product>
-    <product-id>100e</product-id>
+    <class>net</class>
   </device>
 
 
@@ -101,32 +62,17 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000">
     <name>es1370</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Ensoniq</_vendor>
-    <vendor-id>1274</vendor-id>
-    <product>ES1370 [AudioPCI]</product>
-    <product-id>5000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415">
     <name>ac97</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801AA AC'97 Audio Controller</product>
-    <product-id>2415</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668">
     <name>ich6</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
-    <product-id>2668</product-id>
   </device>
 
 
@@ -134,12 +80,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab">
     <name>6300esb</name>
-    <bus-type>pci</bus-type>
     <class>watchdog</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>6300ESB Watchdog Timer</product>
-    <product-id>25ab</product-id>
   </device>
 
   <device id="isa://ib700">
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in
index 213187f..9719661 100644
--- a/data/devices/qemu-usb.xml.in
+++ b/data/devices/qemu-usb.xml.in
@@ -3,12 +3,7 @@
 
   <device id="http://www.linux-usb.org/usb.ids/80ee/0021">
     <name>tablet</name>
-    <bus-type>usb</bus-type>
     <class>input</class>
-    <_vendor>VirtualBox</_vendor>
-    <vendor-id>80ee</vendor-id>
-    <product>Tablet</product>
-    <product-id>0021</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
index b5b3948..ccc32da 100644
--- a/data/devices/virtio-pci.xml.in
+++ b/data/devices/virtio-pci.xml.in
@@ -3,52 +3,27 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000">
     <name>virtio-net</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio network device</product>
-    <product-id>1000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001">
     <name>virtio-block</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio block device</product>
-    <product-id>1001</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002">
     <name>virtio-balloon</name>
-    <bus-type>pci</bus-type>
     <class>memory.balloon</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio memory balloon</product>
-    <product-id>1002</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003">
     <name>virtio-console</name>
-    <bus-type>pci</bus-type>
     <class>console</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio console</product>
-    <product-id>1003</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009">
     <name>virtio-9p</name>
-    <bus-type>pci</bus-type>
     <class>filesystem</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio 9p</product>
-    <product-id>1009</product-id>
   </device>
 
 </libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 10:49:25 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 11:49:25 +0100
Subject: [Libosinfo] [PATCH] Use a proper URI for ib700 device
Message-ID: <1443437365-32114-1-git-send-email-berrange@redhat.com>

The ib700 device currently uses a URI of "isa://ib700". Change
that to refer to the product vendor http://ibasetechnologies.net/ib700
to follow scheme commonly uses for other entities.
---
 data/devices/qemu-pci.xml.in | 2 +-
 data/hypervisors/qemu.xml.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
index e880434..480a784 100644
--- a/data/devices/qemu-pci.xml.in
+++ b/data/devices/qemu-pci.xml.in
@@ -83,7 +83,7 @@
     <class>watchdog</class>
   </device>
 
-  <device id="isa://ib700">
+  <device id="http://ibasetechnologies.net/ib700">
     <name>ib700</name>
     <bus-type>isa</bus-type>
     <class>watchdog</class>
diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in
index 8fa2e0b..787a863 100644
--- a/data/hypervisors/qemu.xml.in
+++ b/data/hypervisors/qemu.xml.in
@@ -35,7 +35,7 @@
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/>
       <!-- watchdog devices -->
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
-      <device id="isa://ib700"/>
+      <device id="http://ibasetechnologies.net/ib700"/>
       <!-- ps2: keyboard -->
       <device id="http://qemu.org/ps2/keyboard"/>
       <!-- ps2: mouse -->
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 10:49:36 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 11:49:36 +0100
Subject: [Libosinfo] [PATCH] data: change PS2 device URIs to refer to ibm.com
Message-ID: <1443437376-32169-1-git-send-email-berrange@redhat.com>

The PS2 computer spec originated with IBM, so the correct
URI to refer to is ibm.com not qemu.org

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/devices/qemu-ps2.xml.in | 4 ++--
 data/hypervisors/qemu.xml.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/qemu-ps2.xml.in
index 2335ac0..cef68e2 100644
--- a/data/devices/qemu-ps2.xml.in
+++ b/data/devices/qemu-ps2.xml.in
@@ -1,7 +1,7 @@
 <!-- PS2 devices for QEMU/KVM(s) -->
 <libosinfo version="0.0.1">
 
-  <device id="http://qemu.org/ps2/keyboard">
+  <device id="http://ibm.com/ps2/keyboard">
     <name>keyboard</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
@@ -9,7 +9,7 @@
     <product>Keyboard</product>
   </device>
 
-  <device id="http://qemu.org/ps2/mouse">
+  <device id="http://ibm.com/ps2/mouse">
     <name>mouse</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in
index 787a863..fa40c13 100644
--- a/data/hypervisors/qemu.xml.in
+++ b/data/hypervisors/qemu.xml.in
@@ -37,9 +37,9 @@
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
       <device id="http://ibasetechnologies.net/ib700"/>
       <!-- ps2: keyboard -->
-      <device id="http://qemu.org/ps2/keyboard"/>
+      <device id="http://ibm.com/ps2/keyboard"/>
       <!-- ps2: mouse -->
-      <device id="http://qemu.org/ps2/mouse"/>
+      <device id="http://ibm.com/ps2/mouse"/>
       <!-- USB tablet -->
       <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
       <!-- virtio-net -->
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:18 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:18 +0100
Subject: [Libosinfo] [PATCH 00/39] Split up database XML files
Message-ID: <1443455517-17894-1-git-send-email-berrange@redhat.com>

This (pretty uninteresting) series splits up the current XML
files so that we have at most 1 entity stored in each file.

I've not attempted to change anything about the way we load
files, or the format, so this is fully back compatible with
current loader code currently.

I'm not sure there's much of interest to review here
really - I used a script to do the actual splitting,
which should have ensure I didn't loose any data or
make mistakes. Aside from that it was just a matter of
adjusting makefiles and the like. I'm not too happy
about the fact that I had to use one Makefile.am in
every subdirectory, but the intltool automake rules
are broken when used with non-recursive builds, so I
had no choice :-(

Daniel P. Berrange (39):
  data: remove most information about PCI devices
  Use a proper URI for ib700 device
  data: change PS2 device URIs to refer to ibm.com
  data: rename 'hypervisors' to 'platforms'
  data: split altlinux into one file per OS
  data: split centos into one file per OS
  data: split debian into one file per OS
  data: split dos into one file per OS
  data: split fedora into one file per OS
  data: split freebsd into one file per OS
  data: split gnome into one file per OS
  data: split macos into one file per OS
  data: split mageia into one file per OS
  data: split mandrake into one file per OS
  data: split mandriva into one file per OS
  data: split netbsd into one file per OS
  data: split netware into one file per OS
  data: split openbsd into one file per OS
  data: split opensuse into one file per OS
  data: split rhel into one file per OS
  data: split rhl into one file per OS
  data: split solaris into one file per OS
  data: split suse into one file per OS
  data: split ubuntu into one file per OS
  data: split windows into one file per OS
  data: split kvm into one file per platform
  data: split qemu into one file per platform
  data: split rhel-xen into one file per platform
  data: split xen into one file per platform
  data: split windows-lang into one file per datamap
  data: split x11-keyboard into one file per datamap
  data: split debian into one file per install script
  data: split fedora into one file per install script
  data: split rhel into one file per install script
  data: split ubuntu into one file per install script
  data: split windows-* into one file per install script
  data: split devices into one file per device
  Update ignore files for new database layout
  tests: switch to use XML from builddir only

 .gitignore                                         |   11 +-
 configure.ac                                       |   38 +-
 data/Makefile.am                                   |    2 +-
 data/Makefile.inc                                  |   11 +
 data/datamaps/Makefile.am                          |   11 +-
 data/datamaps/windows-lang.xml                     |  131 -
 data/datamaps/windows/Makefile.am                  |    1 +
 data/datamaps/windows/win-7-l10n-language.xml.in   |   40 +
 .../windows/win-8-l10n-language-reverse.xml.in     |   41 +
 data/datamaps/windows/win-8-l10n-language.xml.in   |   41 +
 data/datamaps/x11/Makefile.am                      |    1 +
 .../{x11-keyboard.xml => x11/x11-keyboard.xml.in}  |    7 -
 data/devices/Makefile.am                           |   18 +-
 data/devices/isa/Makefile.am                       |    1 +
 data/devices/isa/isa-ib700.xml.in                  |    8 +
 data/devices/pci/Makefile.am                       |    1 +
 data/devices/pci/pci-1000-0012.xml.in              |    6 +
 data/devices/pci/pci-1013-00b8.xml.in              |    6 +
 data/devices/pci/pci-1022-2000.xml.in              |    6 +
 data/devices/pci/pci-10ec-8029.xml.in              |    6 +
 data/devices/pci/pci-10ec-8139.xml.in              |    6 +
 data/devices/pci/pci-1234-1111.xml.in              |   11 +
 data/devices/pci/pci-1274-5000.xml.in              |    6 +
 data/devices/pci/pci-15ad-0710.xml.in              |    6 +
 data/devices/pci/pci-1af4-1000.xml.in              |    6 +
 data/devices/pci/pci-1af4-1001.xml.in              |    6 +
 data/devices/pci/pci-1af4-1002.xml.in              |    6 +
 data/devices/pci/pci-1af4-1003.xml.in              |    6 +
 data/devices/pci/pci-1af4-1009.xml.in              |    6 +
 data/devices/pci/pci-1b36-0100.xml.in              |    6 +
 data/devices/pci/pci-8086-100e.xml.in              |    6 +
 data/devices/pci/pci-8086-2415.xml.in              |    6 +
 data/devices/pci/pci-8086-25ab.xml.in              |    6 +
 data/devices/pci/pci-8086-2668.xml.in              |    6 +
 data/devices/qemu-pci.xml.in                       |  152 -
 data/devices/qemu-ps2.xml.in                       |   20 -
 data/devices/qemu-usb.xml.in                       |   14 -
 data/devices/usb/Makefile.am                       |    1 +
 data/devices/usb/usb-80ee-0021.xml.in              |    8 +
 data/devices/virtio-pci.xml.in                     |   54 -
 data/devices/xen.xml.in                            |   28 -
 data/devices/xen/Makefile.am                       |    1 +
 data/devices/xen/xen-block.xml.in                  |    7 +
 data/devices/xen/xen-console.xml.in                |    7 +
 data/devices/xen/xen-framebuffer.xml.in            |    7 +
 data/devices/xen/xen-net.xml.in                    |    7 +
 data/hypervisors/Makefile.am                       |    9 -
 data/hypervisors/kvm.xml.in                        |   63 -
 data/hypervisors/qemu.xml.in                       |  363 --
 data/hypervisors/rhel-xen.xml.in                   |  131 -
 data/hypervisors/xen.xml.in                        |  287 --
 data/install-scripts/Makefile.am                   |   20 +-
 data/install-scripts/debian/Makefile.am            |    1 +
 .../{debian.xml => debian/debian-desktop.xml.in}   |  128 -
 data/install-scripts/debian/debian-jeos.xml.in     |  127 +
 data/install-scripts/fedora/Makefile.am            |    1 +
 .../{fedora.xml => fedora/fedora-desktop.xml.in}   |  158 -
 data/install-scripts/fedora/fedora-jeos.xml.in     |  156 +
 data/install-scripts/rhel/Makefile.am              |    1 +
 .../{rhel.xml => rhel/rhel-desktop.xml.in}         |  107 -
 data/install-scripts/rhel/rhel-jeos.xml.in         |  105 +
 data/install-scripts/ubuntu/Makefile.am            |    1 +
 .../{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in}      |    2 -
 data/install-scripts/windows/Makefile.am           |    1 +
 .../windows-cmd-desktop.xml.in}                    |    1 -
 .../windows-reg-desktop.xml.in}                    |    1 -
 .../windows-sif-desktop.xml.in}                    |   73 -
 .../windows/windows-sif-jeos.xml.in                |   71 +
 .../windows-unattend-desktop.xml.in}               |  224 -
 .../windows/windows-unattend-jeos.xml.in           |  224 +
 data/oses/Makefile.am                              |   51 +-
 data/oses/altlinux.xml.in                          |  266 --
 data/oses/altlinux/Makefile.am                     |    1 +
 data/oses/altlinux/altlinux1.0.xml.in              |   12 +
 data/oses/altlinux/altlinux2.0.xml.in              |   13 +
 data/oses/altlinux/altlinux2.2.xml.in              |   13 +
 data/oses/altlinux/altlinux2.4.xml.in              |   25 +
 data/oses/altlinux/altlinux3.0.xml.in              |   25 +
 data/oses/altlinux/altlinux4.0.xml.in              |   33 +
 data/oses/altlinux/altlinux4.1.xml.in              |   32 +
 data/oses/altlinux/altlinux5.xml.in                |   49 +
 data/oses/altlinux/altlinux6.xml.in                |   37 +
 data/oses/altlinux/altlinux7.xml.in                |   33 +
 data/oses/centos.xml.in                            |  328 --
 data/oses/centos/Makefile.am                       |    1 +
 data/oses/centos/centos6.0.xml.in                  |   48 +
 data/oses/centos/centos6.1.xml.in                  |   47 +
 data/oses/centos/centos6.2.xml.in                  |   47 +
 data/oses/centos/centos6.3.xml.in                  |   55 +
 data/oses/centos/centos6.4.xml.in                  |   47 +
 data/oses/centos/centos6.5.xml.in                  |   47 +
 data/oses/centos/centos7.0.xml.in                  |   41 +
 data/oses/debian.xml.in                            |  315 --
 data/oses/debian/Makefile.am                       |    1 +
 data/oses/debian/debian1.0.xml.in                  |   11 +
 data/oses/debian/debian1.2.xml.in                  |   13 +
 data/oses/debian/debian1.3.xml.in                  |   13 +
 data/oses/debian/debian2.0.xml.in                  |   13 +
 data/oses/debian/debian2.1.xml.in                  |   13 +
 data/oses/debian/debian2.2.xml.in                  |   13 +
 data/oses/debian/debian3.1.xml.in                  |   13 +
 data/oses/debian/debian3.xml.in                    |   13 +
 data/oses/debian/debian4.xml.in                    |   13 +
 data/oses/debian/debian5.xml.in                    |   32 +
 data/oses/debian/debian6.xml.in                    |   71 +
 data/oses/debian/debian7.xml.in                    |   53 +
 data/oses/debian/debian8.xml.in                    |   53 +
 data/oses/fedora.xml.in                            | 4320 --------------------
 data/oses/fedora/Makefile.am                       |    1 +
 data/oses/fedora/fedora-unknown.xml.in             |   55 +
 data/oses/fedora/fedora1.xml.in                    |   91 +
 data/oses/fedora/fedora10.xml.in                   |  353 ++
 data/oses/fedora/fedora11.xml.in                   |  353 ++
 data/oses/fedora/fedora12.xml.in                   |  313 ++
 data/oses/fedora/fedora13.xml.in                   |  229 ++
 data/oses/fedora/fedora14.xml.in                   |  243 ++
 data/oses/fedora/fedora15.xml.in                   |  120 +
 data/oses/fedora/fedora16.xml.in                   |  120 +
 data/oses/fedora/fedora17.xml.in                   |  118 +
 data/oses/fedora/fedora18.xml.in                   |  118 +
 data/oses/fedora/fedora19.xml.in                   |  151 +
 data/oses/fedora/fedora2.xml.in                    |  139 +
 data/oses/fedora/fedora20.xml.in                   |  141 +
 data/oses/fedora/fedora21.xml.in                   |  193 +
 data/oses/fedora/fedora22.xml.in                   |  167 +
 data/oses/fedora/fedora3.xml.in                    |  139 +
 data/oses/fedora/fedora4.xml.in                    |  213 +
 data/oses/fedora/fedora5.xml.in                    |  223 +
 data/oses/fedora/fedora6.xml.in                    |  243 ++
 data/oses/fedora/fedora7.xml.in                    |  116 +
 data/oses/fedora/fedora8.xml.in                    |  128 +
 data/oses/fedora/fedora9.xml.in                    |  367 ++
 data/oses/freebsd.xml.in                           |  635 ---
 data/oses/freebsd/Makefile.am                      |    1 +
 data/oses/freebsd/freebsd1.0.xml.in                |   13 +
 data/oses/freebsd/freebsd10.0.xml.in               |   20 +
 data/oses/freebsd/freebsd10.1.xml.in               |   27 +
 data/oses/freebsd/freebsd2.0.5.xml.in              |   14 +
 data/oses/freebsd/freebsd2.0.xml.in                |   16 +
 data/oses/freebsd/freebsd2.2.8.xml.in              |   13 +
 data/oses/freebsd/freebsd2.2.9.xml.in              |   13 +
 data/oses/freebsd/freebsd3.0.xml.in                |   16 +
 data/oses/freebsd/freebsd3.2.xml.in                |   13 +
 data/oses/freebsd/freebsd4.0.xml.in                |   16 +
 data/oses/freebsd/freebsd4.1.xml.in                |   14 +
 data/oses/freebsd/freebsd4.10.xml.in               |   14 +
 data/oses/freebsd/freebsd4.11.xml.in               |   17 +
 data/oses/freebsd/freebsd4.2.xml.in                |   14 +
 data/oses/freebsd/freebsd4.3.xml.in                |   14 +
 data/oses/freebsd/freebsd4.4.xml.in                |   14 +
 data/oses/freebsd/freebsd4.5.xml.in                |   14 +
 data/oses/freebsd/freebsd4.6.xml.in                |   14 +
 data/oses/freebsd/freebsd4.7.xml.in                |   14 +
 data/oses/freebsd/freebsd4.8.xml.in                |   14 +
 data/oses/freebsd/freebsd4.9.xml.in                |   14 +
 data/oses/freebsd/freebsd5.0.xml.in                |   16 +
 data/oses/freebsd/freebsd5.1.xml.in                |   14 +
 data/oses/freebsd/freebsd5.2.1.xml.in              |   14 +
 data/oses/freebsd/freebsd5.2.xml.in                |   14 +
 data/oses/freebsd/freebsd5.3.xml.in                |   14 +
 data/oses/freebsd/freebsd5.4.xml.in                |   14 +
 data/oses/freebsd/freebsd5.5.xml.in                |   16 +
 data/oses/freebsd/freebsd6.0.xml.in                |   18 +
 data/oses/freebsd/freebsd6.1.xml.in                |   12 +
 data/oses/freebsd/freebsd6.2.xml.in                |   12 +
 data/oses/freebsd/freebsd6.3.xml.in                |   12 +
 data/oses/freebsd/freebsd6.4.xml.in                |   14 +
 data/oses/freebsd/freebsd7.0.xml.in                |   12 +
 data/oses/freebsd/freebsd7.1.xml.in                |   12 +
 data/oses/freebsd/freebsd7.2.xml.in                |   12 +
 data/oses/freebsd/freebsd7.3.xml.in                |   12 +
 data/oses/freebsd/freebsd7.4.xml.in                |   12 +
 data/oses/freebsd/freebsd8.0.xml.in                |   18 +
 data/oses/freebsd/freebsd8.1.xml.in                |   12 +
 data/oses/freebsd/freebsd8.2.xml.in                |   12 +
 data/oses/freebsd/freebsd8.3.xml.in                |   15 +
 data/oses/freebsd/freebsd8.4.xml.in                |   15 +
 data/oses/freebsd/freebsd9.0.xml.in                |   14 +
 data/oses/freebsd/freebsd9.1.xml.in                |   15 +
 data/oses/freebsd/freebsd9.2.xml.in                |   15 +
 data/oses/freebsd/freebsd9.3.xml.in                |   15 +
 data/oses/gnome.xml.in                             |  130 -
 data/oses/gnome/Makefile.am                        |    1 +
 data/oses/gnome/gnome-continuous-3.10.xml.in       |   28 +
 data/oses/gnome/gnome-continuous-3.12.xml.in       |   20 +
 data/oses/gnome/gnome-continuous-3.14.xml.in       |   20 +
 data/oses/gnome/gnome3.6.xml.in                    |   32 +
 data/oses/gnome/gnome3.8.xml.in                    |   32 +
 data/oses/macos.xml.in                             |  102 -
 data/oses/macos/Makefile.am                        |    1 +
 data/oses/macos/macosx10.0.xml.in                  |   10 +
 data/oses/macos/macosx10.1.xml.in                  |   11 +
 data/oses/macos/macosx10.2.xml.in                  |   11 +
 data/oses/macos/macosx10.3.xml.in                  |   11 +
 data/oses/macos/macosx10.4.xml.in                  |   11 +
 data/oses/macos/macosx10.5.xml.in                  |   11 +
 data/oses/macos/macosx10.6.xml.in                  |   21 +
 data/oses/macos/macosx10.7.xml.in                  |   21 +
 data/oses/mageia.xml.in                            |  133 -
 data/oses/mageia/Makefile.am                       |    1 +
 data/oses/mageia/mageia1.xml.in                    |   58 +
 data/oses/mageia/mageia2.xml.in                    |   32 +
 data/oses/mageia/mageia3.xml.in                    |   43 +
 data/oses/mandrake.xml.in                          |  218 -
 data/oses/mandrake/Makefile.am                     |    1 +
 data/oses/mandrake/mandrake10.0.xml.in             |   13 +
 data/oses/mandrake/mandrake10.1.xml.in             |   13 +
 data/oses/mandrake/mandrake10.2.xml.in             |   13 +
 data/oses/mandrake/mandrake5.1.xml.in              |   11 +
 data/oses/mandrake/mandrake5.2.xml.in              |   14 +
 data/oses/mandrake/mandrake5.3.xml.in              |   14 +
 data/oses/mandrake/mandrake6.0.xml.in              |   14 +
 data/oses/mandrake/mandrake6.1.xml.in              |   14 +
 data/oses/mandrake/mandrake7.0.xml.in              |   14 +
 data/oses/mandrake/mandrake7.1.xml.in              |   14 +
 data/oses/mandrake/mandrake7.2.xml.in              |   14 +
 data/oses/mandrake/mandrake8.0.xml.in              |   14 +
 data/oses/mandrake/mandrake8.1.xml.in              |   14 +
 data/oses/mandrake/mandrake8.2.xml.in              |   14 +
 data/oses/mandrake/mandrake9.0.xml.in              |   14 +
 data/oses/mandrake/mandrake9.1.xml.in              |   14 +
 data/oses/mandrake/mandrake9.2.xml.in              |   14 +
 data/oses/mandriva.xml.in                          |  176 -
 data/oses/mandriva/Makefile.am                     |    1 +
 data/oses/mandriva/mandriva2006.0.xml.in           |   13 +
 data/oses/mandriva/mandriva2007.1.xml.in           |   13 +
 data/oses/mandriva/mandriva2007.xml.in             |   13 +
 data/oses/mandriva/mandriva2008.0.xml.in           |   13 +
 data/oses/mandriva/mandriva2008.1.xml.in           |   13 +
 data/oses/mandriva/mandriva2009.0.xml.in           |   13 +
 data/oses/mandriva/mandriva2009.1.xml.in           |   13 +
 data/oses/mandriva/mandriva2010.0.xml.in           |   17 +
 data/oses/mandriva/mandriva2010.1.xml.in           |   13 +
 data/oses/mandriva/mandriva2010.2.xml.in           |   13 +
 data/oses/mandriva/mandriva2011.xml.in             |   14 +
 data/oses/mandriva/mbs1.0.xml.in                   |   11 +
 data/oses/mandriva/mes5.1.xml.in                   |   17 +
 data/oses/mandriva/mes5.xml.in                     |   11 +
 data/oses/msdos/Makefile.am                        |    1 +
 data/oses/{dos.xml.in => msdos/msdos6.22.xml.in}   |    0
 data/oses/netbsd.xml.in                            |  183 -
 data/oses/netbsd/Makefile.am                       |    1 +
 data/oses/netbsd/netbsd0.8.xml.in                  |   12 +
 data/oses/netbsd/netbsd0.9.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.0.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.1.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.2.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.3.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.4.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.5.xml.in                  |   14 +
 data/oses/netbsd/netbsd1.6.xml.in                  |   14 +
 data/oses/netbsd/netbsd2.0.xml.in                  |   14 +
 data/oses/netbsd/netbsd3.0.xml.in                  |   14 +
 data/oses/netbsd/netbsd4.0.xml.in                  |   14 +
 data/oses/netbsd/netbsd5.0.xml.in                  |   14 +
 data/oses/netbsd/netbsd5.1.xml.in                  |   14 +
 data/oses/netware.xml.in                           |   29 -
 data/oses/netware/Makefile.am                      |    1 +
 data/oses/netware/netware4.xml.in                  |   10 +
 data/oses/netware/netware5.xml.in                  |   10 +
 data/oses/netware/netware6.xml.in                  |   10 +
 data/oses/openbsd.xml.in                           |  401 --
 data/oses/openbsd/Makefile.am                      |    1 +
 data/oses/openbsd/openbsd4.2.xml.in                |   28 +
 data/oses/openbsd/openbsd4.3.xml.in                |   30 +
 data/oses/openbsd/openbsd4.4.xml.in                |   30 +
 data/oses/openbsd/openbsd4.5.xml.in                |   30 +
 data/oses/openbsd/openbsd4.8.xml.in                |   30 +
 data/oses/openbsd/openbsd4.9.xml.in                |   34 +
 data/oses/openbsd/openbsd5.0.xml.in                |   31 +
 data/oses/openbsd/openbsd5.1.xml.in                |   32 +
 data/oses/openbsd/openbsd5.2.xml.in                |   32 +
 data/oses/openbsd/openbsd5.3.xml.in                |   32 +
 data/oses/openbsd/openbsd5.4.xml.in                |   37 +
 data/oses/openbsd/openbsd5.5.xml.in                |   32 +
 data/oses/openbsd/openbsd5.6.xml.in                |   32 +
 data/oses/opensuse.xml.in                          |  574 ---
 data/oses/opensuse/Makefile.am                     |    1 +
 data/oses/opensuse/opensuse-factory.xml.in         |   47 +
 data/oses/opensuse/opensuse-unknown.xml.in         |   47 +
 data/oses/opensuse/opensuse10.2.xml.in             |   10 +
 data/oses/opensuse/opensuse10.3.xml.in             |   12 +
 data/oses/opensuse/opensuse11.0.xml.in             |   12 +
 data/oses/opensuse/opensuse11.1.xml.in             |   12 +
 data/oses/opensuse/opensuse11.2.xml.in             |   12 +
 data/oses/opensuse/opensuse11.3.xml.in             |   67 +
 data/oses/opensuse/opensuse11.4.xml.in             |   67 +
 data/oses/opensuse/opensuse12.1.xml.in             |   68 +
 data/oses/opensuse/opensuse12.2.xml.in             |   68 +
 data/oses/opensuse/opensuse12.3.xml.in             |   48 +
 data/oses/opensuse/opensuse13.1.xml.in             |   71 +
 data/oses/opensuse/opensuse13.2.xml.in             |   35 +
 data/oses/rhel.xml.in                              | 1344 ------
 data/oses/rhel/Makefile.am                         |    1 +
 data/oses/rhel/rhel-atomic-7.0.xml.in              |   43 +
 data/oses/rhel/rhel-atomic-7.1.xml.in              |   49 +
 data/oses/rhel/rhel2.1.1.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.2.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.3.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.4.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.5.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.6.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.7.xml.in                    |   16 +
 data/oses/rhel/rhel2.1.xml.in                      |   14 +
 data/oses/rhel/rhel3.1.xml.in                      |   16 +
 data/oses/rhel/rhel3.2.xml.in                      |   16 +
 data/oses/rhel/rhel3.3.xml.in                      |   16 +
 data/oses/rhel/rhel3.4.xml.in                      |   16 +
 data/oses/rhel/rhel3.5.xml.in                      |   16 +
 data/oses/rhel/rhel3.6.xml.in                      |   16 +
 data/oses/rhel/rhel3.7.xml.in                      |   16 +
 data/oses/rhel/rhel3.8.xml.in                      |   16 +
 data/oses/rhel/rhel3.9.xml.in                      |   16 +
 data/oses/rhel/rhel3.xml.in                        |   14 +
 data/oses/rhel/rhel4.0.xml.in                      |   14 +
 data/oses/rhel/rhel4.1.xml.in                      |   16 +
 data/oses/rhel/rhel4.2.xml.in                      |   16 +
 data/oses/rhel/rhel4.3.xml.in                      |   16 +
 data/oses/rhel/rhel4.4.xml.in                      |   16 +
 data/oses/rhel/rhel4.5.xml.in                      |   16 +
 data/oses/rhel/rhel4.6.xml.in                      |   16 +
 data/oses/rhel/rhel4.7.xml.in                      |   16 +
 data/oses/rhel/rhel4.8.xml.in                      |   29 +
 data/oses/rhel/rhel4.9.xml.in                      |   29 +
 data/oses/rhel/rhel5.0.xml.in                      |   14 +
 data/oses/rhel/rhel5.1.xml.in                      |   16 +
 data/oses/rhel/rhel5.10.xml.in                     |   29 +
 data/oses/rhel/rhel5.11.xml.in                     |   29 +
 data/oses/rhel/rhel5.2.xml.in                      |   16 +
 data/oses/rhel/rhel5.3.xml.in                      |   16 +
 data/oses/rhel/rhel5.4.xml.in                      |   29 +
 data/oses/rhel/rhel5.5.xml.in                      |   29 +
 data/oses/rhel/rhel5.6.xml.in                      |   34 +
 data/oses/rhel/rhel5.7.xml.in                      |   29 +
 data/oses/rhel/rhel5.8.xml.in                      |   29 +
 data/oses/rhel/rhel5.9.xml.in                      |   29 +
 data/oses/rhel/rhel6.0.xml.in                      |   55 +
 data/oses/rhel/rhel6.1.xml.in                      |   51 +
 data/oses/rhel/rhel6.2.xml.in                      |   51 +
 data/oses/rhel/rhel6.3.xml.in                      |   51 +
 data/oses/rhel/rhel6.4.xml.in                      |   51 +
 data/oses/rhel/rhel6.5.xml.in                      |   51 +
 data/oses/rhel/rhel6.6.xml.in                      |   51 +
 data/oses/rhel/rhel7.0.xml.in                      |   80 +
 data/oses/rhel/rhel7.1.xml.in                      |   73 +
 data/oses/rhl.xml.in                               |  285 --
 data/oses/rhl/Makefile.am                          |    1 +
 data/oses/rhl/rhl1.0.xml.in                        |   13 +
 data/oses/rhl/rhl1.1.xml.in                        |   15 +
 data/oses/rhl/rhl2.0.xml.in                        |   14 +
 data/oses/rhl/rhl2.1.xml.in                        |   14 +
 data/oses/rhl/rhl3.0.3.xml.in                      |   15 +
 data/oses/rhl/rhl4.0.xml.in                        |   15 +
 data/oses/rhl/rhl4.1.xml.in                        |   15 +
 data/oses/rhl/rhl4.2.xml.in                        |   15 +
 data/oses/rhl/rhl5.0.xml.in                        |   15 +
 data/oses/rhl/rhl5.1.xml.in                        |   15 +
 data/oses/rhl/rhl5.2.xml.in                        |   15 +
 data/oses/rhl/rhl6.0.xml.in                        |   15 +
 data/oses/rhl/rhl6.1.xml.in                        |   15 +
 data/oses/rhl/rhl6.2.xml.in                        |   15 +
 data/oses/rhl/rhl7.1.xml.in                        |   16 +
 data/oses/rhl/rhl7.2.xml.in                        |   16 +
 data/oses/rhl/rhl7.3.xml.in                        |   16 +
 data/oses/rhl/rhl7.xml.in                          |   15 +
 data/oses/rhl/rhl8.0.xml.in                        |   16 +
 data/oses/rhl/rhl9.xml.in                          |   16 +
 data/oses/solaris.xml.in                           |   49 -
 data/oses/solaris/Makefile.am                      |    1 +
 data/oses/solaris/opensolaris2009.06.xml.in        |   14 +
 data/oses/solaris/solaris10.xml.in                 |   15 +
 data/oses/solaris/solaris11.xml.in                 |   11 +
 data/oses/solaris/solaris9.xml.in                  |   10 +
 data/oses/suse.xml.in                              |  363 --
 data/oses/suse/Makefile.am                         |    1 +
 data/oses/suse/sled10.xml.in                       |   22 +
 data/oses/suse/sled11.xml.in                       |   22 +
 data/oses/suse/sled11sp1.xml.in                    |   28 +
 data/oses/suse/sled11sp2.xml.in                    |   28 +
 data/oses/suse/sled11sp3.xml.in                    |   28 +
 data/oses/suse/sled11sp4.xml.in                    |   28 +
 data/oses/suse/sled12.xml.in                       |   32 +
 data/oses/suse/sled9.xml.in                        |   10 +
 data/oses/suse/sles10.xml.in                       |   11 +
 data/oses/suse/sles11.xml.in                       |   16 +
 data/oses/suse/sles11sp1.xml.in                    |   30 +
 data/oses/suse/sles11sp2.xml.in                    |   30 +
 data/oses/suse/sles11sp3.xml.in                    |   30 +
 data/oses/suse/sles11sp4.xml.in                    |   28 +
 data/oses/suse/sles12.xml.in                       |   23 +
 data/oses/suse/sles9.xml.in                        |   10 +
 data/oses/ubuntu.xml.in                            | 1596 --------
 data/oses/ubuntu/Makefile.am                       |    1 +
 data/oses/ubuntu/ubuntu10.04.xml.in                |   49 +
 data/oses/ubuntu/ubuntu10.10.xml.in                |   69 +
 data/oses/ubuntu/ubuntu11.04.xml.in                |   69 +
 data/oses/ubuntu/ubuntu11.10.xml.in                |   65 +
 data/oses/ubuntu/ubuntu12.04.xml.in                |   67 +
 data/oses/ubuntu/ubuntu12.10.xml.in                |   67 +
 data/oses/ubuntu/ubuntu13.04.xml.in                |   67 +
 data/oses/ubuntu/ubuntu13.10.xml.in                |   67 +
 data/oses/ubuntu/ubuntu14.04.xml.in                |   68 +
 data/oses/ubuntu/ubuntu14.10.xml.in                |   68 +
 data/oses/ubuntu/ubuntu15.04.xml.in                |   68 +
 data/oses/ubuntu/ubuntu15.10.xml.in                |   68 +
 data/oses/ubuntu/ubuntu4.10.xml.in                 |   44 +
 data/oses/ubuntu/ubuntu5.04.xml.in                 |   74 +
 data/oses/ubuntu/ubuntu5.10.xml.in                 |  102 +
 data/oses/ubuntu/ubuntu6.06.xml.in                 |  148 +
 data/oses/ubuntu/ubuntu6.10.xml.in                 |   82 +
 data/oses/ubuntu/ubuntu7.04.xml.in                 |   64 +
 data/oses/ubuntu/ubuntu7.10.xml.in                 |   64 +
 data/oses/ubuntu/ubuntu8.04.xml.in                 |   78 +
 data/oses/ubuntu/ubuntu8.10.xml.in                 |   55 +
 data/oses/ubuntu/ubuntu9.04.xml.in                 |   59 +
 data/oses/ubuntu/ubuntu9.10.xml.in                 |   55 +
 data/oses/windows.xml.in                           | 1357 ------
 data/oses/windows/Makefile.am                      |    1 +
 data/oses/windows/win1.0.xml.in                    |   13 +
 data/oses/windows/win10.xml.in                     |   63 +
 data/oses/windows/win2.0.xml.in                    |   15 +
 data/oses/windows/win2.1.xml.in                    |   15 +
 data/oses/windows/win2k.xml.in                     |   49 +
 data/oses/windows/win2k12.xml.in                   |   68 +
 data/oses/windows/win2k12r2.xml.in                 |   67 +
 data/oses/windows/win2k3.xml.in                    |   72 +
 data/oses/windows/win2k3r2.xml.in                  |   65 +
 data/oses/windows/win2k8.xml.in                    |   65 +
 data/oses/windows/win2k8r2.xml.in                  |   50 +
 data/oses/windows/win3.1.xml.in                    |   15 +
 data/oses/windows/win7.xml.in                      |  231 ++
 data/oses/windows/win8.1.xml.in                    |  149 +
 data/oses/windows/win8.xml.in                      |   59 +
 data/oses/windows/win95.xml.in                     |   30 +
 data/oses/windows/win98.xml.in                     |   28 +
 data/oses/windows/winme.xml.in                     |   28 +
 data/oses/windows/winnt3.1.xml.in                  |   12 +
 data/oses/windows/winnt3.5.xml.in                  |   15 +
 data/oses/windows/winnt3.51.xml.in                 |   15 +
 data/oses/windows/winnt4.0.xml.in                  |   15 +
 data/oses/windows/winvista.xml.in                  |   49 +
 data/oses/windows/winxp.xml.in                     |  113 +
 data/platforms/Makefile.am                         |    7 +
 data/platforms/qemu-kvm/Makefile.am                |    1 +
 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in      |   11 +
 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in        |   10 +
 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in      |   11 +
 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in      |   11 +
 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in      |   11 +
 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in      |   11 +
 data/platforms/qemu/Makefile.am                    |    1 +
 data/platforms/qemu/qemu-1.0.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.0.xml.in                |   55 +
 data/platforms/qemu/qemu-1.1.1-1.xml.in            |   10 +
 data/platforms/qemu/qemu-1.1.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.1.2.xml.in              |   10 +
 data/platforms/qemu/qemu-1.1.xml.in                |   10 +
 data/platforms/qemu/qemu-1.2.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.2.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.2.2.xml.in              |   10 +
 data/platforms/qemu/qemu-1.3.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.3.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.4.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.4.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.4.2.xml.in              |   10 +
 data/platforms/qemu/qemu-1.5.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.5.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.5.2.xml.in              |   10 +
 data/platforms/qemu/qemu-1.5.3.xml.in              |   10 +
 data/platforms/qemu/qemu-1.6.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.6.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.6.2.xml.in              |   10 +
 data/platforms/qemu/qemu-1.7.0.xml.in              |   10 +
 data/platforms/qemu/qemu-1.7.1.xml.in              |   10 +
 data/platforms/qemu/qemu-1.7.2.xml.in              |   10 +
 data/platforms/qemu/qemu-2.0.0.xml.in              |   10 +
 data/platforms/qemu/qemu-2.0.1.xml.in              |   10 +
 data/platforms/qemu/qemu-2.0.2.xml.in              |   10 +
 data/platforms/qemu/qemu-2.1.0.xml.in              |   10 +
 data/platforms/qemu/qemu-2.1.1.xml.in              |   10 +
 data/platforms/qemu/qemu-2.1.2.xml.in              |   10 +
 data/platforms/qemu/qemu-2.1.3.xml.in              |   10 +
 data/platforms/qemu/qemu-2.2.0.xml.in              |   10 +
 data/platforms/qemu/qemu-2.2.1.xml.in              |   10 +
 data/platforms/qemu/qemu-2.3.0.xml.in              |   10 +
 data/platforms/rhel-xen/Makefile.am                |    1 +
 data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in  |   17 +
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in  |   17 +
 data/platforms/xen/Makefile.am                     |    1 +
 data/platforms/xen/xen-3.0.2.xml.in                |   14 +
 data/platforms/xen/xen-3.0.3.xml.in                |   15 +
 data/platforms/xen/xen-3.0.4.xml.in                |   16 +
 data/platforms/xen/xen-3.1.3.xml.in                |   16 +
 data/platforms/xen/xen-3.1.4.xml.in                |   16 +
 data/platforms/xen/xen-3.2.0.xml.in                |   16 +
 data/platforms/xen/xen-3.2.1.xml.in                |   16 +
 data/platforms/xen/xen-3.2.2.xml.in                |   16 +
 data/platforms/xen/xen-3.2.3.xml.in                |   16 +
 data/platforms/xen/xen-3.3.0.xml.in                |   16 +
 data/platforms/xen/xen-3.3.1.xml.in                |   16 +
 data/platforms/xen/xen-3.3.2.xml.in                |   16 +
 data/platforms/xen/xen-3.4.0.xml.in                |   16 +
 data/platforms/xen/xen-3.4.1.xml.in                |   16 +
 data/platforms/xen/xen-3.4.2.xml.in                |   16 +
 data/platforms/xen/xen-3.4.3.xml.in                |   16 +
 data/platforms/xen/xen-4.0.0.xml.in                |   16 +
 data/platforms/xen/xen-4.0.1.xml.in                |   16 +
 data/platforms/xen/xen-4.1.0.xml.in                |   16 +
 data/schemas/libosinfo.rng                         |   24 +-
 libosinfo.spec.in                                  |    2 +-
 mingw-libosinfo.spec.in                            |    4 +-
 po/POTFILES.in                                     |  427 +-
 test/test-isodetect.c                              |    6 +-
 test/test-xml-validate                             |    4 +-
 520 files changed, 15356 insertions(+), 14881 deletions(-)
 create mode 100644 data/Makefile.inc
 delete mode 100644 data/datamaps/windows-lang.xml
 create mode 100644 data/datamaps/windows/Makefile.am
 create mode 100644 data/datamaps/windows/win-7-l10n-language.xml.in
 create mode 100644 data/datamaps/windows/win-8-l10n-language-reverse.xml.in
 create mode 100644 data/datamaps/windows/win-8-l10n-language.xml.in
 create mode 100644 data/datamaps/x11/Makefile.am
 rename data/datamaps/{x11-keyboard.xml => x11/x11-keyboard.xml.in} (96%)
 create mode 100644 data/devices/isa/Makefile.am
 create mode 100644 data/devices/isa/isa-ib700.xml.in
 create mode 100644 data/devices/pci/Makefile.am
 create mode 100644 data/devices/pci/pci-1000-0012.xml.in
 create mode 100644 data/devices/pci/pci-1013-00b8.xml.in
 create mode 100644 data/devices/pci/pci-1022-2000.xml.in
 create mode 100644 data/devices/pci/pci-10ec-8029.xml.in
 create mode 100644 data/devices/pci/pci-10ec-8139.xml.in
 create mode 100644 data/devices/pci/pci-1234-1111.xml.in
 create mode 100644 data/devices/pci/pci-1274-5000.xml.in
 create mode 100644 data/devices/pci/pci-15ad-0710.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1000.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1001.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1002.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1003.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1009.xml.in
 create mode 100644 data/devices/pci/pci-1b36-0100.xml.in
 create mode 100644 data/devices/pci/pci-8086-100e.xml.in
 create mode 100644 data/devices/pci/pci-8086-2415.xml.in
 create mode 100644 data/devices/pci/pci-8086-25ab.xml.in
 create mode 100644 data/devices/pci/pci-8086-2668.xml.in
 delete mode 100644 data/devices/qemu-pci.xml.in
 delete mode 100644 data/devices/qemu-ps2.xml.in
 delete mode 100644 data/devices/qemu-usb.xml.in
 create mode 100644 data/devices/usb/Makefile.am
 create mode 100644 data/devices/usb/usb-80ee-0021.xml.in
 delete mode 100644 data/devices/virtio-pci.xml.in
 delete mode 100644 data/devices/xen.xml.in
 create mode 100644 data/devices/xen/Makefile.am
 create mode 100644 data/devices/xen/xen-block.xml.in
 create mode 100644 data/devices/xen/xen-console.xml.in
 create mode 100644 data/devices/xen/xen-framebuffer.xml.in
 create mode 100644 data/devices/xen/xen-net.xml.in
 delete mode 100644 data/hypervisors/Makefile.am
 delete mode 100644 data/hypervisors/kvm.xml.in
 delete mode 100644 data/hypervisors/qemu.xml.in
 delete mode 100644 data/hypervisors/rhel-xen.xml.in
 delete mode 100644 data/hypervisors/xen.xml.in
 create mode 100644 data/install-scripts/debian/Makefile.am
 rename data/install-scripts/{debian.xml => debian/debian-desktop.xml.in} (59%)
 create mode 100644 data/install-scripts/debian/debian-jeos.xml.in
 create mode 100644 data/install-scripts/fedora/Makefile.am
 rename data/install-scripts/{fedora.xml => fedora/fedora-desktop.xml.in} (56%)
 create mode 100644 data/install-scripts/fedora/fedora-jeos.xml.in
 create mode 100644 data/install-scripts/rhel/Makefile.am
 rename data/install-scripts/{rhel.xml => rhel/rhel-desktop.xml.in} (58%)
 create mode 100644 data/install-scripts/rhel/rhel-jeos.xml.in
 create mode 100644 data/install-scripts/ubuntu/Makefile.am
 rename data/install-scripts/{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in} (99%)
 create mode 100644 data/install-scripts/windows/Makefile.am
 rename data/install-scripts/{windows-cmd.xml => windows/windows-cmd-desktop.xml.in} (99%)
 rename data/install-scripts/{windows-reg.xml => windows/windows-reg-desktop.xml.in} (97%)
 rename data/install-scripts/{windows-sif.xml => windows/windows-sif-desktop.xml.in} (68%)
 create mode 100644 data/install-scripts/windows/windows-sif-jeos.xml.in
 rename data/install-scripts/{windows-unattend.xml => windows/windows-unattend-desktop.xml.in} (55%)
 create mode 100644 data/install-scripts/windows/windows-unattend-jeos.xml.in
 delete mode 100644 data/oses/altlinux.xml.in
 create mode 100644 data/oses/altlinux/Makefile.am
 create mode 100644 data/oses/altlinux/altlinux1.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.2.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.4.xml.in
 create mode 100644 data/oses/altlinux/altlinux3.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux4.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux4.1.xml.in
 create mode 100644 data/oses/altlinux/altlinux5.xml.in
 create mode 100644 data/oses/altlinux/altlinux6.xml.in
 create mode 100644 data/oses/altlinux/altlinux7.xml.in
 delete mode 100644 data/oses/centos.xml.in
 create mode 100644 data/oses/centos/Makefile.am
 create mode 100644 data/oses/centos/centos6.0.xml.in
 create mode 100644 data/oses/centos/centos6.1.xml.in
 create mode 100644 data/oses/centos/centos6.2.xml.in
 create mode 100644 data/oses/centos/centos6.3.xml.in
 create mode 100644 data/oses/centos/centos6.4.xml.in
 create mode 100644 data/oses/centos/centos6.5.xml.in
 create mode 100644 data/oses/centos/centos7.0.xml.in
 delete mode 100644 data/oses/debian.xml.in
 create mode 100644 data/oses/debian/Makefile.am
 create mode 100644 data/oses/debian/debian1.0.xml.in
 create mode 100644 data/oses/debian/debian1.2.xml.in
 create mode 100644 data/oses/debian/debian1.3.xml.in
 create mode 100644 data/oses/debian/debian2.0.xml.in
 create mode 100644 data/oses/debian/debian2.1.xml.in
 create mode 100644 data/oses/debian/debian2.2.xml.in
 create mode 100644 data/oses/debian/debian3.1.xml.in
 create mode 100644 data/oses/debian/debian3.xml.in
 create mode 100644 data/oses/debian/debian4.xml.in
 create mode 100644 data/oses/debian/debian5.xml.in
 create mode 100644 data/oses/debian/debian6.xml.in
 create mode 100644 data/oses/debian/debian7.xml.in
 create mode 100644 data/oses/debian/debian8.xml.in
 delete mode 100644 data/oses/fedora.xml.in
 create mode 100644 data/oses/fedora/Makefile.am
 create mode 100644 data/oses/fedora/fedora-unknown.xml.in
 create mode 100644 data/oses/fedora/fedora1.xml.in
 create mode 100644 data/oses/fedora/fedora10.xml.in
 create mode 100644 data/oses/fedora/fedora11.xml.in
 create mode 100644 data/oses/fedora/fedora12.xml.in
 create mode 100644 data/oses/fedora/fedora13.xml.in
 create mode 100644 data/oses/fedora/fedora14.xml.in
 create mode 100644 data/oses/fedora/fedora15.xml.in
 create mode 100644 data/oses/fedora/fedora16.xml.in
 create mode 100644 data/oses/fedora/fedora17.xml.in
 create mode 100644 data/oses/fedora/fedora18.xml.in
 create mode 100644 data/oses/fedora/fedora19.xml.in
 create mode 100644 data/oses/fedora/fedora2.xml.in
 create mode 100644 data/oses/fedora/fedora20.xml.in
 create mode 100644 data/oses/fedora/fedora21.xml.in
 create mode 100644 data/oses/fedora/fedora22.xml.in
 create mode 100644 data/oses/fedora/fedora3.xml.in
 create mode 100644 data/oses/fedora/fedora4.xml.in
 create mode 100644 data/oses/fedora/fedora5.xml.in
 create mode 100644 data/oses/fedora/fedora6.xml.in
 create mode 100644 data/oses/fedora/fedora7.xml.in
 create mode 100644 data/oses/fedora/fedora8.xml.in
 create mode 100644 data/oses/fedora/fedora9.xml.in
 delete mode 100644 data/oses/freebsd.xml.in
 create mode 100644 data/oses/freebsd/Makefile.am
 create mode 100644 data/oses/freebsd/freebsd1.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd10.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd10.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.0.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.2.8.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.2.9.xml.in
 create mode 100644 data/oses/freebsd/freebsd3.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd3.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.10.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.11.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.6.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.7.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.8.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.9.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.2.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.3.xml.in
 delete mode 100644 data/oses/gnome.xml.in
 create mode 100644 data/oses/gnome/Makefile.am
 create mode 100644 data/oses/gnome/gnome-continuous-3.10.xml.in
 create mode 100644 data/oses/gnome/gnome-continuous-3.12.xml.in
 create mode 100644 data/oses/gnome/gnome-continuous-3.14.xml.in
 create mode 100644 data/oses/gnome/gnome3.6.xml.in
 create mode 100644 data/oses/gnome/gnome3.8.xml.in
 delete mode 100644 data/oses/macos.xml.in
 create mode 100644 data/oses/macos/Makefile.am
 create mode 100644 data/oses/macos/macosx10.0.xml.in
 create mode 100644 data/oses/macos/macosx10.1.xml.in
 create mode 100644 data/oses/macos/macosx10.2.xml.in
 create mode 100644 data/oses/macos/macosx10.3.xml.in
 create mode 100644 data/oses/macos/macosx10.4.xml.in
 create mode 100644 data/oses/macos/macosx10.5.xml.in
 create mode 100644 data/oses/macos/macosx10.6.xml.in
 create mode 100644 data/oses/macos/macosx10.7.xml.in
 delete mode 100644 data/oses/mageia.xml.in
 create mode 100644 data/oses/mageia/Makefile.am
 create mode 100644 data/oses/mageia/mageia1.xml.in
 create mode 100644 data/oses/mageia/mageia2.xml.in
 create mode 100644 data/oses/mageia/mageia3.xml.in
 delete mode 100644 data/oses/mandrake.xml.in
 create mode 100644 data/oses/mandrake/Makefile.am
 create mode 100644 data/oses/mandrake/mandrake10.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake10.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake10.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.3.xml.in
 create mode 100644 data/oses/mandrake/mandrake6.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake6.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.2.xml.in
 delete mode 100644 data/oses/mandriva.xml.in
 create mode 100644 data/oses/mandriva/Makefile.am
 create mode 100644 data/oses/mandriva/mandriva2006.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2007.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2007.xml.in
 create mode 100644 data/oses/mandriva/mandriva2008.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2008.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2009.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2009.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.2.xml.in
 create mode 100644 data/oses/mandriva/mandriva2011.xml.in
 create mode 100644 data/oses/mandriva/mbs1.0.xml.in
 create mode 100644 data/oses/mandriva/mes5.1.xml.in
 create mode 100644 data/oses/mandriva/mes5.xml.in
 create mode 100644 data/oses/msdos/Makefile.am
 rename data/oses/{dos.xml.in => msdos/msdos6.22.xml.in} (100%)
 delete mode 100644 data/oses/netbsd.xml.in
 create mode 100644 data/oses/netbsd/Makefile.am
 create mode 100644 data/oses/netbsd/netbsd0.8.xml.in
 create mode 100644 data/oses/netbsd/netbsd0.9.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.1.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.2.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.3.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.4.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.5.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.6.xml.in
 create mode 100644 data/oses/netbsd/netbsd2.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd3.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd4.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd5.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd5.1.xml.in
 delete mode 100644 data/oses/netware.xml.in
 create mode 100644 data/oses/netware/Makefile.am
 create mode 100644 data/oses/netware/netware4.xml.in
 create mode 100644 data/oses/netware/netware5.xml.in
 create mode 100644 data/oses/netware/netware6.xml.in
 delete mode 100644 data/oses/openbsd.xml.in
 create mode 100644 data/oses/openbsd/Makefile.am
 create mode 100644 data/oses/openbsd/openbsd4.2.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.3.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.4.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.5.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.8.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.9.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.0.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.1.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.2.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.3.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.4.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.5.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.6.xml.in
 delete mode 100644 data/oses/opensuse.xml.in
 create mode 100644 data/oses/opensuse/Makefile.am
 create mode 100644 data/oses/opensuse/opensuse-factory.xml.in
 create mode 100644 data/oses/opensuse/opensuse-unknown.xml.in
 create mode 100644 data/oses/opensuse/opensuse10.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse10.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.0.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.4.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse13.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse13.2.xml.in
 delete mode 100644 data/oses/rhel.xml.in
 create mode 100644 data/oses/rhel/Makefile.am
 create mode 100644 data/oses/rhel/rhel-atomic-7.0.xml.in
 create mode 100644 data/oses/rhel/rhel-atomic-7.1.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.1.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.2.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.3.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.4.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.5.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.6.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.7.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.xml.in
 create mode 100644 data/oses/rhel/rhel3.1.xml.in
 create mode 100644 data/oses/rhel/rhel3.2.xml.in
 create mode 100644 data/oses/rhel/rhel3.3.xml.in
 create mode 100644 data/oses/rhel/rhel3.4.xml.in
 create mode 100644 data/oses/rhel/rhel3.5.xml.in
 create mode 100644 data/oses/rhel/rhel3.6.xml.in
 create mode 100644 data/oses/rhel/rhel3.7.xml.in
 create mode 100644 data/oses/rhel/rhel3.8.xml.in
 create mode 100644 data/oses/rhel/rhel3.9.xml.in
 create mode 100644 data/oses/rhel/rhel3.xml.in
 create mode 100644 data/oses/rhel/rhel4.0.xml.in
 create mode 100644 data/oses/rhel/rhel4.1.xml.in
 create mode 100644 data/oses/rhel/rhel4.2.xml.in
 create mode 100644 data/oses/rhel/rhel4.3.xml.in
 create mode 100644 data/oses/rhel/rhel4.4.xml.in
 create mode 100644 data/oses/rhel/rhel4.5.xml.in
 create mode 100644 data/oses/rhel/rhel4.6.xml.in
 create mode 100644 data/oses/rhel/rhel4.7.xml.in
 create mode 100644 data/oses/rhel/rhel4.8.xml.in
 create mode 100644 data/oses/rhel/rhel4.9.xml.in
 create mode 100644 data/oses/rhel/rhel5.0.xml.in
 create mode 100644 data/oses/rhel/rhel5.1.xml.in
 create mode 100644 data/oses/rhel/rhel5.10.xml.in
 create mode 100644 data/oses/rhel/rhel5.11.xml.in
 create mode 100644 data/oses/rhel/rhel5.2.xml.in
 create mode 100644 data/oses/rhel/rhel5.3.xml.in
 create mode 100644 data/oses/rhel/rhel5.4.xml.in
 create mode 100644 data/oses/rhel/rhel5.5.xml.in
 create mode 100644 data/oses/rhel/rhel5.6.xml.in
 create mode 100644 data/oses/rhel/rhel5.7.xml.in
 create mode 100644 data/oses/rhel/rhel5.8.xml.in
 create mode 100644 data/oses/rhel/rhel5.9.xml.in
 create mode 100644 data/oses/rhel/rhel6.0.xml.in
 create mode 100644 data/oses/rhel/rhel6.1.xml.in
 create mode 100644 data/oses/rhel/rhel6.2.xml.in
 create mode 100644 data/oses/rhel/rhel6.3.xml.in
 create mode 100644 data/oses/rhel/rhel6.4.xml.in
 create mode 100644 data/oses/rhel/rhel6.5.xml.in
 create mode 100644 data/oses/rhel/rhel6.6.xml.in
 create mode 100644 data/oses/rhel/rhel7.0.xml.in
 create mode 100644 data/oses/rhel/rhel7.1.xml.in
 delete mode 100644 data/oses/rhl.xml.in
 create mode 100644 data/oses/rhl/Makefile.am
 create mode 100644 data/oses/rhl/rhl1.0.xml.in
 create mode 100644 data/oses/rhl/rhl1.1.xml.in
 create mode 100644 data/oses/rhl/rhl2.0.xml.in
 create mode 100644 data/oses/rhl/rhl2.1.xml.in
 create mode 100644 data/oses/rhl/rhl3.0.3.xml.in
 create mode 100644 data/oses/rhl/rhl4.0.xml.in
 create mode 100644 data/oses/rhl/rhl4.1.xml.in
 create mode 100644 data/oses/rhl/rhl4.2.xml.in
 create mode 100644 data/oses/rhl/rhl5.0.xml.in
 create mode 100644 data/oses/rhl/rhl5.1.xml.in
 create mode 100644 data/oses/rhl/rhl5.2.xml.in
 create mode 100644 data/oses/rhl/rhl6.0.xml.in
 create mode 100644 data/oses/rhl/rhl6.1.xml.in
 create mode 100644 data/oses/rhl/rhl6.2.xml.in
 create mode 100644 data/oses/rhl/rhl7.1.xml.in
 create mode 100644 data/oses/rhl/rhl7.2.xml.in
 create mode 100644 data/oses/rhl/rhl7.3.xml.in
 create mode 100644 data/oses/rhl/rhl7.xml.in
 create mode 100644 data/oses/rhl/rhl8.0.xml.in
 create mode 100644 data/oses/rhl/rhl9.xml.in
 delete mode 100644 data/oses/solaris.xml.in
 create mode 100644 data/oses/solaris/Makefile.am
 create mode 100644 data/oses/solaris/opensolaris2009.06.xml.in
 create mode 100644 data/oses/solaris/solaris10.xml.in
 create mode 100644 data/oses/solaris/solaris11.xml.in
 create mode 100644 data/oses/solaris/solaris9.xml.in
 delete mode 100644 data/oses/suse.xml.in
 create mode 100644 data/oses/suse/Makefile.am
 create mode 100644 data/oses/suse/sled10.xml.in
 create mode 100644 data/oses/suse/sled11.xml.in
 create mode 100644 data/oses/suse/sled11sp1.xml.in
 create mode 100644 data/oses/suse/sled11sp2.xml.in
 create mode 100644 data/oses/suse/sled11sp3.xml.in
 create mode 100644 data/oses/suse/sled11sp4.xml.in
 create mode 100644 data/oses/suse/sled12.xml.in
 create mode 100644 data/oses/suse/sled9.xml.in
 create mode 100644 data/oses/suse/sles10.xml.in
 create mode 100644 data/oses/suse/sles11.xml.in
 create mode 100644 data/oses/suse/sles11sp1.xml.in
 create mode 100644 data/oses/suse/sles11sp2.xml.in
 create mode 100644 data/oses/suse/sles11sp3.xml.in
 create mode 100644 data/oses/suse/sles11sp4.xml.in
 create mode 100644 data/oses/suse/sles12.xml.in
 create mode 100644 data/oses/suse/sles9.xml.in
 delete mode 100644 data/oses/ubuntu.xml.in
 create mode 100644 data/oses/ubuntu/Makefile.am
 create mode 100644 data/oses/ubuntu/ubuntu10.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu10.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu11.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu11.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu12.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu12.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu13.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu13.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu14.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu14.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu15.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu15.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu4.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu5.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu5.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu6.06.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu6.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu7.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu7.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu8.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu8.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu9.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu9.10.xml.in
 delete mode 100644 data/oses/windows.xml.in
 create mode 100644 data/oses/windows/Makefile.am
 create mode 100644 data/oses/windows/win1.0.xml.in
 create mode 100644 data/oses/windows/win10.xml.in
 create mode 100644 data/oses/windows/win2.0.xml.in
 create mode 100644 data/oses/windows/win2.1.xml.in
 create mode 100644 data/oses/windows/win2k.xml.in
 create mode 100644 data/oses/windows/win2k12.xml.in
 create mode 100644 data/oses/windows/win2k12r2.xml.in
 create mode 100644 data/oses/windows/win2k3.xml.in
 create mode 100644 data/oses/windows/win2k3r2.xml.in
 create mode 100644 data/oses/windows/win2k8.xml.in
 create mode 100644 data/oses/windows/win2k8r2.xml.in
 create mode 100644 data/oses/windows/win3.1.xml.in
 create mode 100644 data/oses/windows/win7.xml.in
 create mode 100644 data/oses/windows/win8.1.xml.in
 create mode 100644 data/oses/windows/win8.xml.in
 create mode 100644 data/oses/windows/win95.xml.in
 create mode 100644 data/oses/windows/win98.xml.in
 create mode 100644 data/oses/windows/winme.xml.in
 create mode 100644 data/oses/windows/winnt3.1.xml.in
 create mode 100644 data/oses/windows/winnt3.5.xml.in
 create mode 100644 data/oses/windows/winnt3.51.xml.in
 create mode 100644 data/oses/windows/winnt4.0.xml.in
 create mode 100644 data/oses/windows/winvista.xml.in
 create mode 100644 data/oses/windows/winxp.xml.in
 create mode 100644 data/platforms/Makefile.am
 create mode 100644 data/platforms/qemu-kvm/Makefile.am
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
 create mode 100644 data/platforms/qemu/Makefile.am
 create mode 100644 data/platforms/qemu/qemu-1.0.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.1-1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.3.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.3.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.3.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.3.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.2.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.2.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.3.0.xml.in
 create mode 100644 data/platforms/rhel-xen/Makefile.am
 create mode 100644 data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in
 create mode 100644 data/platforms/xen/Makefile.am
 create mode 100644 data/platforms/xen/xen-3.0.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.0.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.0.4.xml.in
 create mode 100644 data/platforms/xen/xen-3.1.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.1.4.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.3.xml.in
 create mode 100644 data/platforms/xen/xen-4.0.0.xml.in
 create mode 100644 data/platforms/xen/xen-4.0.1.xml.in
 create mode 100644 data/platforms/xen/xen-4.1.0.xml.in

-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:19 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:19 +0100
Subject: [Libosinfo] [PATCH 01/39] data: remove most information about PCI
	devices
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-2-git-send-email-berrange@redhat.com>

We already load PCI/USB information from the pci.ids/usb.ids
files, so should not duplicate it again in XML files. The
only info we need to retain are the device classes.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/devices/qemu-pci.xml.in   | 61 +-----------------------------------------
 data/devices/qemu-usb.xml.in   |  5 ----
 data/devices/virtio-pci.xml.in | 25 -----------------
 data/schemas/libosinfo.rng     | 24 +++++++++--------
 4 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
index 0d0fbc9..e880434 100644
--- a/data/devices/qemu-pci.xml.in
+++ b/data/devices/qemu-pci.xml.in
@@ -5,12 +5,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012">
     <name>lsi</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>LSI Logic / Symbios Logic</_vendor>
-    <vendor-id>1000</vendor-id>
-    <product>53c895a</product>
-    <product-id>0012</product-id>
   </device>
 
   <!-- Video devices -->
@@ -27,73 +22,39 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8">
     <name>cirrus</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Cirrus Logic</_vendor>
-    <vendor-id>1013</vendor-id>
-    <product>GD 5446</product>
-    <product-id>00b8</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710">
     <name>vmvga</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>VMWare</_vendor>
-    <vendor-id>15ad</vendor-id>
-    <product>VGA</product>
-    <product-id>0710</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100">
     <name>qxl</name>
-    <bus-type>pci</bus-type>
     <class>video</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1b36</vendor-id>
-    <product>QXL</product>
-    <product-id>0100</product-id>
   </device>
 
 
   <!-- Network devices -->
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029">
     <name>ne2k_pci</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8029(AS)</product>
-    <product-id>8029</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000">
     <name>pcnet</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Advanced Micro Devices [AMD]</_vendor>
-    <vendor-id>1022</vendor-id>
-    <product>79c970 [PCnet32 LANCE]</product>
-    <product-id>2000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139">
     <name>rtl8139</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
-    <vendor-id>10ec</vendor-id>
-    <product>RTL-8139/8139C/8139C+</product>
-    <product-id>8139</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e">
     <name>e1000</name>
-    <bus-type>pci</bus-type>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82540EM Gigabit Ethernet Controller</product>
-    <product-id>100e</product-id>
+    <class>net</class>
   </device>
 
 
@@ -101,32 +62,17 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000">
     <name>es1370</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Ensoniq</_vendor>
-    <vendor-id>1274</vendor-id>
-    <product>ES1370 [AudioPCI]</product>
-    <product-id>5000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415">
     <name>ac97</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801AA AC'97 Audio Controller</product>
-    <product-id>2415</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668">
     <name>ich6</name>
-    <bus-type>pci</bus-type>
     <class>audio</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
-    <product-id>2668</product-id>
   </device>
 
 
@@ -134,12 +80,7 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab">
     <name>6300esb</name>
-    <bus-type>pci</bus-type>
     <class>watchdog</class>
-    <_vendor>Intel Corporation</_vendor>
-    <vendor-id>8086</vendor-id>
-    <product>6300ESB Watchdog Timer</product>
-    <product-id>25ab</product-id>
   </device>
 
   <device id="isa://ib700">
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in
index 213187f..9719661 100644
--- a/data/devices/qemu-usb.xml.in
+++ b/data/devices/qemu-usb.xml.in
@@ -3,12 +3,7 @@
 
   <device id="http://www.linux-usb.org/usb.ids/80ee/0021">
     <name>tablet</name>
-    <bus-type>usb</bus-type>
     <class>input</class>
-    <_vendor>VirtualBox</_vendor>
-    <vendor-id>80ee</vendor-id>
-    <product>Tablet</product>
-    <product-id>0021</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
index b5b3948..ccc32da 100644
--- a/data/devices/virtio-pci.xml.in
+++ b/data/devices/virtio-pci.xml.in
@@ -3,52 +3,27 @@
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000">
     <name>virtio-net</name>
-    <bus-type>pci</bus-type>
     <class>net</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio network device</product>
-    <product-id>1000</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001">
     <name>virtio-block</name>
-    <bus-type>pci</bus-type>
     <class>block</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio block device</product>
-    <product-id>1001</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002">
     <name>virtio-balloon</name>
-    <bus-type>pci</bus-type>
     <class>memory.balloon</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio memory balloon</product>
-    <product-id>1002</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003">
     <name>virtio-console</name>
-    <bus-type>pci</bus-type>
     <class>console</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio console</product>
-    <product-id>1003</product-id>
   </device>
 
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009">
     <name>virtio-9p</name>
-    <bus-type>pci</bus-type>
     <class>filesystem</class>
-    <_vendor>Red Hat, Inc</_vendor>
-    <vendor-id>1af4</vendor-id>
-    <product>Virtio 9p</product>
-    <product-id>1009</product-id>
   </device>
 
 </libosinfo>
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index b23d210..b36eef0 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -58,17 +58,19 @@
             <text/>
           </element>
         </oneOrMore>
-        <element name='bus-type'>
-          <choice>
-            <value>isa</value>
-            <value>pci</value>
-            <value>usb</value>
-            <value>xen</value>
-            <value>ps2</value>
-            <value>ide</value>
-            <value>virtio</value>
-          </choice>
-        </element>
+        <optional>
+          <element name='bus-type'>
+            <choice>
+              <value>isa</value>
+              <value>pci</value>
+              <value>usb</value>
+              <value>xen</value>
+              <value>ps2</value>
+              <value>ide</value>
+              <value>virtio</value>
+            </choice>
+          </element>
+        </optional>
         <optional>
           <element name='class'>
             <choice>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:20 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:20 +0100
Subject: [Libosinfo] [PATCH 02/39] Use a proper URI for ib700 device
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-3-git-send-email-berrange@redhat.com>

The ib700 device currently uses a URI of "isa://ib700". Change
that to refer to the product vendor http://ibasetechnologies.net/ib700
to follow scheme commonly uses for other entities.
---
 data/devices/qemu-pci.xml.in | 2 +-
 data/hypervisors/qemu.xml.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
index e880434..480a784 100644
--- a/data/devices/qemu-pci.xml.in
+++ b/data/devices/qemu-pci.xml.in
@@ -83,7 +83,7 @@
     <class>watchdog</class>
   </device>
 
-  <device id="isa://ib700">
+  <device id="http://ibasetechnologies.net/ib700">
     <name>ib700</name>
     <bus-type>isa</bus-type>
     <class>watchdog</class>
diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in
index 8fa2e0b..787a863 100644
--- a/data/hypervisors/qemu.xml.in
+++ b/data/hypervisors/qemu.xml.in
@@ -35,7 +35,7 @@
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/>
       <!-- watchdog devices -->
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
-      <device id="isa://ib700"/>
+      <device id="http://ibasetechnologies.net/ib700"/>
       <!-- ps2: keyboard -->
       <device id="http://qemu.org/ps2/keyboard"/>
       <!-- ps2: mouse -->
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:21 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:21 +0100
Subject: [Libosinfo] [PATCH 03/39] data: change PS2 device URIs to refer to
	ibm.com
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-4-git-send-email-berrange@redhat.com>

The PS2 computer spec originated with IBM, so the correct
URI to refer to is ibm.com not qemu.org

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 data/devices/qemu-ps2.xml.in | 4 ++--
 data/hypervisors/qemu.xml.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/qemu-ps2.xml.in
index 2335ac0..cef68e2 100644
--- a/data/devices/qemu-ps2.xml.in
+++ b/data/devices/qemu-ps2.xml.in
@@ -1,7 +1,7 @@
 <!-- PS2 devices for QEMU/KVM(s) -->
 <libosinfo version="0.0.1">
 
-  <device id="http://qemu.org/ps2/keyboard">
+  <device id="http://ibm.com/ps2/keyboard">
     <name>keyboard</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
@@ -9,7 +9,7 @@
     <product>Keyboard</product>
   </device>
 
-  <device id="http://qemu.org/ps2/mouse">
+  <device id="http://ibm.com/ps2/mouse">
     <name>mouse</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in
index 787a863..fa40c13 100644
--- a/data/hypervisors/qemu.xml.in
+++ b/data/hypervisors/qemu.xml.in
@@ -37,9 +37,9 @@
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
       <device id="http://ibasetechnologies.net/ib700"/>
       <!-- ps2: keyboard -->
-      <device id="http://qemu.org/ps2/keyboard"/>
+      <device id="http://ibm.com/ps2/keyboard"/>
       <!-- ps2: mouse -->
-      <device id="http://qemu.org/ps2/mouse"/>
+      <device id="http://ibm.com/ps2/mouse"/>
       <!-- USB tablet -->
       <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
       <!-- virtio-net -->
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:22 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:22 +0100
Subject: [Libosinfo] [PATCH 04/39] data: rename 'hypervisors' to 'platforms'
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-5-git-send-email-berrange@redhat.com>

The database directory name matches the object name, except in
the case of the platform object, where the directory is named
"hypevisors". Change the dir name to "platforms" to be consistent.
---
 configure.ac                                    | 2 +-
 data/Makefile.am                                | 2 +-
 data/{hypervisors => platforms}/Makefile.am     | 0
 data/{hypervisors => platforms}/kvm.xml.in      | 0
 data/{hypervisors => platforms}/qemu.xml.in     | 0
 data/{hypervisors => platforms}/rhel-xen.xml.in | 0
 data/{hypervisors => platforms}/xen.xml.in      | 0
 libosinfo.spec.in                               | 2 +-
 mingw-libosinfo.spec.in                         | 4 ++--
 po/POTFILES.in                                  | 8 ++++----
 test/test-xml-validate                          | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename data/{hypervisors => platforms}/Makefile.am (100%)
 rename data/{hypervisors => platforms}/kvm.xml.in (100%)
 rename data/{hypervisors => platforms}/qemu.xml.in (100%)
 rename data/{hypervisors => platforms}/rhel-xen.xml.in (100%)
 rename data/{hypervisors => platforms}/xen.xml.in (100%)

diff --git a/configure.ac b/configure.ac
index 7e7e956..e328f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_CONFIG_FILES([
 	data/Makefile
 	data/datamaps/Makefile
 	data/devices/Makefile
-	data/hypervisors/Makefile
+	data/platforms/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/schemas/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 407cc28..a29fde1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 INSTALL_DATA_HOOK_DEPS =
 
-SUBDIRS = datamaps devices oses hypervisors install-scripts schemas
+SUBDIRS = datamaps devices oses platforms install-scripts schemas
 EXTRA_DIST = usb.ids pci.ids
 CLEANFILES = usb.ids pci.ids
 
diff --git a/data/hypervisors/Makefile.am b/data/platforms/Makefile.am
similarity index 100%
rename from data/hypervisors/Makefile.am
rename to data/platforms/Makefile.am
diff --git a/data/hypervisors/kvm.xml.in b/data/platforms/kvm.xml.in
similarity index 100%
rename from data/hypervisors/kvm.xml.in
rename to data/platforms/kvm.xml.in
diff --git a/data/hypervisors/qemu.xml.in b/data/platforms/qemu.xml.in
similarity index 100%
rename from data/hypervisors/qemu.xml.in
rename to data/platforms/qemu.xml.in
diff --git a/data/hypervisors/rhel-xen.xml.in b/data/platforms/rhel-xen.xml.in
similarity index 100%
rename from data/hypervisors/rhel-xen.xml.in
rename to data/platforms/rhel-xen.xml.in
diff --git a/data/hypervisors/xen.xml.in b/data/platforms/xen.xml.in
similarity index 100%
rename from data/hypervisors/xen.xml.in
rename to data/platforms/xen.xml.in
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 68e1da4..c9f7e2c 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -112,7 +112,7 @@ rm -fr %{buildroot}
 %{_datadir}/libosinfo/db/datamaps
 %{_datadir}/libosinfo/db/devices
 %{_datadir}/libosinfo/db/oses
-%{_datadir}/libosinfo/db/hypervisors
+%{_datadir}/libosinfo/db/platforms
 %{_datadir}/libosinfo/db/install-scripts
 %{_datadir}/libosinfo/schemas/libosinfo.rng
 %{_mandir}/man1/osinfo-db-validate.1*
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 377d7ba..a678c3f 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw32_datadir}/libosinfo/db/datamaps
 %{mingw32_datadir}/libosinfo/db/devices
 %{mingw32_datadir}/libosinfo/db/oses
-%{mingw32_datadir}/libosinfo/db/hypervisors
+%{mingw32_datadir}/libosinfo/db/platforms
 %{mingw32_datadir}/libosinfo/db/install-scripts
 %{mingw32_datadir}/libosinfo/schemas/libosinfo.rng
 %{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
@@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 %{mingw64_datadir}/libosinfo/db/datamaps
 %{mingw64_datadir}/libosinfo/db/devices
 %{mingw64_datadir}/libosinfo/db/oses
-%{mingw64_datadir}/libosinfo/db/hypervisors
+%{mingw64_datadir}/libosinfo/db/platforms
 %{mingw64_datadir}/libosinfo/db/install-scripts
 %{mingw64_datadir}/libosinfo/schemas/libosinfo.rng
 %{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a1a551f..ed5a7b5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,10 +23,10 @@ data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
 data/devices/qemu-usb.xml.in
-data/hypervisors/kvm.xml.in
-data/hypervisors/qemu.xml.in
-data/hypervisors/rhel-xen.xml.in
-data/hypervisors/xen.xml.in
+data/platforms/kvm.xml.in
+data/platforms/qemu.xml.in
+data/platforms/rhel-xen.xml.in
+data/platforms/xen.xml.in
 osinfo/osinfo_avatar_format.c
 osinfo/osinfo_deployment.c
 osinfo/osinfo_devicelink.c
diff --git a/test/test-xml-validate b/test/test-xml-validate
index a2d20b4..e3cb1a0 100755
--- a/test/test-xml-validate
+++ b/test/test-xml-validate
@@ -42,7 +42,7 @@ exit $ret
 : ${srcdir=.}
 . $srcdir/test-lib.sh
 
-DIRS="datamaps oses hypervisors devices install-scripts"
+DIRS="datamaps oses platforms devices install-scripts"
 SCHEMA="libosinfo.rng"
 
 check_schema "$DIRS" "$SCHEMA"
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:23 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:23 +0100
Subject: [Libosinfo] [PATCH 05/39] data: split altlinux into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-6-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                          |   1 +
 data/Makefile.inc                     |  11 ++
 data/oses/Makefile.am                 |   5 +-
 data/oses/altlinux.xml.in             | 266 ----------------------------------
 data/oses/altlinux/Makefile.am        |   1 +
 data/oses/altlinux/altlinux1.0.xml.in |  12 ++
 data/oses/altlinux/altlinux2.0.xml.in |  13 ++
 data/oses/altlinux/altlinux2.2.xml.in |  13 ++
 data/oses/altlinux/altlinux2.4.xml.in |  25 ++++
 data/oses/altlinux/altlinux3.0.xml.in |  25 ++++
 data/oses/altlinux/altlinux4.0.xml.in |  33 +++++
 data/oses/altlinux/altlinux4.1.xml.in |  32 ++++
 data/oses/altlinux/altlinux5.xml.in   |  49 +++++++
 data/oses/altlinux/altlinux6.xml.in   |  37 +++++
 data/oses/altlinux/altlinux7.xml.in   |  33 +++++
 po/POTFILES.in                        |  11 +-
 16 files changed, 299 insertions(+), 268 deletions(-)
 create mode 100644 data/Makefile.inc
 delete mode 100644 data/oses/altlinux.xml.in
 create mode 100644 data/oses/altlinux/Makefile.am
 create mode 100644 data/oses/altlinux/altlinux1.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.2.xml.in
 create mode 100644 data/oses/altlinux/altlinux2.4.xml.in
 create mode 100644 data/oses/altlinux/altlinux3.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux4.0.xml.in
 create mode 100644 data/oses/altlinux/altlinux4.1.xml.in
 create mode 100644 data/oses/altlinux/altlinux5.xml.in
 create mode 100644 data/oses/altlinux/altlinux6.xml.in
 create mode 100644 data/oses/altlinux/altlinux7.xml.in

diff --git a/configure.ac b/configure.ac
index e328f3a..d672bcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,7 @@ AC_CONFIG_FILES([
 	data/platforms/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
+	data/oses/altlinux/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/Makefile.inc b/data/Makefile.inc
new file mode 100644
index 0000000..20d996b
--- /dev/null
+++ b/data/Makefile.inc
@@ -0,0 +1,11 @@
+# Generic rules that work for any subdir
+
+databasedir := $(pkgdatadir)/db/$(abs_srcdir:$(abs_top_srcdir)/data/%=%)
+database_SRC = $(wildcard $(srcdir)/*.xml.in)
+database_DATA = $(database_SRC:$(srcdir)/%.xml.in=%.xml)
+
+ at INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_SRC)
+
+CLEANFILES = $(database_DATA)
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index e1fb6fb..eab8da8 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,7 +1,10 @@
 
+SUBDIRS = \
+	altlinux \
+	$(NULL)
+
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	altlinux.xml.in \
 	centos.xml.in   \
 	debian.xml.in   \
 	dos.xml.in      \
diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in
deleted file mode 100644
index 9e6df02..0000000
--- a/data/oses/altlinux.xml.in
+++ /dev/null
@@ -1,266 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://altlinux.org/altlinux/1.0">
-    <short-id>altlinux1.0</short-id>
-    <_name>Mandrake RE Spring 2001</_name>
-    <version>1.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <release-date>2001-03-01</release-date>
-    <clones id="http://mandriva.com/mandrake/7.2"/>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/2.0">
-    <short-id>altlinux2.0</short-id>
-    <_name>ALT Linux 2.0</_name>
-    <version>2.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <upgrades id="http://altlinux.org/altlinux/1.0"/>
-    <derives-from id="http://altlinux.org/altlinux/1.0"/>
-    <release-date>2002-04-20</release-date>
-  </os>
-
-
-  <os id="http://altlinux.org/altlinux/2.2">
-    <short-id>altlinux2.2</short-id>
-    <_name>ALT Linux 2.2</_name>
-    <version>2.2</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <upgrades id="http://altlinux.org/altlinux/2.0"/>
-    <derives-from id="http://altlinux.org/altlinux/2.0"/>
-    <release-date>2003-03-01</release-date>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/2.4">
-    <short-id>altlinux2.4</short-id>
-    <_name>ALT Linux 2.4</_name>
-    <version>2.4</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <codename>Citron</codename>
-    <upgrades id="http://altlinux.org/altlinux/2.2"/>
-    <derives-from id="http://altlinux.org/altlinux/2.2"/>
-    <release-date>2004-09-01</release-date>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/2.4/Master/iso/Master-2.4-install-cd.iso</url>
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CDROM</volume-id>
-        <publisher-id>ALT Linux</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/all.rdz</initrd>
-    </media>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/3.0">
-    <short-id>altlinux3.0</short-id>
-    <_name>ALT Linux 3.0</_name>
-    <version>3.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <codename>caprifoil</codename>
-    <upgrades id="http://altlinux.org/altlinux/2.4"/>
-    <derives-from id="http://altlinux.org/altlinux/2.4"/>
-    <release-date>2005-03-22</release-date>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/3.0/iso/compact-3.0.4.iso</url>
-      <iso>
-        <system-id>ALT Linux</system-id>
-        <volume-id>Compact</volume-id>
-        <publisher-id>ALT Linux</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/4.0">
-    <short-id>altlinux4.0</short-id>
-    <_name>ALT Linux 4.0</_name>
-    <version>4.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <upgrades id="http://altlinux.org/altlinux/3.0"/>
-    <derives-from id="http://altlinux.org/altlinux/3.0"/>
-    <release-date>2007-06-01</release-date>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-i586-install-cd.iso</url>
-      <iso>
-        <volume-id>^("Terminal"|Server|"Desktop\ Personal")$</volume-id>
-        <publisher-id>ALT Linux( Team)?</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-x86_64-install-cd.iso</url>
-      <iso>
-        <system-id>ALT Linux Team</system-id>
-        <volume-id>^Server$</volume-id>
-        <publisher-id>ALT Linux</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/4.1">
-    <short-id>altlinux4.1</short-id>
-    <_name>ALT Linux 4.1</_name>
-    <version>4.1</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <upgrades id="http://altlinux.org/altlinux/4.0"/>
-    <derives-from id="http://altlinux.org/altlinux/4.0"/>
-    <release-date>2008-12-07</release-date>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-i586-install-dvd5.iso</url>
-      <iso>
-        <volume-id>^"Desktop"$</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso</url>
-      <iso>
-        <volume-id>^"Desktop"$</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/5">
-    <short-id>altlinux5</short-id>
-    <_name>ALT Linux 5.0.0 Ark</_name>
-    <version>5.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <codename>Ark</codename>
-    <upgrades id="http://altlinux.org/altlinux/4.1"/>
-    <derives-from id="http://altlinux.org/altlinux/4.1"/>
-    <release-date>2009-10-29</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso</url>
-      <iso>
-        <volume-id>ALT Linux 5.0.\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso</url>
-      <iso>
-        <volume-id>ALT Linux 5.0.\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-      </minimum>
-      <recommended>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/6">
-    <short-id>altlinux6</short-id>
-    <_name>ALT Linux 6.0.0 Centaurus</_name>
-    <version>6.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <codename>Centaurus</codename>
-    <upgrades id="http://altlinux.org/altlinux/5"/>
-    <derives-from id="http://altlinux.org/altlinux/5"/>
-    <release-date>2011-10-26</release-date>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso</url>
-      <iso>
-        <volume-id>(ALT|Simply) Linux 6.0.\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso</url>
-      <iso>
-        <volume-id>(ALT|Simply) Linux 6.0.\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-  </os>
-
-  <os id="http://altlinux.org/altlinux/7">
-    <short-id>altlinux7</short-id>
-    <_name>ALT Linux 7.0.0 Centaurus</_name>
-    <version>7.0</version>
-    <_vendor>ALTLinux</_vendor>
-    <family>linux</family>
-    <distro>altlinux</distro>
-    <codename>Centaurus</codename>
-    <upgrades id="http://altlinux.org/altlinux/5"/>
-    <derives-from id="http://altlinux.org/altlinux/5"/>
-    <release-date>2012-10-01</release-date>
-
-    <media arch="i686">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-i586-ru-install-dvd5.iso</url>
-      <iso>
-        <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-x86_64-ru-install-dvd5.iso</url>
-      <iso>
-        <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
-      </iso>
-      <kernel>isolinux/alt0/vmlinuz</kernel>
-      <initrd>isolinux/alt0/full.cz</initrd>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/altlinux/Makefile.am b/data/oses/altlinux/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/altlinux/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/altlinux/altlinux1.0.xml.in b/data/oses/altlinux/altlinux1.0.xml.in
new file mode 100644
index 0000000..c5b7b11
--- /dev/null
+++ b/data/oses/altlinux/altlinux1.0.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/1.0">
+    <short-id>altlinux1.0</short-id>
+    <_name>Mandrake RE Spring 2001</_name>
+    <version>1.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <release-date>2001-03-01</release-date>
+    <clones id="http://mandriva.com/mandrake/7.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux2.0.xml.in b/data/oses/altlinux/altlinux2.0.xml.in
new file mode 100644
index 0000000..b77997b
--- /dev/null
+++ b/data/oses/altlinux/altlinux2.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/2.0">
+    <short-id>altlinux2.0</short-id>
+    <_name>ALT Linux 2.0</_name>
+    <version>2.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <upgrades id="http://altlinux.org/altlinux/1.0"/>
+    <derives-from id="http://altlinux.org/altlinux/1.0"/>
+    <release-date>2002-04-20</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux2.2.xml.in b/data/oses/altlinux/altlinux2.2.xml.in
new file mode 100644
index 0000000..9e1f711
--- /dev/null
+++ b/data/oses/altlinux/altlinux2.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/2.2">
+    <short-id>altlinux2.2</short-id>
+    <_name>ALT Linux 2.2</_name>
+    <version>2.2</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <upgrades id="http://altlinux.org/altlinux/2.0"/>
+    <derives-from id="http://altlinux.org/altlinux/2.0"/>
+    <release-date>2003-03-01</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux2.4.xml.in b/data/oses/altlinux/altlinux2.4.xml.in
new file mode 100644
index 0000000..c2a2f3e
--- /dev/null
+++ b/data/oses/altlinux/altlinux2.4.xml.in
@@ -0,0 +1,25 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/2.4">
+    <short-id>altlinux2.4</short-id>
+    <_name>ALT Linux 2.4</_name>
+    <version>2.4</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <codename>Citron</codename>
+    <upgrades id="http://altlinux.org/altlinux/2.2"/>
+    <derives-from id="http://altlinux.org/altlinux/2.2"/>
+    <release-date>2004-09-01</release-date>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/2.4/Master/iso/Master-2.4-install-cd.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CDROM</volume-id>
+        <publisher-id>ALT Linux</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/all.rdz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux3.0.xml.in b/data/oses/altlinux/altlinux3.0.xml.in
new file mode 100644
index 0000000..a3770b9
--- /dev/null
+++ b/data/oses/altlinux/altlinux3.0.xml.in
@@ -0,0 +1,25 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/3.0">
+    <short-id>altlinux3.0</short-id>
+    <_name>ALT Linux 3.0</_name>
+    <version>3.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <codename>caprifoil</codename>
+    <upgrades id="http://altlinux.org/altlinux/2.4"/>
+    <derives-from id="http://altlinux.org/altlinux/2.4"/>
+    <release-date>2005-03-22</release-date>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/3.0/iso/compact-3.0.4.iso</url>
+      <iso>
+        <system-id>ALT Linux</system-id>
+        <volume-id>Compact</volume-id>
+        <publisher-id>ALT Linux</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux4.0.xml.in b/data/oses/altlinux/altlinux4.0.xml.in
new file mode 100644
index 0000000..d89688a
--- /dev/null
+++ b/data/oses/altlinux/altlinux4.0.xml.in
@@ -0,0 +1,33 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/4.0">
+    <short-id>altlinux4.0</short-id>
+    <_name>ALT Linux 4.0</_name>
+    <version>4.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <upgrades id="http://altlinux.org/altlinux/3.0"/>
+    <derives-from id="http://altlinux.org/altlinux/3.0"/>
+    <release-date>2007-06-01</release-date>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-i586-install-cd.iso</url>
+      <iso>
+        <volume-id>^("Terminal"|Server|"Desktop\ Personal")$</volume-id>
+        <publisher-id>ALT Linux( Team)?</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-x86_64-install-cd.iso</url>
+      <iso>
+        <system-id>ALT Linux Team</system-id>
+        <volume-id>^Server$</volume-id>
+        <publisher-id>ALT Linux</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux4.1.xml.in b/data/oses/altlinux/altlinux4.1.xml.in
new file mode 100644
index 0000000..055ce57
--- /dev/null
+++ b/data/oses/altlinux/altlinux4.1.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/4.1">
+    <short-id>altlinux4.1</short-id>
+    <_name>ALT Linux 4.1</_name>
+    <version>4.1</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <upgrades id="http://altlinux.org/altlinux/4.0"/>
+    <derives-from id="http://altlinux.org/altlinux/4.0"/>
+    <release-date>2008-12-07</release-date>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-i586-install-dvd5.iso</url>
+      <iso>
+        <volume-id>^"Desktop"$</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso</url>
+      <iso>
+        <volume-id>^"Desktop"$</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux5.xml.in b/data/oses/altlinux/altlinux5.xml.in
new file mode 100644
index 0000000..4dd78f2
--- /dev/null
+++ b/data/oses/altlinux/altlinux5.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/5">
+    <short-id>altlinux5</short-id>
+    <_name>ALT Linux 5.0.0 Ark</_name>
+    <version>5.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <codename>Ark</codename>
+    <upgrades id="http://altlinux.org/altlinux/4.1"/>
+    <derives-from id="http://altlinux.org/altlinux/4.1"/>
+    <release-date>2009-10-29</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso</url>
+      <iso>
+        <volume-id>ALT Linux 5.0.\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso</url>
+      <iso>
+        <volume-id>ALT Linux 5.0.\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+      </minimum>
+      <recommended>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux6.xml.in b/data/oses/altlinux/altlinux6.xml.in
new file mode 100644
index 0000000..3907eca
--- /dev/null
+++ b/data/oses/altlinux/altlinux6.xml.in
@@ -0,0 +1,37 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/6">
+    <short-id>altlinux6</short-id>
+    <_name>ALT Linux 6.0.0 Centaurus</_name>
+    <version>6.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <codename>Centaurus</codename>
+    <upgrades id="http://altlinux.org/altlinux/5"/>
+    <derives-from id="http://altlinux.org/altlinux/5"/>
+    <release-date>2011-10-26</release-date>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso</url>
+      <iso>
+        <volume-id>(ALT|Simply) Linux 6.0.\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso</url>
+      <iso>
+        <volume-id>(ALT|Simply) Linux 6.0.\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/altlinux/altlinux7.xml.in b/data/oses/altlinux/altlinux7.xml.in
new file mode 100644
index 0000000..cc1adda
--- /dev/null
+++ b/data/oses/altlinux/altlinux7.xml.in
@@ -0,0 +1,33 @@
+<libosinfo version="0.0.1">
+  <os id="http://altlinux.org/altlinux/7">
+    <short-id>altlinux7</short-id>
+    <_name>ALT Linux 7.0.0 Centaurus</_name>
+    <version>7.0</version>
+    <_vendor>ALTLinux</_vendor>
+    <family>linux</family>
+    <distro>altlinux</distro>
+    <codename>Centaurus</codename>
+    <upgrades id="http://altlinux.org/altlinux/5"/>
+    <derives-from id="http://altlinux.org/altlinux/5"/>
+    <release-date>2012-10-01</release-date>
+
+    <media arch="i686">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-i586-ru-install-dvd5.iso</url>
+      <iso>
+        <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-x86_64-ru-install-dvd5.iso</url>
+      <iso>
+        <volume-id>(ALT|Simply) Linux (6.9|7.0).\d</volume-id>
+        <publisher-id>ALT Linux Team</publisher-id>
+      </iso>
+      <kernel>isolinux/alt0/vmlinuz</kernel>
+      <initrd>isolinux/alt0/full.cz</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ed5a7b5..c768dc8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,13 @@
+data/oses/altlinux/altlinux1.0.xml.in
+data/oses/altlinux/altlinux2.0.xml.in
+data/oses/altlinux/altlinux2.2.xml.in
+data/oses/altlinux/altlinux2.4.xml.in
+data/oses/altlinux/altlinux3.0.xml.in
+data/oses/altlinux/altlinux4.0.xml.in
+data/oses/altlinux/altlinux4.1.xml.in
+data/oses/altlinux/altlinux5.xml.in
+data/oses/altlinux/altlinux6.xml.in
+data/oses/altlinux/altlinux7.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
 data/oses/dos.xml.in
@@ -18,7 +28,6 @@ data/oses/openbsd.xml.in
 data/oses/freebsd.xml.in
 data/oses/rhl.xml.in
 data/oses/netbsd.xml.in
-data/oses/altlinux.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:24 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:24 +0100
Subject: [Libosinfo] [PATCH 06/39] data: split centos into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-7-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                      |   1 +
 data/oses/Makefile.am             |   2 +-
 data/oses/centos.xml.in           | 328 --------------------------------------
 data/oses/centos/Makefile.am      |   1 +
 data/oses/centos/centos6.0.xml.in |  48 ++++++
 data/oses/centos/centos6.1.xml.in |  47 ++++++
 data/oses/centos/centos6.2.xml.in |  47 ++++++
 data/oses/centos/centos6.3.xml.in |  55 +++++++
 data/oses/centos/centos6.4.xml.in |  47 ++++++
 data/oses/centos/centos6.5.xml.in |  47 ++++++
 data/oses/centos/centos7.0.xml.in |  41 +++++
 po/POTFILES.in                    |   8 +-
 12 files changed, 342 insertions(+), 330 deletions(-)
 delete mode 100644 data/oses/centos.xml.in
 create mode 100644 data/oses/centos/Makefile.am
 create mode 100644 data/oses/centos/centos6.0.xml.in
 create mode 100644 data/oses/centos/centos6.1.xml.in
 create mode 100644 data/oses/centos/centos6.2.xml.in
 create mode 100644 data/oses/centos/centos6.3.xml.in
 create mode 100644 data/oses/centos/centos6.4.xml.in
 create mode 100644 data/oses/centos/centos6.5.xml.in
 create mode 100644 data/oses/centos/centos7.0.xml.in

diff --git a/configure.ac b/configure.ac
index d672bcc..ac979ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,6 +173,7 @@ AC_CONFIG_FILES([
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
+	data/oses/centos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index eab8da8..5819dda 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,11 +1,11 @@
 
 SUBDIRS = \
 	altlinux \
+	centos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	centos.xml.in   \
 	debian.xml.in   \
 	dos.xml.in      \
 	fedora.xml.in   \
diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
deleted file mode 100644
index 15d9895..0000000
--- a/data/oses/centos.xml.in
+++ /dev/null
@@ -1,328 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://centos.org/centos/6.0">
-    <short-id>centos6.0</short-id>
-    <_name>CentOS 6.0</_name>
-    <version>6.0</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <clones id="http://redhat.com/rhel/6.0"/>
-
-    <!-- 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="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.0_Final</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>CentOS_6.0_Final</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>
-
-  <os id="http://centos.org/centos/6.1">
-    <short-id>centos6.1</short-id>
-    <_name>CentOS 6.1</_name>
-    <version>6.1</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.0"/>
-    <clones id="http://redhat.com/rhel/6.1"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.1_Final</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>CentOS_6.1_Final</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>
-
-  <os id="http://centos.org/centos/6.2">
-    <short-id>centos6.2</short-id>
-    <_name>CentOS 6.2</_name>
-    <version>6.2</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.1"/>
-    <clones id="http://redhat.com/rhel/6.2"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.2_Final</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>CentOS_6.2_Final</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>
-
-  <os id="http://centos.org/centos/6.3">
-    <short-id>centos6.3</short-id>
-    <_name>CentOS 6.3</_name>
-    <version>6.3</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.2"/>
-    <clones id="http://redhat.com/rhel/6.3"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.3_Final</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>CentOS_6.3_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS-6.3-x86_64-LiveDVD</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>
-
-  <os id="http://centos.org/centos/6.4">
-    <short-id>centos6.4</short-id>
-    <_name>CentOS 6.4</_name>
-    <version>6.4</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.3"/>
-    <clones id="http://redhat.com/rhel/6.4"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.4_Final</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>CentOS_6.4_Final</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>
-
-  <os id="http://centos.org/centos/6.5">
-    <short-id>centos6.5</short-id>
-    <_name>CentOS 6.5</_name>
-    <version>6.5</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.4"/>
-    <clones id="http://redhat.com/rhel/6.5"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.5_Final</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>CentOS_6.5_Final</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>
-
-  <os id="http://centos.org/centos/7.0">
-    <short-id>centos7.0</short-id>
-    <_name>CentOS 7.0</_name>
-    <version>7.0</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.5"/>
-    <clones id="http://redhat.com/rhel/7.0"/>
-
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*CentOS 7 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>
diff --git a/data/oses/centos/Makefile.am b/data/oses/centos/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/centos/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/centos/centos6.0.xml.in b/data/oses/centos/centos6.0.xml.in
new file mode 100644
index 0000000..3de8d90
--- /dev/null
+++ b/data/oses/centos/centos6.0.xml.in
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.0">
+    <short-id>centos6.0</short-id>
+    <_name>CentOS 6.0</_name>
+    <version>6.0</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <clones id="http://redhat.com/rhel/6.0"/>
+
+    <!-- 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="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.0_Final</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>CentOS_6.0_Final</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>
+</libosinfo>
diff --git a/data/oses/centos/centos6.1.xml.in b/data/oses/centos/centos6.1.xml.in
new file mode 100644
index 0000000..b407875
--- /dev/null
+++ b/data/oses/centos/centos6.1.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.1">
+    <short-id>centos6.1</short-id>
+    <_name>CentOS 6.1</_name>
+    <version>6.1</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.0"/>
+    <clones id="http://redhat.com/rhel/6.1"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.1_Final</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>CentOS_6.1_Final</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>
+</libosinfo>
diff --git a/data/oses/centos/centos6.2.xml.in b/data/oses/centos/centos6.2.xml.in
new file mode 100644
index 0000000..0a578e2
--- /dev/null
+++ b/data/oses/centos/centos6.2.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.2">
+    <short-id>centos6.2</short-id>
+    <_name>CentOS 6.2</_name>
+    <version>6.2</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.1"/>
+    <clones id="http://redhat.com/rhel/6.2"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.2_Final</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>CentOS_6.2_Final</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>
+</libosinfo>
diff --git a/data/oses/centos/centos6.3.xml.in b/data/oses/centos/centos6.3.xml.in
new file mode 100644
index 0000000..db10952
--- /dev/null
+++ b/data/oses/centos/centos6.3.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.3">
+    <short-id>centos6.3</short-id>
+    <_name>CentOS 6.3</_name>
+    <version>6.3</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.2"/>
+    <clones id="http://redhat.com/rhel/6.3"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.3_Final</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>CentOS_6.3_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-6.3-x86_64-LiveDVD</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>
+</libosinfo>
diff --git a/data/oses/centos/centos6.4.xml.in b/data/oses/centos/centos6.4.xml.in
new file mode 100644
index 0000000..3532f1b
--- /dev/null
+++ b/data/oses/centos/centos6.4.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.4">
+    <short-id>centos6.4</short-id>
+    <_name>CentOS 6.4</_name>
+    <version>6.4</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.3"/>
+    <clones id="http://redhat.com/rhel/6.4"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.4_Final</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>CentOS_6.4_Final</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>
+</libosinfo>
diff --git a/data/oses/centos/centos6.5.xml.in b/data/oses/centos/centos6.5.xml.in
new file mode 100644
index 0000000..0972527
--- /dev/null
+++ b/data/oses/centos/centos6.5.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.5">
+    <short-id>centos6.5</short-id>
+    <_name>CentOS 6.5</_name>
+    <version>6.5</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.4"/>
+    <clones id="http://redhat.com/rhel/6.5"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.5_Final</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>CentOS_6.5_Final</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>
+</libosinfo>
diff --git a/data/oses/centos/centos7.0.xml.in b/data/oses/centos/centos7.0.xml.in
new file mode 100644
index 0000000..6c7d1ec
--- /dev/null
+++ b/data/oses/centos/centos7.0.xml.in
@@ -0,0 +1,41 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/7.0">
+    <short-id>centos7.0</short-id>
+    <_name>CentOS 7.0</_name>
+    <version>7.0</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.5"/>
+    <clones id="http://redhat.com/rhel/7.0"/>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*CentOS 7 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>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c768dc8..b1d59b6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,13 @@ data/oses/altlinux/altlinux4.1.xml.in
 data/oses/altlinux/altlinux5.xml.in
 data/oses/altlinux/altlinux6.xml.in
 data/oses/altlinux/altlinux7.xml.in
+data/oses/centos/centos6.0.xml.in
+data/oses/centos/centos6.1.xml.in
+data/oses/centos/centos6.2.xml.in
+data/oses/centos/centos6.3.xml.in
+data/oses/centos/centos6.4.xml.in
+data/oses/centos/centos6.5.xml.in
+data/oses/centos/centos7.0.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
 data/oses/dos.xml.in
@@ -23,7 +30,6 @@ data/oses/opensuse.xml.in
 data/oses/macos.xml.in
 data/oses/debian.xml.in
 data/oses/ubuntu.xml.in
-data/oses/centos.xml.in
 data/oses/openbsd.xml.in
 data/oses/freebsd.xml.in
 data/oses/rhl.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:25 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:25 +0100
Subject: [Libosinfo] [PATCH 07/39] data: split debian into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-8-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                      |   1 +
 data/oses/Makefile.am             |   2 +-
 data/oses/debian.xml.in           | 315 --------------------------------------
 data/oses/debian/Makefile.am      |   1 +
 data/oses/debian/debian1.0.xml.in |  11 ++
 data/oses/debian/debian1.2.xml.in |  13 ++
 data/oses/debian/debian1.3.xml.in |  13 ++
 data/oses/debian/debian2.0.xml.in |  13 ++
 data/oses/debian/debian2.1.xml.in |  13 ++
 data/oses/debian/debian2.2.xml.in |  13 ++
 data/oses/debian/debian3.1.xml.in |  13 ++
 data/oses/debian/debian3.xml.in   |  13 ++
 data/oses/debian/debian4.xml.in   |  13 ++
 data/oses/debian/debian5.xml.in   |  32 ++++
 data/oses/debian/debian6.xml.in   |  71 +++++++++
 data/oses/debian/debian7.xml.in   |  53 +++++++
 data/oses/debian/debian8.xml.in   |  53 +++++++
 po/POTFILES.in                    |  14 +-
 18 files changed, 340 insertions(+), 317 deletions(-)
 delete mode 100644 data/oses/debian.xml.in
 create mode 100644 data/oses/debian/Makefile.am
 create mode 100644 data/oses/debian/debian1.0.xml.in
 create mode 100644 data/oses/debian/debian1.2.xml.in
 create mode 100644 data/oses/debian/debian1.3.xml.in
 create mode 100644 data/oses/debian/debian2.0.xml.in
 create mode 100644 data/oses/debian/debian2.1.xml.in
 create mode 100644 data/oses/debian/debian2.2.xml.in
 create mode 100644 data/oses/debian/debian3.1.xml.in
 create mode 100644 data/oses/debian/debian3.xml.in
 create mode 100644 data/oses/debian/debian4.xml.in
 create mode 100644 data/oses/debian/debian5.xml.in
 create mode 100644 data/oses/debian/debian6.xml.in
 create mode 100644 data/oses/debian/debian7.xml.in
 create mode 100644 data/oses/debian/debian8.xml.in

diff --git a/configure.ac b/configure.ac
index ac979ce..3841253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,7 @@ AC_CONFIG_FILES([
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
+	data/oses/debian/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 5819dda..2399684 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -2,11 +2,11 @@
 SUBDIRS = \
 	altlinux \
 	centos \
+	debian \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	debian.xml.in   \
 	dos.xml.in      \
 	fedora.xml.in   \
 	freebsd.xml.in  \
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
deleted file mode 100644
index 0e14568..0000000
--- a/data/oses/debian.xml.in
+++ /dev/null
@@ -1,315 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://debian.org/debian/1.0">
-    <short-id>debian1.0</short-id>
-    <short-id>debianbuzz</short-id>
-    <_name>Debian Buzz</_name>
-    <version>1.1</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-  </os>
-
-  <os id="http://debian.org/debian/1.2">
-    <short-id>debian1.2</short-id>
-    <short-id>debianrex</short-id>
-    <_name>Debian Rex</_name>
-    <version>1.2</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.0"/>
-    <derives-from id="http://debian.org/debian/1.0"/>
-  </os>
-
-  <os id="http://debian.org/debian/1.3">
-    <short-id>debian1.3</short-id>
-    <short-id>debianbo</short-id>
-    <_name>Debian Bo</_name>
-    <version>1.3</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.2"/>
-    <derives-from id="http://debian.org/debian/1.2"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.0">
-    <short-id>debian2.0</short-id>
-    <short-id>debianhamm</short-id>
-    <_name>Debian Hamm</_name>
-    <version>2.0</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/1.3"/>
-    <derives-from id="http://debian.org/debian/1.3"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.1">
-    <short-id>debian2.1</short-id>
-    <short-id>debianslink</short-id>
-    <_name>Debian Slink</_name>
-    <version>2.1</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.0"/>
-    <derives-from id="http://debian.org/debian/2.0"/>
-  </os>
-
-  <os id="http://debian.org/debian/2.2">
-    <short-id>debian2.2</short-id>
-    <short-id>debianpotato</short-id>
-    <_name>Debian Potato</_name>
-    <version>2.2</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.1"/>
-    <derives-from id="http://debian.org/debian/2.1"/>
-  </os>
-
-  <os id="http://debian.org/debian/3">
-    <short-id>debian3</short-id>
-    <short-id>debianwoody</short-id>
-    <_name>Debian Woody</_name>
-    <version>3</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/2.2"/>
-    <derives-from id="http://debian.org/debian/2.2"/>
-  </os>
-
-
-  <os id="http://debian.org/debian/3.1">
-    <short-id>debian3.1</short-id>
-    <short-id>debiansarge</short-id>
-    <_name>Debian Sarge</_name>
-    <version>3.1</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/3"/>
-    <derives-from id="http://debian.org/debian/3"/>
-  </os>
-
-  <os id="http://debian.org/debian/4">
-    <short-id>debian4</short-id>
-    <short-id>debianetch</short-id>
-    <_name>Debian Etch</_name>
-    <version>4</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/3.1"/>
-    <derives-from id="http://debian.org/debian/3.1"/>
-  </os>
-
-  <os id="http://debian.org/debian/5">
-    <short-id>debian5</short-id>
-    <short-id>debianlenny</short-id>
-    <_name>Debian Lenny</_name>
-    <version>5</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/4"/>
-    <derives-from id="http://debian.org/debian/4"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://debian.org/debian/6">
-    <short-id>debian6</short-id>
-    <short-id>debiansqueeze</short-id>
-    <_name>Debian Squeeze</_name>
-    <version>6</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/5"/>
-    <derives-from id="http://debian.org/debian/5"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 6.0.\d i386 1</volume-id>
-      </iso>
-      <kernel>install.386/vmlinuz</kernel>
-      <initrd>install.386/initrd.gz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 6.0.\d amd64 1</volume-id>
-      </iso>
-      <kernel>install.amd/vmlinuz</kernel>
-      <initrd>install.amd/initrd.gz</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url>
-      <iso>
-        <volume-id>Debian squeeze.*</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>install/vmlinuz</kernel>
-      <initrd>install/initrd.gz</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url>
-      <iso>
-        <volume-id>Debian squeeze.*</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>install/vmlinuz</kernel>
-      <initrd>install/initrd.gz</initrd>
-    </media>
-
-    <installer>
-      <script id='http://debian.org/scripts/debian/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://debian.org/debian/7">
-    <short-id>debian7</short-id>
-    <short-id>debianwheezy</short-id>
-    <_name>Debian Wheezy</_name>
-    <version>7</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/6"/>
-    <derives-from id="http://debian.org/debian/6"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet -->
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>21474836480</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 7.\d.\d i386 1</volume-id>
-      </iso>
-      <kernel>install.386/vmlinuz</kernel>
-      <initrd>install.386/initrd.gz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 7.\d.\d amd64 1</volume-id>
-      </iso>
-      <kernel>install.amd/vmlinuz</kernel>
-      <initrd>install.amd/initrd.gz</initrd>
-    </media>
-
-    <installer>
-      <script id='http://debian.org/scripts/debian/jeos'/>
-      <script id='http://debian.org/scripts/debian/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://debian.org/debian/8">
-    <short-id>debian8</short-id>
-    <short-id>debianjessie</short-id>
-    <_name>Debian Jessie</_name>
-    <version>8</version>
-    <_vendor>Debian Project</_vendor>
-    <family>linux</family>
-    <distro>debian</distro>
-    <upgrades id="http://debian.org/debian/7"/>
-    <derives-from id="http://debian.org/debian/7"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet -->
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>21474836480</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/8.0.0/i386/iso-dvd/debian-8.0.0-i386-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 8.\d.\d i386 1</volume-id>
-      </iso>
-      <kernel>install.386/vmlinuz</kernel>
-      <initrd>install.386/initrd.gz</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-dvd/debian-8.0.0-amd64-DVD-1.iso</url>
-      <iso>
-        <volume-id>Debian 8.\d.\d amd64 1</volume-id>
-      </iso>
-      <kernel>install.amd/vmlinuz</kernel>
-      <initrd>install.amd/initrd.gz</initrd>
-    </media>
-
-    <installer>
-      <script id='http://debian.org/scripts/debian/jeos'/>
-      <script id='http://debian.org/scripts/debian/desktop'/>
-    </installer>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/debian/Makefile.am b/data/oses/debian/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/debian/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/debian/debian1.0.xml.in b/data/oses/debian/debian1.0.xml.in
new file mode 100644
index 0000000..e322cbc
--- /dev/null
+++ b/data/oses/debian/debian1.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/1.0">
+    <short-id>debian1.0</short-id>
+    <short-id>debianbuzz</short-id>
+    <_name>Debian Buzz</_name>
+    <version>1.1</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian1.2.xml.in b/data/oses/debian/debian1.2.xml.in
new file mode 100644
index 0000000..b229daa
--- /dev/null
+++ b/data/oses/debian/debian1.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/1.2">
+    <short-id>debian1.2</short-id>
+    <short-id>debianrex</short-id>
+    <_name>Debian Rex</_name>
+    <version>1.2</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.0"/>
+    <derives-from id="http://debian.org/debian/1.0"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian1.3.xml.in b/data/oses/debian/debian1.3.xml.in
new file mode 100644
index 0000000..64b5b38
--- /dev/null
+++ b/data/oses/debian/debian1.3.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/1.3">
+    <short-id>debian1.3</short-id>
+    <short-id>debianbo</short-id>
+    <_name>Debian Bo</_name>
+    <version>1.3</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.2"/>
+    <derives-from id="http://debian.org/debian/1.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian2.0.xml.in b/data/oses/debian/debian2.0.xml.in
new file mode 100644
index 0000000..f5f2196
--- /dev/null
+++ b/data/oses/debian/debian2.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/2.0">
+    <short-id>debian2.0</short-id>
+    <short-id>debianhamm</short-id>
+    <_name>Debian Hamm</_name>
+    <version>2.0</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/1.3"/>
+    <derives-from id="http://debian.org/debian/1.3"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian2.1.xml.in b/data/oses/debian/debian2.1.xml.in
new file mode 100644
index 0000000..469a25b
--- /dev/null
+++ b/data/oses/debian/debian2.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/2.1">
+    <short-id>debian2.1</short-id>
+    <short-id>debianslink</short-id>
+    <_name>Debian Slink</_name>
+    <version>2.1</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.0"/>
+    <derives-from id="http://debian.org/debian/2.0"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian2.2.xml.in b/data/oses/debian/debian2.2.xml.in
new file mode 100644
index 0000000..e582061
--- /dev/null
+++ b/data/oses/debian/debian2.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/2.2">
+    <short-id>debian2.2</short-id>
+    <short-id>debianpotato</short-id>
+    <_name>Debian Potato</_name>
+    <version>2.2</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.1"/>
+    <derives-from id="http://debian.org/debian/2.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian3.1.xml.in b/data/oses/debian/debian3.1.xml.in
new file mode 100644
index 0000000..9311630
--- /dev/null
+++ b/data/oses/debian/debian3.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/3.1">
+    <short-id>debian3.1</short-id>
+    <short-id>debiansarge</short-id>
+    <_name>Debian Sarge</_name>
+    <version>3.1</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/3"/>
+    <derives-from id="http://debian.org/debian/3"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian3.xml.in b/data/oses/debian/debian3.xml.in
new file mode 100644
index 0000000..8209bb1
--- /dev/null
+++ b/data/oses/debian/debian3.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/3">
+    <short-id>debian3</short-id>
+    <short-id>debianwoody</short-id>
+    <_name>Debian Woody</_name>
+    <version>3</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/2.2"/>
+    <derives-from id="http://debian.org/debian/2.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian4.xml.in b/data/oses/debian/debian4.xml.in
new file mode 100644
index 0000000..3cb6ffa
--- /dev/null
+++ b/data/oses/debian/debian4.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/4">
+    <short-id>debian4</short-id>
+    <short-id>debianetch</short-id>
+    <_name>Debian Etch</_name>
+    <version>4</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/3.1"/>
+    <derives-from id="http://debian.org/debian/3.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian5.xml.in b/data/oses/debian/debian5.xml.in
new file mode 100644
index 0000000..e33f1fc
--- /dev/null
+++ b/data/oses/debian/debian5.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/5">
+    <short-id>debian5</short-id>
+    <short-id>debianlenny</short-id>
+    <_name>Debian Lenny</_name>
+    <version>5</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/4"/>
+    <derives-from id="http://debian.org/debian/4"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian6.xml.in b/data/oses/debian/debian6.xml.in
new file mode 100644
index 0000000..2de9aad
--- /dev/null
+++ b/data/oses/debian/debian6.xml.in
@@ -0,0 +1,71 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/6">
+    <short-id>debian6</short-id>
+    <short-id>debiansqueeze</short-id>
+    <_name>Debian Squeeze</_name>
+    <version>6</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/5"/>
+    <derives-from id="http://debian.org/debian/5"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 6.0.\d i386 1</volume-id>
+      </iso>
+      <kernel>install.386/vmlinuz</kernel>
+      <initrd>install.386/initrd.gz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 6.0.\d amd64 1</volume-id>
+      </iso>
+      <kernel>install.amd/vmlinuz</kernel>
+      <initrd>install.amd/initrd.gz</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url>
+      <iso>
+        <volume-id>Debian squeeze.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>install/vmlinuz</kernel>
+      <initrd>install/initrd.gz</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url>
+      <iso>
+        <volume-id>Debian squeeze.*</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>install/vmlinuz</kernel>
+      <initrd>install/initrd.gz</initrd>
+    </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian7.xml.in b/data/oses/debian/debian7.xml.in
new file mode 100644
index 0000000..74ed02f
--- /dev/null
+++ b/data/oses/debian/debian7.xml.in
@@ -0,0 +1,53 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/7">
+    <short-id>debian7</short-id>
+    <short-id>debianwheezy</short-id>
+    <_name>Debian Wheezy</_name>
+    <version>7</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/6"/>
+    <derives-from id="http://debian.org/debian/6"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet -->
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 7.\d.\d i386 1</volume-id>
+      </iso>
+      <kernel>install.386/vmlinuz</kernel>
+      <initrd>install.386/initrd.gz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 7.\d.\d amd64 1</volume-id>
+      </iso>
+      <kernel>install.amd/vmlinuz</kernel>
+      <initrd>install.amd/initrd.gz</initrd>
+    </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+      <script id='http://debian.org/scripts/debian/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/debian/debian8.xml.in b/data/oses/debian/debian8.xml.in
new file mode 100644
index 0000000..6cc4ac9
--- /dev/null
+++ b/data/oses/debian/debian8.xml.in
@@ -0,0 +1,53 @@
+<libosinfo version="0.0.1">
+  <os id="http://debian.org/debian/8">
+    <short-id>debian8</short-id>
+    <short-id>debianjessie</short-id>
+    <_name>Debian Jessie</_name>
+    <version>8</version>
+    <_vendor>Debian Project</_vendor>
+    <family>linux</family>
+    <distro>debian</distro>
+    <upgrades id="http://debian.org/debian/7"/>
+    <derives-from id="http://debian.org/debian/7"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB Tablet -->
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://cdimage.debian.org/debian-cd/8.0.0/i386/iso-dvd/debian-8.0.0-i386-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 8.\d.\d i386 1</volume-id>
+      </iso>
+      <kernel>install.386/vmlinuz</kernel>
+      <initrd>install.386/initrd.gz</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-dvd/debian-8.0.0-amd64-DVD-1.iso</url>
+      <iso>
+        <volume-id>Debian 8.\d.\d amd64 1</volume-id>
+      </iso>
+      <kernel>install.amd/vmlinuz</kernel>
+      <initrd>install.amd/initrd.gz</initrd>
+    </media>
+
+    <installer>
+      <script id='http://debian.org/scripts/debian/jeos'/>
+      <script id='http://debian.org/scripts/debian/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1d59b6..4200d8f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,6 +15,19 @@ data/oses/centos/centos6.3.xml.in
 data/oses/centos/centos6.4.xml.in
 data/oses/centos/centos6.5.xml.in
 data/oses/centos/centos7.0.xml.in
+data/oses/debian/debian1.0.xml.in
+data/oses/debian/debian1.2.xml.in
+data/oses/debian/debian1.3.xml.in
+data/oses/debian/debian2.0.xml.in
+data/oses/debian/debian2.1.xml.in
+data/oses/debian/debian2.2.xml.in
+data/oses/debian/debian3.1.xml.in
+data/oses/debian/debian3.xml.in
+data/oses/debian/debian4.xml.in
+data/oses/debian/debian5.xml.in
+data/oses/debian/debian6.xml.in
+data/oses/debian/debian7.xml.in
+data/oses/debian/debian8.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
 data/oses/dos.xml.in
@@ -28,7 +41,6 @@ data/oses/fedora.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
 data/oses/macos.xml.in
-data/oses/debian.xml.in
 data/oses/ubuntu.xml.in
 data/oses/openbsd.xml.in
 data/oses/freebsd.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:26 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:26 +0100
Subject: [Libosinfo] [PATCH 08/39] data: split dos into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-9-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                     | 1 +
 data/oses/Makefile.am                            | 2 +-
 data/oses/msdos/Makefile.am                      | 1 +
 data/oses/{dos.xml.in => msdos/msdos6.22.xml.in} | 0
 po/POTFILES.in                                   | 2 +-
 5 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 data/oses/msdos/Makefile.am
 rename data/oses/{dos.xml.in => msdos/msdos6.22.xml.in} (100%)

diff --git a/configure.ac b/configure.ac
index 3841253..97d7a7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ AC_CONFIG_FILES([
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
 	data/oses/debian/Makefile
+	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 2399684..325b5aa 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -3,11 +3,11 @@ SUBDIRS = \
 	altlinux \
 	centos \
 	debian \
+	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	dos.xml.in      \
 	fedora.xml.in   \
 	freebsd.xml.in  \
 	gnome.xml.in	\
diff --git a/data/oses/msdos/Makefile.am b/data/oses/msdos/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/msdos/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/dos.xml.in b/data/oses/msdos/msdos6.22.xml.in
similarity index 100%
rename from data/oses/dos.xml.in
rename to data/oses/msdos/msdos6.22.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4200d8f..84c32ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,9 +28,9 @@ data/oses/debian/debian5.xml.in
 data/oses/debian/debian6.xml.in
 data/oses/debian/debian7.xml.in
 data/oses/debian/debian8.xml.in
+data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
-data/oses/dos.xml.in
 data/oses/mageia.xml.in
 data/oses/mandrake.xml.in
 data/oses/mandriva.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:28 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:28 +0100
Subject: [Libosinfo] [PATCH 10/39] data: split freebsd into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-11-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                          |   1 +
 data/oses/Makefile.am                 |   2 +-
 data/oses/freebsd.xml.in              | 635 ----------------------------------
 data/oses/freebsd/Makefile.am         |   1 +
 data/oses/freebsd/freebsd1.0.xml.in   |  13 +
 data/oses/freebsd/freebsd10.0.xml.in  |  20 ++
 data/oses/freebsd/freebsd10.1.xml.in  |  27 ++
 data/oses/freebsd/freebsd2.0.5.xml.in |  14 +
 data/oses/freebsd/freebsd2.0.xml.in   |  16 +
 data/oses/freebsd/freebsd2.2.8.xml.in |  13 +
 data/oses/freebsd/freebsd2.2.9.xml.in |  13 +
 data/oses/freebsd/freebsd3.0.xml.in   |  16 +
 data/oses/freebsd/freebsd3.2.xml.in   |  13 +
 data/oses/freebsd/freebsd4.0.xml.in   |  16 +
 data/oses/freebsd/freebsd4.1.xml.in   |  14 +
 data/oses/freebsd/freebsd4.10.xml.in  |  14 +
 data/oses/freebsd/freebsd4.11.xml.in  |  17 +
 data/oses/freebsd/freebsd4.2.xml.in   |  14 +
 data/oses/freebsd/freebsd4.3.xml.in   |  14 +
 data/oses/freebsd/freebsd4.4.xml.in   |  14 +
 data/oses/freebsd/freebsd4.5.xml.in   |  14 +
 data/oses/freebsd/freebsd4.6.xml.in   |  14 +
 data/oses/freebsd/freebsd4.7.xml.in   |  14 +
 data/oses/freebsd/freebsd4.8.xml.in   |  14 +
 data/oses/freebsd/freebsd4.9.xml.in   |  14 +
 data/oses/freebsd/freebsd5.0.xml.in   |  16 +
 data/oses/freebsd/freebsd5.1.xml.in   |  14 +
 data/oses/freebsd/freebsd5.2.1.xml.in |  14 +
 data/oses/freebsd/freebsd5.2.xml.in   |  14 +
 data/oses/freebsd/freebsd5.3.xml.in   |  14 +
 data/oses/freebsd/freebsd5.4.xml.in   |  14 +
 data/oses/freebsd/freebsd5.5.xml.in   |  16 +
 data/oses/freebsd/freebsd6.0.xml.in   |  18 +
 data/oses/freebsd/freebsd6.1.xml.in   |  12 +
 data/oses/freebsd/freebsd6.2.xml.in   |  12 +
 data/oses/freebsd/freebsd6.3.xml.in   |  12 +
 data/oses/freebsd/freebsd6.4.xml.in   |  14 +
 data/oses/freebsd/freebsd7.0.xml.in   |  12 +
 data/oses/freebsd/freebsd7.1.xml.in   |  12 +
 data/oses/freebsd/freebsd7.2.xml.in   |  12 +
 data/oses/freebsd/freebsd7.3.xml.in   |  12 +
 data/oses/freebsd/freebsd7.4.xml.in   |  12 +
 data/oses/freebsd/freebsd8.0.xml.in   |  18 +
 data/oses/freebsd/freebsd8.1.xml.in   |  12 +
 data/oses/freebsd/freebsd8.2.xml.in   |  12 +
 data/oses/freebsd/freebsd8.3.xml.in   |  15 +
 data/oses/freebsd/freebsd8.4.xml.in   |  15 +
 data/oses/freebsd/freebsd9.0.xml.in   |  14 +
 data/oses/freebsd/freebsd9.1.xml.in   |  15 +
 data/oses/freebsd/freebsd9.2.xml.in   |  15 +
 data/oses/freebsd/freebsd9.3.xml.in   |  15 +
 po/POTFILES.in                        |  48 ++-
 52 files changed, 729 insertions(+), 637 deletions(-)
 delete mode 100644 data/oses/freebsd.xml.in
 create mode 100644 data/oses/freebsd/Makefile.am
 create mode 100644 data/oses/freebsd/freebsd1.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd10.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd10.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.0.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.2.8.xml.in
 create mode 100644 data/oses/freebsd/freebsd2.2.9.xml.in
 create mode 100644 data/oses/freebsd/freebsd3.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd3.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.10.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.11.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.6.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.7.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.8.xml.in
 create mode 100644 data/oses/freebsd/freebsd4.9.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.2.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd5.5.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd6.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd7.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.3.xml.in
 create mode 100644 data/oses/freebsd/freebsd8.4.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.0.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.1.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.2.xml.in
 create mode 100644 data/oses/freebsd/freebsd9.3.xml.in

diff --git a/configure.ac b/configure.ac
index 2db3ad8..f81037b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,7 @@ AC_CONFIG_FILES([
 	data/oses/centos/Makefile
 	data/oses/debian/Makefile
 	data/oses/fedora/Makefile
+	data/oses/freebsd/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 7a1e7c2..e6f41af 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -4,12 +4,12 @@ SUBDIRS = \
 	centos \
 	debian \
 	fedora \
+	freebsd \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	freebsd.xml.in  \
 	gnome.xml.in	\
 	mageia.xml.in \
 	mandriva.xml.in \
diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in
deleted file mode 100644
index 59c84d8..0000000
--- a/data/oses/freebsd.xml.in
+++ /dev/null
@@ -1,635 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://freebsd.org/freebsd/1.0">
-    <short-id>freebsd1.0</short-id>
-    <_name>FreeBSD 1.0</_name>
-    <version>1.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1993-11-00</release-date>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.0">
-    <short-id>freebsd2.0</short-id>
-    <_name>FreeBSD 2.0</_name>
-    <version>2.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1994-11-22</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/1.0"/>
-    <derives-from id="http://freebsd.org/freebsd/1.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.0.5">
-    <short-id>freebsd2.0.5</short-id>
-    <_name>FreeBSD 2.0.5</_name>
-    <version>2.0.5</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/2.0"/>
-    <derives-from id="http://freebsd.org/freebsd/2.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.2.8">
-    <short-id>freebsd2.2.8</short-id>
-    <_name>FreeBSD 2.2.8</_name>
-    <version>2.2.8</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
-    <derives-from id="http://freebsd.org/freebsd/2.0.5"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/2.2.9">
-    <short-id>freebsd2.2.9</short-id>
-    <_name>FreeBSD 2.2.9</_name>
-    <version>2.2.9</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
-    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/3.0">
-    <short-id>freebsd3.0</short-id>
-    <_name>FreeBSD 3.0</_name>
-    <version>3.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>1998-10-16</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
-    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/3.2">
-    <short-id>freebsd3.2</short-id>
-    <_name>FreeBSD 3.2</_name>
-    <version>3.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/3.0"/>
-    <derives-from id="http://freebsd.org/freebsd/3.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.0">
-    <short-id>freebsd4.0</short-id>
-    <_name>FreeBSD 4.0</_name>
-    <version>4.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2000-03-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/3.2"/>
-    <derives-from id="http://freebsd.org/freebsd/3.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.1">
-    <short-id>freebsd4.1</short-id>
-    <_name>FreeBSD 4.1</_name>
-    <version>4.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.0"/>
-    <derives-from id="http://freebsd.org/freebsd/4.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.2">
-    <short-id>freebsd4.2</short-id>
-    <_name>FreeBSD 4.2</_name>
-    <version>4.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.1"/>
-    <derives-from id="http://freebsd.org/freebsd/4.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.3">
-    <short-id>freebsd4.3</short-id>
-    <_name>FreeBSD 4.3</_name>
-    <version>4.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.2"/>
-    <derives-from id="http://freebsd.org/freebsd/4.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.4">
-    <short-id>freebsd4.4</short-id>
-    <_name>FreeBSD 4.4</_name>
-    <version>4.4</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.3"/>
-    <derives-from id="http://freebsd.org/freebsd/4.3"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.5">
-    <short-id>freebsd4.5</short-id>
-    <_name>FreeBSD 4.5</_name>
-    <version>4.5</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.4"/>
-    <derives-from id="http://freebsd.org/freebsd/4.4"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.6">
-    <short-id>freebsd4.6</short-id>
-    <_name>FreeBSD 4.6</_name>
-    <version>4.6</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.5"/>
-    <derives-from id="http://freebsd.org/freebsd/4.5"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.7">
-    <short-id>freebsd4.7</short-id>
-    <_name>FreeBSD 4.7</_name>
-    <version>4.7</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.6"/>
-    <derives-from id="http://freebsd.org/freebsd/4.6"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.8">
-    <short-id>freebsd4.8</short-id>
-    <_name>FreeBSD 4.8</_name>
-    <version>4.8</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.7"/>
-    <derives-from id="http://freebsd.org/freebsd/4.7"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.9">
-    <short-id>freebsd4.9</short-id>
-    <_name>FreeBSD 4.9</_name>
-    <version>4.9</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.8"/>
-    <derives-from id="http://freebsd.org/freebsd/4.8"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.10">
-    <short-id>freebsd4.10</short-id>
-    <_name>FreeBSD 4.10</_name>
-    <version>4.10</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/4.9"/>
-    <derives-from id="http://freebsd.org/freebsd/4.9"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/4.11">
-    <short-id>freebsd4.11</short-id>
-    <_name>FreeBSD 4.11</_name>
-    <version>4.11</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2000-06-24</release-date>
-    <eol-date>2007-01-31</eol-date>
-
-    <upgrades id="http://freebsd.org/freebsd/4.10"/>
-    <derives-from id="http://freebsd.org/freebsd/4.10"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.0">
-    <short-id>freebsd5.0</short-id>
-    <_name>FreeBSD 5.0</_name>
-    <version>5.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2003-01-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/4.11"/>
-    <derives-from id="http://freebsd.org/freebsd/4.11"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.1">
-    <short-id>freebsd5.1</short-id>
-    <_name>FreeBSD 5.1</_name>
-    <version>5.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.0"/>
-    <derives-from id="http://freebsd.org/freebsd/5.0"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.2">
-    <short-id>freebsd5.2</short-id>
-    <_name>FreeBSD 5.2</_name>
-    <version>5.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.1"/>
-    <derives-from id="http://freebsd.org/freebsd/5.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.2.1">
-    <short-id>freebsd5.2.1</short-id>
-    <_name>FreeBSD 5.2.1</_name>
-    <version>5.2.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.2"/>
-    <derives-from id="http://freebsd.org/freebsd/5.2"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.3">
-    <short-id>freebsd5.3</short-id>
-    <_name>FreeBSD 5.3</_name>
-    <version>5.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.2.1"/>
-    <derives-from id="http://freebsd.org/freebsd/5.2.1"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.4">
-    <short-id>freebsd5.4</short-id>
-    <_name>FreeBSD 5.4</_name>
-    <version>5.4</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <upgrades id="http://freebsd.org/freebsd/5.3"/>
-    <derives-from id="http://freebsd.org/freebsd/5.3"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/5.5">
-    <short-id>freebsd5.5</short-id>
-    <_name>FreeBSD 5.5</_name>
-    <version>5.5</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-
-    <release-date>2006-05-00</release-date>
-
-    <upgrades id="http://freebsd.org/freebsd/5.4"/>
-    <derives-from id="http://freebsd.org/freebsd/5.4"/>
-
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.0">
-    <short-id>freebsd6.0</short-id>
-    <_name>FreeBSD 6.0</_name>
-    <version>6.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/5.5"/>
-    <derives-from id="http://freebsd.org/freebsd/5.5"/>
-
-    <release-date>2005-11-04</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
-    </devices>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.1">
-    <short-id>freebsd6.1</short-id>
-    <_name>FreeBSD 6.1</_name>
-    <version>6.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.0"/>
-    <derives-from id="http://freebsd.org/freebsd/6.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.2">
-    <short-id>freebsd6.2</short-id>
-    <_name>FreeBSD 6.2</_name>
-    <version>6.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.1"/>
-    <derives-from id="http://freebsd.org/freebsd/6.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.3">
-    <short-id>freebsd6.3</short-id>
-    <_name>FreeBSD 6.3</_name>
-    <version>6.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.2"/>
-    <derives-from id="http://freebsd.org/freebsd/6.2"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/6.4">
-    <short-id>freebsd6.4</short-id>
-    <_name>FreeBSD 6.4</_name>
-    <version>6.4</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.3"/>
-    <derives-from id="http://freebsd.org/freebsd/6.3"/>
-
-    <release-date>2008-11-11</release-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.0">
-    <short-id>freebsd7.0</short-id>
-    <_name>FreeBSD 7.0</_name>
-    <version>7.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/6.4"/>
-    <derives-from id="http://freebsd.org/freebsd/6.4"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.1">
-    <short-id>freebsd7.1</short-id>
-    <_name>FreeBSD 7.1</_name>
-    <version>7.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.0"/>
-    <derives-from id="http://freebsd.org/freebsd/7.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.2">
-    <short-id>freebsd7.2</short-id>
-    <_name>FreeBSD 7.2</_name>
-    <version>7.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.1"/>
-    <derives-from id="http://freebsd.org/freebsd/7.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.3">
-    <short-id>freebsd7.3</short-id>
-    <_name>FreeBSD 7.3</_name>
-    <version>7.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.2"/>
-    <derives-from id="http://freebsd.org/freebsd/7.2"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/7.4">
-    <short-id>freebsd7.4</short-id>
-    <_name>FreeBSD 7.4</_name>
-    <version>7.4</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.3"/>
-    <derives-from id="http://freebsd.org/freebsd/7.3"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.0">
-    <short-id>freebsd8.0</short-id>
-    <_name>FreeBSD 8.0</_name>
-    <version>8.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/7.4"/>
-    <derives-from id="http://freebsd.org/freebsd/7.4"/>
-
-    <release-date>2009-11-25</release-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
-    </devices>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.1">
-    <short-id>freebsd8.1</short-id>
-    <_name>FreeBSD 8.1</_name>
-    <version>8.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.0"/>
-    <derives-from id="http://freebsd.org/freebsd/8.0"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.2">
-    <short-id>freebsd8.2</short-id>
-    <_name>FreeBSD 8.2</_name>
-    <version>8.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.1"/>
-    <derives-from id="http://freebsd.org/freebsd/8.1"/>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.3">
-    <short-id>freebsd8.3</short-id>
-    <_name>FreeBSD 8.3</_name>
-    <version>8.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.2"/>
-    <derives-from id="http://freebsd.org/freebsd/8.2"/>
-
-    <release-date>2012-04-18</release-date>
-    <eol-date>2014-04-30</eol-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/8.4">
-    <short-id>freebsd8.4</short-id>
-    <_name>FreeBSD 8.4</_name>
-    <version>8.4</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.3"/>
-    <derives-from id="http://freebsd.org/freebsd/8.3"/>
-
-    <release-date>2013-06-07</release-date>
-    <eol-date>2015-06-30</eol-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/9.0">
-    <short-id>freebsd9.0</short-id>
-    <_name>FreeBSD 9.0</_name>
-    <version>9.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/8.2"/>
-    <derives-from id="http://freebsd.org/freebsd/8.2"/>
-
-    <release-date>2012-01-12</release-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/9.1">
-    <short-id>freebsd9.1</short-id>
-    <_name>FreeBSD 9.1</_name>
-    <version>9.1</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/9.0"/>
-    <derives-from id="http://freebsd.org/freebsd/9.0"/>
-
-    <release-date>2012-12-30</release-date>
-    <eol-date>2014-12-31</eol-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/9.2">
-    <short-id>freebsd9.2</short-id>
-    <_name>FreeBSD 9.2</_name>
-    <version>9.2</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/9.1"/>
-    <derives-from id="http://freebsd.org/freebsd/9.1"/>
-
-    <release-date>2013-09-30</release-date>
-    <eol-date>2014-09-30</eol-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/9.3">
-    <short-id>freebsd9.3</short-id>
-    <_name>FreeBSD 9.3</_name>
-    <version>9.3</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/9.2"/>
-    <derives-from id="http://freebsd.org/freebsd/9.2"/>
-
-    <release-date>2014-07-15</release-date>
-    <eol-date>2016-12-31</eol-date>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/10.0">
-    <short-id>freebsd10.0</short-id>
-    <_name>FreeBSD 10.0</_name>
-    <version>10.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/9.2"/>
-    <derives-from id="http://freebsd.org/freebsd/9.2"/>
-
-    <release-date>2014-01-20</release-date>
-    <eol-date>2015-01-31</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-  </os>
-
-  <os id="http://freebsd.org/freebsd/10.1">
-    <short-id>freebsd10.1</short-id>
-    <_name>FreeBSD 10.1</_name>
-    <version>10.0</version>
-    <_vendor>FreeBSD Project</_vendor>
-    <family>freebsd</family>
-    <distro>freebsd</distro>
-    <upgrades id="http://freebsd.org/freebsd/10.0"/>
-    <derives-from id="http://freebsd.org/freebsd/10.0"/>
-
-    <release-date>2014-11-14</release-date>
-    <eol-date>2016-12-31</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-
-    <media arch="x86_64">
-      <iso>
-        <system-id>FreeBSD</system-id>
-        <volume-id>10_1_RELEASE_AMD64_DVD</volume-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/freebsd/Makefile.am b/data/oses/freebsd/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/freebsd/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/freebsd/freebsd1.0.xml.in b/data/oses/freebsd/freebsd1.0.xml.in
new file mode 100644
index 0000000..cbd3b3a
--- /dev/null
+++ b/data/oses/freebsd/freebsd1.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/1.0">
+    <short-id>freebsd1.0</short-id>
+    <_name>FreeBSD 1.0</_name>
+    <version>1.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1993-11-00</release-date>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd10.0.xml.in b/data/oses/freebsd/freebsd10.0.xml.in
new file mode 100644
index 0000000..33ed91b
--- /dev/null
+++ b/data/oses/freebsd/freebsd10.0.xml.in
@@ -0,0 +1,20 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/10.0">
+    <short-id>freebsd10.0</short-id>
+    <_name>FreeBSD 10.0</_name>
+    <version>10.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/9.2"/>
+    <derives-from id="http://freebsd.org/freebsd/9.2"/>
+
+    <release-date>2014-01-20</release-date>
+    <eol-date>2015-01-31</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd10.1.xml.in b/data/oses/freebsd/freebsd10.1.xml.in
new file mode 100644
index 0000000..923491d
--- /dev/null
+++ b/data/oses/freebsd/freebsd10.1.xml.in
@@ -0,0 +1,27 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/10.1">
+    <short-id>freebsd10.1</short-id>
+    <_name>FreeBSD 10.1</_name>
+    <version>10.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/10.0"/>
+    <derives-from id="http://freebsd.org/freebsd/10.0"/>
+
+    <release-date>2014-11-14</release-date>
+    <eol-date>2016-12-31</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>FreeBSD</system-id>
+        <volume-id>10_1_RELEASE_AMD64_DVD</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd2.0.5.xml.in b/data/oses/freebsd/freebsd2.0.5.xml.in
new file mode 100644
index 0000000..77c1ccd
--- /dev/null
+++ b/data/oses/freebsd/freebsd2.0.5.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/2.0.5">
+    <short-id>freebsd2.0.5</short-id>
+    <_name>FreeBSD 2.0.5</_name>
+    <version>2.0.5</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/2.0"/>
+    <derives-from id="http://freebsd.org/freebsd/2.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd2.0.xml.in b/data/oses/freebsd/freebsd2.0.xml.in
new file mode 100644
index 0000000..f7f69ca
--- /dev/null
+++ b/data/oses/freebsd/freebsd2.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/2.0">
+    <short-id>freebsd2.0</short-id>
+    <_name>FreeBSD 2.0</_name>
+    <version>2.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1994-11-22</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/1.0"/>
+    <derives-from id="http://freebsd.org/freebsd/1.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd2.2.8.xml.in b/data/oses/freebsd/freebsd2.2.8.xml.in
new file mode 100644
index 0000000..e17c4b1
--- /dev/null
+++ b/data/oses/freebsd/freebsd2.2.8.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/2.2.8">
+    <short-id>freebsd2.2.8</short-id>
+    <_name>FreeBSD 2.2.8</_name>
+    <version>2.2.8</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
+    <derives-from id="http://freebsd.org/freebsd/2.0.5"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd2.2.9.xml.in b/data/oses/freebsd/freebsd2.2.9.xml.in
new file mode 100644
index 0000000..52083ce
--- /dev/null
+++ b/data/oses/freebsd/freebsd2.2.9.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/2.2.9">
+    <short-id>freebsd2.2.9</short-id>
+    <_name>FreeBSD 2.2.9</_name>
+    <version>2.2.9</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
+    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd3.0.xml.in b/data/oses/freebsd/freebsd3.0.xml.in
new file mode 100644
index 0000000..feb93b4
--- /dev/null
+++ b/data/oses/freebsd/freebsd3.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/3.0">
+    <short-id>freebsd3.0</short-id>
+    <_name>FreeBSD 3.0</_name>
+    <version>3.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>1998-10-16</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
+    <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd3.2.xml.in b/data/oses/freebsd/freebsd3.2.xml.in
new file mode 100644
index 0000000..18f77b3
--- /dev/null
+++ b/data/oses/freebsd/freebsd3.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/3.2">
+    <short-id>freebsd3.2</short-id>
+    <_name>FreeBSD 3.2</_name>
+    <version>3.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/3.0"/>
+    <derives-from id="http://freebsd.org/freebsd/3.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.0.xml.in b/data/oses/freebsd/freebsd4.0.xml.in
new file mode 100644
index 0000000..ec3b3ed
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.0">
+    <short-id>freebsd4.0</short-id>
+    <_name>FreeBSD 4.0</_name>
+    <version>4.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2000-03-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/3.2"/>
+    <derives-from id="http://freebsd.org/freebsd/3.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.1.xml.in b/data/oses/freebsd/freebsd4.1.xml.in
new file mode 100644
index 0000000..bb0e8fa
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.1">
+    <short-id>freebsd4.1</short-id>
+    <_name>FreeBSD 4.1</_name>
+    <version>4.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.0"/>
+    <derives-from id="http://freebsd.org/freebsd/4.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.10.xml.in b/data/oses/freebsd/freebsd4.10.xml.in
new file mode 100644
index 0000000..eb44749
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.10.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.10">
+    <short-id>freebsd4.10</short-id>
+    <_name>FreeBSD 4.10</_name>
+    <version>4.10</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.9"/>
+    <derives-from id="http://freebsd.org/freebsd/4.9"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.11.xml.in b/data/oses/freebsd/freebsd4.11.xml.in
new file mode 100644
index 0000000..67da899
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.11.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.11">
+    <short-id>freebsd4.11</short-id>
+    <_name>FreeBSD 4.11</_name>
+    <version>4.11</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2000-06-24</release-date>
+    <eol-date>2007-01-31</eol-date>
+
+    <upgrades id="http://freebsd.org/freebsd/4.10"/>
+    <derives-from id="http://freebsd.org/freebsd/4.10"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.2.xml.in b/data/oses/freebsd/freebsd4.2.xml.in
new file mode 100644
index 0000000..2101a8f
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.2">
+    <short-id>freebsd4.2</short-id>
+    <_name>FreeBSD 4.2</_name>
+    <version>4.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.1"/>
+    <derives-from id="http://freebsd.org/freebsd/4.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.3.xml.in b/data/oses/freebsd/freebsd4.3.xml.in
new file mode 100644
index 0000000..7fbb504
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.3.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.3">
+    <short-id>freebsd4.3</short-id>
+    <_name>FreeBSD 4.3</_name>
+    <version>4.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.2"/>
+    <derives-from id="http://freebsd.org/freebsd/4.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.4.xml.in b/data/oses/freebsd/freebsd4.4.xml.in
new file mode 100644
index 0000000..066bc2c
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.4.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.4">
+    <short-id>freebsd4.4</short-id>
+    <_name>FreeBSD 4.4</_name>
+    <version>4.4</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.3"/>
+    <derives-from id="http://freebsd.org/freebsd/4.3"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.5.xml.in b/data/oses/freebsd/freebsd4.5.xml.in
new file mode 100644
index 0000000..dfa3362
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.5.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.5">
+    <short-id>freebsd4.5</short-id>
+    <_name>FreeBSD 4.5</_name>
+    <version>4.5</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.4"/>
+    <derives-from id="http://freebsd.org/freebsd/4.4"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.6.xml.in b/data/oses/freebsd/freebsd4.6.xml.in
new file mode 100644
index 0000000..d5e1d75
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.6.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.6">
+    <short-id>freebsd4.6</short-id>
+    <_name>FreeBSD 4.6</_name>
+    <version>4.6</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.5"/>
+    <derives-from id="http://freebsd.org/freebsd/4.5"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.7.xml.in b/data/oses/freebsd/freebsd4.7.xml.in
new file mode 100644
index 0000000..655bbce
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.7.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.7">
+    <short-id>freebsd4.7</short-id>
+    <_name>FreeBSD 4.7</_name>
+    <version>4.7</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.6"/>
+    <derives-from id="http://freebsd.org/freebsd/4.6"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.8.xml.in b/data/oses/freebsd/freebsd4.8.xml.in
new file mode 100644
index 0000000..65d80b1
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.8.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.8">
+    <short-id>freebsd4.8</short-id>
+    <_name>FreeBSD 4.8</_name>
+    <version>4.8</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.7"/>
+    <derives-from id="http://freebsd.org/freebsd/4.7"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd4.9.xml.in b/data/oses/freebsd/freebsd4.9.xml.in
new file mode 100644
index 0000000..b42a1f3
--- /dev/null
+++ b/data/oses/freebsd/freebsd4.9.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/4.9">
+    <short-id>freebsd4.9</short-id>
+    <_name>FreeBSD 4.9</_name>
+    <version>4.9</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/4.8"/>
+    <derives-from id="http://freebsd.org/freebsd/4.8"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.0.xml.in b/data/oses/freebsd/freebsd5.0.xml.in
new file mode 100644
index 0000000..b39c0db
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.0">
+    <short-id>freebsd5.0</short-id>
+    <_name>FreeBSD 5.0</_name>
+    <version>5.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2003-01-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/4.11"/>
+    <derives-from id="http://freebsd.org/freebsd/4.11"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.1.xml.in b/data/oses/freebsd/freebsd5.1.xml.in
new file mode 100644
index 0000000..daf144f
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.1">
+    <short-id>freebsd5.1</short-id>
+    <_name>FreeBSD 5.1</_name>
+    <version>5.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.0"/>
+    <derives-from id="http://freebsd.org/freebsd/5.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.2.1.xml.in b/data/oses/freebsd/freebsd5.2.1.xml.in
new file mode 100644
index 0000000..af0a6c6
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.2.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.2.1">
+    <short-id>freebsd5.2.1</short-id>
+    <_name>FreeBSD 5.2.1</_name>
+    <version>5.2.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.2"/>
+    <derives-from id="http://freebsd.org/freebsd/5.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.2.xml.in b/data/oses/freebsd/freebsd5.2.xml.in
new file mode 100644
index 0000000..e5a3d32
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.2">
+    <short-id>freebsd5.2</short-id>
+    <_name>FreeBSD 5.2</_name>
+    <version>5.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.1"/>
+    <derives-from id="http://freebsd.org/freebsd/5.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.3.xml.in b/data/oses/freebsd/freebsd5.3.xml.in
new file mode 100644
index 0000000..d626fb0
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.3.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.3">
+    <short-id>freebsd5.3</short-id>
+    <_name>FreeBSD 5.3</_name>
+    <version>5.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.2.1"/>
+    <derives-from id="http://freebsd.org/freebsd/5.2.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.4.xml.in b/data/oses/freebsd/freebsd5.4.xml.in
new file mode 100644
index 0000000..5e238d1
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.4.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.4">
+    <short-id>freebsd5.4</short-id>
+    <_name>FreeBSD 5.4</_name>
+    <version>5.4</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <upgrades id="http://freebsd.org/freebsd/5.3"/>
+    <derives-from id="http://freebsd.org/freebsd/5.3"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd5.5.xml.in b/data/oses/freebsd/freebsd5.5.xml.in
new file mode 100644
index 0000000..611853e
--- /dev/null
+++ b/data/oses/freebsd/freebsd5.5.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/5.5">
+    <short-id>freebsd5.5</short-id>
+    <_name>FreeBSD 5.5</_name>
+    <version>5.5</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+
+    <release-date>2006-05-00</release-date>
+
+    <upgrades id="http://freebsd.org/freebsd/5.4"/>
+    <derives-from id="http://freebsd.org/freebsd/5.4"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd6.0.xml.in b/data/oses/freebsd/freebsd6.0.xml.in
new file mode 100644
index 0000000..cababef
--- /dev/null
+++ b/data/oses/freebsd/freebsd6.0.xml.in
@@ -0,0 +1,18 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/6.0">
+    <short-id>freebsd6.0</short-id>
+    <_name>FreeBSD 6.0</_name>
+    <version>6.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/5.5"/>
+    <derives-from id="http://freebsd.org/freebsd/5.5"/>
+
+    <release-date>2005-11-04</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd6.1.xml.in b/data/oses/freebsd/freebsd6.1.xml.in
new file mode 100644
index 0000000..51e829d
--- /dev/null
+++ b/data/oses/freebsd/freebsd6.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/6.1">
+    <short-id>freebsd6.1</short-id>
+    <_name>FreeBSD 6.1</_name>
+    <version>6.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.0"/>
+    <derives-from id="http://freebsd.org/freebsd/6.0"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd6.2.xml.in b/data/oses/freebsd/freebsd6.2.xml.in
new file mode 100644
index 0000000..269cd77
--- /dev/null
+++ b/data/oses/freebsd/freebsd6.2.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/6.2">
+    <short-id>freebsd6.2</short-id>
+    <_name>FreeBSD 6.2</_name>
+    <version>6.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.1"/>
+    <derives-from id="http://freebsd.org/freebsd/6.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd6.3.xml.in b/data/oses/freebsd/freebsd6.3.xml.in
new file mode 100644
index 0000000..1ddfcf5
--- /dev/null
+++ b/data/oses/freebsd/freebsd6.3.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/6.3">
+    <short-id>freebsd6.3</short-id>
+    <_name>FreeBSD 6.3</_name>
+    <version>6.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.2"/>
+    <derives-from id="http://freebsd.org/freebsd/6.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd6.4.xml.in b/data/oses/freebsd/freebsd6.4.xml.in
new file mode 100644
index 0000000..fbe41d9
--- /dev/null
+++ b/data/oses/freebsd/freebsd6.4.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/6.4">
+    <short-id>freebsd6.4</short-id>
+    <_name>FreeBSD 6.4</_name>
+    <version>6.4</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.3"/>
+    <derives-from id="http://freebsd.org/freebsd/6.3"/>
+
+    <release-date>2008-11-11</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd7.0.xml.in b/data/oses/freebsd/freebsd7.0.xml.in
new file mode 100644
index 0000000..bb93e1f
--- /dev/null
+++ b/data/oses/freebsd/freebsd7.0.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/7.0">
+    <short-id>freebsd7.0</short-id>
+    <_name>FreeBSD 7.0</_name>
+    <version>7.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/6.4"/>
+    <derives-from id="http://freebsd.org/freebsd/6.4"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd7.1.xml.in b/data/oses/freebsd/freebsd7.1.xml.in
new file mode 100644
index 0000000..e2652bf
--- /dev/null
+++ b/data/oses/freebsd/freebsd7.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/7.1">
+    <short-id>freebsd7.1</short-id>
+    <_name>FreeBSD 7.1</_name>
+    <version>7.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.0"/>
+    <derives-from id="http://freebsd.org/freebsd/7.0"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd7.2.xml.in b/data/oses/freebsd/freebsd7.2.xml.in
new file mode 100644
index 0000000..aca02f8
--- /dev/null
+++ b/data/oses/freebsd/freebsd7.2.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/7.2">
+    <short-id>freebsd7.2</short-id>
+    <_name>FreeBSD 7.2</_name>
+    <version>7.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.1"/>
+    <derives-from id="http://freebsd.org/freebsd/7.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd7.3.xml.in b/data/oses/freebsd/freebsd7.3.xml.in
new file mode 100644
index 0000000..ce67ef5
--- /dev/null
+++ b/data/oses/freebsd/freebsd7.3.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/7.3">
+    <short-id>freebsd7.3</short-id>
+    <_name>FreeBSD 7.3</_name>
+    <version>7.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.2"/>
+    <derives-from id="http://freebsd.org/freebsd/7.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd7.4.xml.in b/data/oses/freebsd/freebsd7.4.xml.in
new file mode 100644
index 0000000..8d6e12f
--- /dev/null
+++ b/data/oses/freebsd/freebsd7.4.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/7.4">
+    <short-id>freebsd7.4</short-id>
+    <_name>FreeBSD 7.4</_name>
+    <version>7.4</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.3"/>
+    <derives-from id="http://freebsd.org/freebsd/7.3"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd8.0.xml.in b/data/oses/freebsd/freebsd8.0.xml.in
new file mode 100644
index 0000000..e706c33
--- /dev/null
+++ b/data/oses/freebsd/freebsd8.0.xml.in
@@ -0,0 +1,18 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/8.0">
+    <short-id>freebsd8.0</short-id>
+    <_name>FreeBSD 8.0</_name>
+    <version>8.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/7.4"/>
+    <derives-from id="http://freebsd.org/freebsd/7.4"/>
+
+    <release-date>2009-11-25</release-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd8.1.xml.in b/data/oses/freebsd/freebsd8.1.xml.in
new file mode 100644
index 0000000..23367a4
--- /dev/null
+++ b/data/oses/freebsd/freebsd8.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/8.1">
+    <short-id>freebsd8.1</short-id>
+    <_name>FreeBSD 8.1</_name>
+    <version>8.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.0"/>
+    <derives-from id="http://freebsd.org/freebsd/8.0"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd8.2.xml.in b/data/oses/freebsd/freebsd8.2.xml.in
new file mode 100644
index 0000000..28e9d5a
--- /dev/null
+++ b/data/oses/freebsd/freebsd8.2.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/8.2">
+    <short-id>freebsd8.2</short-id>
+    <_name>FreeBSD 8.2</_name>
+    <version>8.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.1"/>
+    <derives-from id="http://freebsd.org/freebsd/8.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd8.3.xml.in b/data/oses/freebsd/freebsd8.3.xml.in
new file mode 100644
index 0000000..60c4602
--- /dev/null
+++ b/data/oses/freebsd/freebsd8.3.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/8.3">
+    <short-id>freebsd8.3</short-id>
+    <_name>FreeBSD 8.3</_name>
+    <version>8.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.2"/>
+    <derives-from id="http://freebsd.org/freebsd/8.2"/>
+
+    <release-date>2012-04-18</release-date>
+    <eol-date>2014-04-30</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd8.4.xml.in b/data/oses/freebsd/freebsd8.4.xml.in
new file mode 100644
index 0000000..4ff6b4c
--- /dev/null
+++ b/data/oses/freebsd/freebsd8.4.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/8.4">
+    <short-id>freebsd8.4</short-id>
+    <_name>FreeBSD 8.4</_name>
+    <version>8.4</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.3"/>
+    <derives-from id="http://freebsd.org/freebsd/8.3"/>
+
+    <release-date>2013-06-07</release-date>
+    <eol-date>2015-06-30</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd9.0.xml.in b/data/oses/freebsd/freebsd9.0.xml.in
new file mode 100644
index 0000000..94c3d31
--- /dev/null
+++ b/data/oses/freebsd/freebsd9.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/9.0">
+    <short-id>freebsd9.0</short-id>
+    <_name>FreeBSD 9.0</_name>
+    <version>9.0</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/8.2"/>
+    <derives-from id="http://freebsd.org/freebsd/8.2"/>
+
+    <release-date>2012-01-12</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd9.1.xml.in b/data/oses/freebsd/freebsd9.1.xml.in
new file mode 100644
index 0000000..f7e677b
--- /dev/null
+++ b/data/oses/freebsd/freebsd9.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/9.1">
+    <short-id>freebsd9.1</short-id>
+    <_name>FreeBSD 9.1</_name>
+    <version>9.1</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/9.0"/>
+    <derives-from id="http://freebsd.org/freebsd/9.0"/>
+
+    <release-date>2012-12-30</release-date>
+    <eol-date>2014-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd9.2.xml.in b/data/oses/freebsd/freebsd9.2.xml.in
new file mode 100644
index 0000000..5c13761
--- /dev/null
+++ b/data/oses/freebsd/freebsd9.2.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/9.2">
+    <short-id>freebsd9.2</short-id>
+    <_name>FreeBSD 9.2</_name>
+    <version>9.2</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/9.1"/>
+    <derives-from id="http://freebsd.org/freebsd/9.1"/>
+
+    <release-date>2013-09-30</release-date>
+    <eol-date>2014-09-30</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/freebsd/freebsd9.3.xml.in b/data/oses/freebsd/freebsd9.3.xml.in
new file mode 100644
index 0000000..0c1357b
--- /dev/null
+++ b/data/oses/freebsd/freebsd9.3.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://freebsd.org/freebsd/9.3">
+    <short-id>freebsd9.3</short-id>
+    <_name>FreeBSD 9.3</_name>
+    <version>9.3</version>
+    <_vendor>FreeBSD Project</_vendor>
+    <family>freebsd</family>
+    <distro>freebsd</distro>
+    <upgrades id="http://freebsd.org/freebsd/9.2"/>
+    <derives-from id="http://freebsd.org/freebsd/9.2"/>
+
+    <release-date>2014-07-15</release-date>
+    <eol-date>2016-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dded0bd..634b053 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,6 +51,53 @@ data/oses/fedora/fedora20.xml.in
 data/oses/fedora/fedora21.xml.in
 data/oses/fedora/fedora22.xml.in
 data/oses/fedora/fedora-unknown.xml.in
+data/oses/freebsd/freebsd1.0.xml.in
+data/oses/freebsd/freebsd2.0.5.xml.in
+data/oses/freebsd/freebsd2.0.xml.in
+data/oses/freebsd/freebsd2.2.8.xml.in
+data/oses/freebsd/freebsd2.2.9.xml.in
+data/oses/freebsd/freebsd3.0.xml.in
+data/oses/freebsd/freebsd3.2.xml.in
+data/oses/freebsd/freebsd4.0.xml.in
+data/oses/freebsd/freebsd4.10.xml.in
+data/oses/freebsd/freebsd4.11.xml.in
+data/oses/freebsd/freebsd4.1.xml.in
+data/oses/freebsd/freebsd4.2.xml.in
+data/oses/freebsd/freebsd4.3.xml.in
+data/oses/freebsd/freebsd4.4.xml.in
+data/oses/freebsd/freebsd4.5.xml.in
+data/oses/freebsd/freebsd4.6.xml.in
+data/oses/freebsd/freebsd4.7.xml.in
+data/oses/freebsd/freebsd4.8.xml.in
+data/oses/freebsd/freebsd4.9.xml.in
+data/oses/freebsd/freebsd5.0.xml.in
+data/oses/freebsd/freebsd5.1.xml.in
+data/oses/freebsd/freebsd5.2.1.xml.in
+data/oses/freebsd/freebsd5.2.xml.in
+data/oses/freebsd/freebsd5.3.xml.in
+data/oses/freebsd/freebsd5.4.xml.in
+data/oses/freebsd/freebsd5.5.xml.in
+data/oses/freebsd/freebsd6.0.xml.in
+data/oses/freebsd/freebsd6.1.xml.in
+data/oses/freebsd/freebsd6.2.xml.in
+data/oses/freebsd/freebsd6.3.xml.in
+data/oses/freebsd/freebsd6.4.xml.in
+data/oses/freebsd/freebsd7.0.xml.in
+data/oses/freebsd/freebsd7.1.xml.in
+data/oses/freebsd/freebsd7.2.xml.in
+data/oses/freebsd/freebsd7.3.xml.in
+data/oses/freebsd/freebsd7.4.xml.in
+data/oses/freebsd/freebsd8.0.xml.in
+data/oses/freebsd/freebsd8.1.xml.in
+data/oses/freebsd/freebsd8.2.xml.in
+data/oses/freebsd/freebsd8.3.xml.in
+data/oses/freebsd/freebsd8.4.xml.in
+data/oses/freebsd/freebsd9.0.xml.in
+data/oses/freebsd/freebsd9.1.xml.in
+data/oses/freebsd/freebsd9.2.xml.in
+data/oses/freebsd/freebsd9.3.xml.in
+data/oses/freebsd/freebsd10.0.xml.in
+data/oses/freebsd/freebsd10.1.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
@@ -65,7 +112,6 @@ data/oses/opensuse.xml.in
 data/oses/macos.xml.in
 data/oses/ubuntu.xml.in
 data/oses/openbsd.xml.in
-data/oses/freebsd.xml.in
 data/oses/rhl.xml.in
 data/oses/netbsd.xml.in
 data/devices/qemu-ps2.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:29 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:29 +0100
Subject: [Libosinfo] [PATCH 11/39] data: split gnome into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-12-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                 |   1 +
 data/oses/Makefile.am                        |   2 +-
 data/oses/gnome.xml.in                       | 130 ---------------------------
 data/oses/gnome/Makefile.am                  |   1 +
 data/oses/gnome/gnome-continuous-3.10.xml.in |  28 ++++++
 data/oses/gnome/gnome-continuous-3.12.xml.in |  20 +++++
 data/oses/gnome/gnome-continuous-3.14.xml.in |  20 +++++
 data/oses/gnome/gnome3.6.xml.in              |  32 +++++++
 data/oses/gnome/gnome3.8.xml.in              |  32 +++++++
 po/POTFILES.in                               |   6 +-
 10 files changed, 140 insertions(+), 132 deletions(-)
 delete mode 100644 data/oses/gnome.xml.in
 create mode 100644 data/oses/gnome/Makefile.am
 create mode 100644 data/oses/gnome/gnome-continuous-3.10.xml.in
 create mode 100644 data/oses/gnome/gnome-continuous-3.12.xml.in
 create mode 100644 data/oses/gnome/gnome-continuous-3.14.xml.in
 create mode 100644 data/oses/gnome/gnome3.6.xml.in
 create mode 100644 data/oses/gnome/gnome3.8.xml.in

diff --git a/configure.ac b/configure.ac
index f81037b..afdafb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_CONFIG_FILES([
 	data/oses/debian/Makefile
 	data/oses/fedora/Makefile
 	data/oses/freebsd/Makefile
+	data/oses/gnome/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index e6f41af..44cceec 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -5,12 +5,12 @@ SUBDIRS = \
 	debian \
 	fedora \
 	freebsd \
+	gnome \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	gnome.xml.in	\
 	mageia.xml.in \
 	mandriva.xml.in \
 	mandrake.xml.in \
diff --git a/data/oses/gnome.xml.in b/data/oses/gnome.xml.in
deleted file mode 100644
index b9acf3c..0000000
--- a/data/oses/gnome.xml.in
+++ /dev/null
@@ -1,130 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://gnome.org/3.6">
-    <short-id>gnome3.6</short-id>
-    <_name>GNOME 3.6</_name>
-    <version>3.6</version>
-    <_vendor>GNOME Project</_vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <derives-from id="http://fedoraproject.org/fedora/18"/>
-
-    <release-date>2012-09-26</release-date>
-
-    <media arch="i686" live="true">
-      <url>http://ftp.gnome.org/pub/gnome/misc/promo-usb/GNOME-3.6.0.iso</url>
-      <iso>
-        <volume-id>GNOME36-LiveCD</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <!-- These values are copied from that of Fedora 17/18 as AFAIK currently
-           GNOME is just Fedora with a few differences, mainly the name. -->
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://gnome.org/3.8">
-    <short-id>gnome3.8</short-id>
-    <_name>GNOME 3.8</_name>
-    <version>3.8</version>
-    <_vendor>GNOME Project</_vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <derives-from id="http://fedoraproject.org/fedora/19"/>
-    <upgrades id="http://gnome.org/3.6"/>
-
-    <release-date>2013-03-27</release-date>
-
-    <media arch="i686" live="true">
-      <iso>
-        <volume-id>GNOME38-LiveCD</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://gnome.org/continuous/3.10">
-    <short-id>gnome-continuous-3.10</short-id>
-    <_name>GNOME 3.10</_name>
-    <version>3.10</version>
-    <_vendor>GNOME Project</_vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <upgrades id="http://gnome.org/3.8"/>
-
-    <release-date>2013-09-25</release-date>
-
-    <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-    </devices>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <ram>1073741824</ram>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://gnome.org/continuous/3.12">
-    <short-id>gnome-continuous-3.12</short-id>
-    <_name>GNOME 3.12</_name>
-    <version>3.12</version>
-    <_vendor>GNOME Project</_vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <derives-from id="http://gnome.org/continuous/3.10"/>
-    <upgrades id="http://gnome.org/continuous/3.10"/>
-    <release-status>snapshot</release-status>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <ram>1073741824</ram>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://gnome.org/continuous/3.14">
-    <short-id>gnome-continuous-3.14</short-id>
-    <_name>GNOME 3.14</_name>
-    <version>3.14</version>
-    <_vendor>GNOME Project</_vendor>
-    <family>linux</family>
-    <distro>gnome</distro>
-    <derives-from id="http://gnome.org/continuous/3.12"/>
-    <upgrades id="http://gnome.org/continuous/3.12"/>
-    <release-status>snapshot</release-status>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <ram>1073741824</ram>
-      </minimum>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/gnome/Makefile.am b/data/oses/gnome/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/gnome/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/gnome/gnome-continuous-3.10.xml.in b/data/oses/gnome/gnome-continuous-3.10.xml.in
new file mode 100644
index 0000000..8e16efa
--- /dev/null
+++ b/data/oses/gnome/gnome-continuous-3.10.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://gnome.org/continuous/3.10">
+    <short-id>gnome-continuous-3.10</short-id>
+    <_name>GNOME 3.10</_name>
+    <version>3.10</version>
+    <_vendor>GNOME Project</_vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <upgrades id="http://gnome.org/3.8"/>
+
+    <release-date>2013-09-25</release-date>
+
+    <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://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <ram>1073741824</ram>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/gnome/gnome-continuous-3.12.xml.in b/data/oses/gnome/gnome-continuous-3.12.xml.in
new file mode 100644
index 0000000..e942258
--- /dev/null
+++ b/data/oses/gnome/gnome-continuous-3.12.xml.in
@@ -0,0 +1,20 @@
+<libosinfo version="0.0.1">
+  <os id="http://gnome.org/continuous/3.12">
+    <short-id>gnome-continuous-3.12</short-id>
+    <_name>GNOME 3.12</_name>
+    <version>3.12</version>
+    <_vendor>GNOME Project</_vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <derives-from id="http://gnome.org/continuous/3.10"/>
+    <upgrades id="http://gnome.org/continuous/3.10"/>
+    <release-status>snapshot</release-status>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <ram>1073741824</ram>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/gnome/gnome-continuous-3.14.xml.in b/data/oses/gnome/gnome-continuous-3.14.xml.in
new file mode 100644
index 0000000..9107de6
--- /dev/null
+++ b/data/oses/gnome/gnome-continuous-3.14.xml.in
@@ -0,0 +1,20 @@
+<libosinfo version="0.0.1">
+  <os id="http://gnome.org/continuous/3.14">
+    <short-id>gnome-continuous-3.14</short-id>
+    <_name>GNOME 3.14</_name>
+    <version>3.14</version>
+    <_vendor>GNOME Project</_vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <derives-from id="http://gnome.org/continuous/3.12"/>
+    <upgrades id="http://gnome.org/continuous/3.12"/>
+    <release-status>snapshot</release-status>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <ram>1073741824</ram>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/gnome/gnome3.6.xml.in b/data/oses/gnome/gnome3.6.xml.in
new file mode 100644
index 0000000..76a768e
--- /dev/null
+++ b/data/oses/gnome/gnome3.6.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://gnome.org/3.6">
+    <short-id>gnome3.6</short-id>
+    <_name>GNOME 3.6</_name>
+    <version>3.6</version>
+    <_vendor>GNOME Project</_vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <derives-from id="http://fedoraproject.org/fedora/18"/>
+
+    <release-date>2012-09-26</release-date>
+
+    <media arch="i686" live="true">
+      <url>http://ftp.gnome.org/pub/gnome/misc/promo-usb/GNOME-3.6.0.iso</url>
+      <iso>
+        <volume-id>GNOME36-LiveCD</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <!-- These values are copied from that of Fedora 17/18 as AFAIK currently
+           GNOME is just Fedora with a few differences, mainly the name. -->
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/gnome/gnome3.8.xml.in b/data/oses/gnome/gnome3.8.xml.in
new file mode 100644
index 0000000..0dde494
--- /dev/null
+++ b/data/oses/gnome/gnome3.8.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://gnome.org/3.8">
+    <short-id>gnome3.8</short-id>
+    <_name>GNOME 3.8</_name>
+    <version>3.8</version>
+    <_vendor>GNOME Project</_vendor>
+    <family>linux</family>
+    <distro>gnome</distro>
+    <derives-from id="http://fedoraproject.org/fedora/19"/>
+    <upgrades id="http://gnome.org/3.6"/>
+
+    <release-date>2013-03-27</release-date>
+
+    <media arch="i686" live="true">
+      <iso>
+        <volume-id>GNOME38-LiveCD</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 634b053..3e51115 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -98,6 +98,11 @@ data/oses/freebsd/freebsd9.2.xml.in
 data/oses/freebsd/freebsd9.3.xml.in
 data/oses/freebsd/freebsd10.0.xml.in
 data/oses/freebsd/freebsd10.1.xml.in
+data/oses/gnome/gnome3.6.xml.in
+data/oses/gnome/gnome3.8.xml.in
+data/oses/gnome/gnome-continuous-3.10.xml.in
+data/oses/gnome/gnome-continuous-3.12.xml.in
+data/oses/gnome/gnome-continuous-3.14.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
@@ -105,7 +110,6 @@ data/oses/mageia.xml.in
 data/oses/mandrake.xml.in
 data/oses/mandriva.xml.in
 data/oses/suse.xml.in
-data/oses/gnome.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:30 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:30 +0100
Subject: [Libosinfo] [PATCH 12/39] data: split macos into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-13-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                      |   1 +
 data/oses/Makefile.am             |   2 +-
 data/oses/macos.xml.in            | 102 --------------------------------------
 data/oses/macos/Makefile.am       |   1 +
 data/oses/macos/macosx10.0.xml.in |  10 ++++
 data/oses/macos/macosx10.1.xml.in |  11 ++++
 data/oses/macos/macosx10.2.xml.in |  11 ++++
 data/oses/macos/macosx10.3.xml.in |  11 ++++
 data/oses/macos/macosx10.4.xml.in |  11 ++++
 data/oses/macos/macosx10.5.xml.in |  11 ++++
 data/oses/macos/macosx10.6.xml.in |  21 ++++++++
 data/oses/macos/macosx10.7.xml.in |  21 ++++++++
 po/POTFILES.in                    |   9 +++-
 13 files changed, 118 insertions(+), 104 deletions(-)
 delete mode 100644 data/oses/macos.xml.in
 create mode 100644 data/oses/macos/Makefile.am
 create mode 100644 data/oses/macos/macosx10.0.xml.in
 create mode 100644 data/oses/macos/macosx10.1.xml.in
 create mode 100644 data/oses/macos/macosx10.2.xml.in
 create mode 100644 data/oses/macos/macosx10.3.xml.in
 create mode 100644 data/oses/macos/macosx10.4.xml.in
 create mode 100644 data/oses/macos/macosx10.5.xml.in
 create mode 100644 data/oses/macos/macosx10.6.xml.in
 create mode 100644 data/oses/macos/macosx10.7.xml.in

diff --git a/configure.ac b/configure.ac
index afdafb8..86af391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AC_CONFIG_FILES([
 	data/oses/fedora/Makefile
 	data/oses/freebsd/Makefile
 	data/oses/gnome/Makefile
+	data/oses/macos/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 44cceec..de3d323 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = \
 	fedora \
 	freebsd \
 	gnome \
+	macos \
 	msdos \
 	$(NULL)
 
@@ -16,7 +17,6 @@ database_in_files =	\
 	mandrake.xml.in \
 	netbsd.xml.in	\
 	netware.xml.in  \
-	macos.xml.in    \
 	openbsd.xml.in  \
 	opensuse.xml.in \
 	rhl.xml.in      \
diff --git a/data/oses/macos.xml.in b/data/oses/macos.xml.in
deleted file mode 100644
index 4b4a931..0000000
--- a/data/oses/macos.xml.in
+++ /dev/null
@@ -1,102 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://apple.com/macosx/10.0">
-    <short-id>macosx10.0</short-id>
-    <_name>MacOS X Cheetah</_name>
-    <version>10.0</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-  </os>
-
-  <os id="http://apple.com/macosx/10.1">
-    <short-id>macosx10.1</short-id>
-    <_name>MacOS X Puma</_name>
-    <version>10.1</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.0" />
-  </os>
-
-  <os id="http://apple.com/macosx/10.2">
-    <short-id>macosx10.2</short-id>
-    <_name>MacOS X Jaguar</_name>
-    <version>10.2</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.1" />
-  </os>
-
-  <os id="http://apple.com/macosx/10.3">
-    <short-id>macosx10.3</short-id>
-    <_name>MacOS X Panther</_name>
-    <version>10.3</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.2" />
-  </os>
-
-  <os id="http://apple.com/macosx/10.4">
-    <short-id>macosx10.4</short-id>
-    <_name>MacOS X Tiger</_name>
-    <version>10.4</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.3" />
-  </os>
-
-  <os id="http://apple.com/macosx/10.5">
-    <short-id>macosx10.5</short-id>
-    <_name>MacOS X Leopard</_name>
-    <version>10.5</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.4" />
-  </os>
-
-  <os id="http://apple.com/macosx/10.6">
-    <short-id>macosx10.6</short-id>
-    <_name>MacOS X Snow Leopard</_name>
-    <version>10.6</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.5" />
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <cpu>1600000000</cpu>
-        <ram>2147483648</ram>
-        <storage>7516192768</storage>
-      </minimum>
-    </resources>
-
-  </os>
-
-  <os id="http://apple.com/macosx/10.7">
-    <short-id>macosx10.7</short-id>
-    <_name>MacOS X Lion</_name>
-    <version>10.7</version>
-    <_vendor>Apple Inc.</_vendor>
-    <family>darwin</family>
-    <distro>osx</distro>
-    <upgrades id="http://apple.com/macosx/10.6" />
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>2</n-cpus>
-        <cpu>1600000000</cpu>
-        <ram>2147483648</ram>
-        <storage>7516192768</storage>
-      </minimum>
-    </resources>
-
-  </os>
-
-</libosinfo>
diff --git a/data/oses/macos/Makefile.am b/data/oses/macos/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/macos/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/macos/macosx10.0.xml.in b/data/oses/macos/macosx10.0.xml.in
new file mode 100644
index 0000000..7c4f4e4
--- /dev/null
+++ b/data/oses/macos/macosx10.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.0">
+    <short-id>macosx10.0</short-id>
+    <_name>MacOS X Cheetah</_name>
+    <version>10.0</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.1.xml.in b/data/oses/macos/macosx10.1.xml.in
new file mode 100644
index 0000000..6bf7ab6
--- /dev/null
+++ b/data/oses/macos/macosx10.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.1">
+    <short-id>macosx10.1</short-id>
+    <_name>MacOS X Puma</_name>
+    <version>10.1</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.0" />
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.2.xml.in b/data/oses/macos/macosx10.2.xml.in
new file mode 100644
index 0000000..09f9a1b
--- /dev/null
+++ b/data/oses/macos/macosx10.2.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.2">
+    <short-id>macosx10.2</short-id>
+    <_name>MacOS X Jaguar</_name>
+    <version>10.2</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.1" />
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.3.xml.in b/data/oses/macos/macosx10.3.xml.in
new file mode 100644
index 0000000..12683a1
--- /dev/null
+++ b/data/oses/macos/macosx10.3.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.3">
+    <short-id>macosx10.3</short-id>
+    <_name>MacOS X Panther</_name>
+    <version>10.3</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.2" />
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.4.xml.in b/data/oses/macos/macosx10.4.xml.in
new file mode 100644
index 0000000..ffefae0
--- /dev/null
+++ b/data/oses/macos/macosx10.4.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.4">
+    <short-id>macosx10.4</short-id>
+    <_name>MacOS X Tiger</_name>
+    <version>10.4</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.3" />
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.5.xml.in b/data/oses/macos/macosx10.5.xml.in
new file mode 100644
index 0000000..c869b89
--- /dev/null
+++ b/data/oses/macos/macosx10.5.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.5">
+    <short-id>macosx10.5</short-id>
+    <_name>MacOS X Leopard</_name>
+    <version>10.5</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.4" />
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.6.xml.in b/data/oses/macos/macosx10.6.xml.in
new file mode 100644
index 0000000..b34f531
--- /dev/null
+++ b/data/oses/macos/macosx10.6.xml.in
@@ -0,0 +1,21 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.6">
+    <short-id>macosx10.6</short-id>
+    <_name>MacOS X Snow Leopard</_name>
+    <version>10.6</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.5" />
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <cpu>1600000000</cpu>
+        <ram>2147483648</ram>
+        <storage>7516192768</storage>
+      </minimum>
+    </resources>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.7.xml.in b/data/oses/macos/macosx10.7.xml.in
new file mode 100644
index 0000000..f20c9c2
--- /dev/null
+++ b/data/oses/macos/macosx10.7.xml.in
@@ -0,0 +1,21 @@
+<libosinfo version="0.0.1">
+  <os id="http://apple.com/macosx/10.7">
+    <short-id>macosx10.7</short-id>
+    <_name>MacOS X Lion</_name>
+    <version>10.7</version>
+    <_vendor>Apple Inc.</_vendor>
+    <family>darwin</family>
+    <distro>osx</distro>
+    <upgrades id="http://apple.com/macosx/10.6" />
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>2</n-cpus>
+        <cpu>1600000000</cpu>
+        <ram>2147483648</ram>
+        <storage>7516192768</storage>
+      </minimum>
+    </resources>
+
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e51115..bb77fe5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -103,6 +103,14 @@ data/oses/gnome/gnome3.8.xml.in
 data/oses/gnome/gnome-continuous-3.10.xml.in
 data/oses/gnome/gnome-continuous-3.12.xml.in
 data/oses/gnome/gnome-continuous-3.14.xml.in
+data/oses/macos/macosx10.0.xml.in
+data/oses/macos/macosx10.1.xml.in
+data/oses/macos/macosx10.2.xml.in
+data/oses/macos/macosx10.3.xml.in
+data/oses/macos/macosx10.4.xml.in
+data/oses/macos/macosx10.5.xml.in
+data/oses/macos/macosx10.6.xml.in
+data/oses/macos/macosx10.7.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
@@ -113,7 +121,6 @@ data/oses/suse.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
-data/oses/macos.xml.in
 data/oses/ubuntu.xml.in
 data/oses/openbsd.xml.in
 data/oses/rhl.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:31 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:31 +0100
Subject: [Libosinfo] [PATCH 13/39] data: split mageia into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-14-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                    |   1 +
 data/oses/Makefile.am           |   2 +-
 data/oses/mageia.xml.in         | 133 ----------------------------------------
 data/oses/mageia/Makefile.am    |   1 +
 data/oses/mageia/mageia1.xml.in |  58 ++++++++++++++++++
 data/oses/mageia/mageia2.xml.in |  32 ++++++++++
 data/oses/mageia/mageia3.xml.in |  43 +++++++++++++
 po/POTFILES.in                  |   4 +-
 8 files changed, 139 insertions(+), 135 deletions(-)
 delete mode 100644 data/oses/mageia.xml.in
 create mode 100644 data/oses/mageia/Makefile.am
 create mode 100644 data/oses/mageia/mageia1.xml.in
 create mode 100644 data/oses/mageia/mageia2.xml.in
 create mode 100644 data/oses/mageia/mageia3.xml.in

diff --git a/configure.ac b/configure.ac
index 86af391..f12890a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,7 @@ AC_CONFIG_FILES([
 	data/oses/freebsd/Makefile
 	data/oses/gnome/Makefile
 	data/oses/macos/Makefile
+	data/oses/mageia/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index de3d323..cb5de38 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS = \
 	freebsd \
 	gnome \
 	macos \
+	mageia \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	mageia.xml.in \
 	mandriva.xml.in \
 	mandrake.xml.in \
 	netbsd.xml.in	\
diff --git a/data/oses/mageia.xml.in b/data/oses/mageia.xml.in
deleted file mode 100644
index 4e994d8..0000000
--- a/data/oses/mageia.xml.in
+++ /dev/null
@@ -1,133 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://mageia.org/mageia/1">
-    <short-id>mageia1</short-id>
-    <_name>Mageia 1</_name>
-    <_vendor>Mageia</_vendor>
-    <family>linux</family>
-    <distro>mageia</distro>
-    <version>1</version>
-    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
-    <release-date>2011-06-01</release-date>
-    <eol-date>2012-12-01</eol-date>
-
-    <media arch="i686">
-      <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-i586</url>
-      <iso>
-        <volume-id>1-i586</volume-id>
-        <publisher-id>Mageia.Org</publisher-id>
-      </iso>
-    </media>
-    <media arch="i686">
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
-      <iso>
-        <volume-id>mageia-dual-1</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
-      <iso>
-        <volume-id>mageia-dual-1</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-x86_64</url>
-      <iso>
-        <volume-id>1-x86_64</volume-id>
-        <publisher-id>Mageia.Org</publisher-id>
-      </iso>
-    </media>
-    <media live="true" arch="i686">
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe1-cd-i586</url>
-<!--
-      The Mageia project releases several live CD isos for different languages, but libosinfo
-      currently only supports one <url> node per <media> node
-
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe2-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-asia-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-africa-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe1-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe2-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-asia-cd-i586</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-africa-cd-i586</url>
--->
-      <iso>
-        <volume-id>Livecd-1-(GNOME|KDE)</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://mageia.org/mageia/2">
-    <short-id>mageia2</short-id>
-    <_name>Mageia 2</_name>
-    <_vendor>Mageia</_vendor>
-    <family>linux</family>
-    <distro>mageia</distro>
-    <version>2</version>
-    <derives-from id="http://mageia.org/mageia/1"/>
-    <release-date>2012-05-22</release-date>
-    <eol-date>2013-11-22</eol-date>
-
-    <media arch="i686">
-      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-i586-DVD.iso</url>
-<!--
-      <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
--->
-      <iso>
-        <volume-id>Mageia-2(-i586)?</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-x86_64-DVD.iso</url>
-<!--
-      <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
--->
-      <iso>
-        <volume-id>Mageia-2(-x86_64)?</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://mageia.org/mageia/3">
-    <short-id>mageia3</short-id>
-    <_name>Mageia 3</_name>
-    <_vendor>Mageia</_vendor>
-    <family>linux</family>
-    <distro>mageia</distro>
-    <version>3</version>
-    <derives-from id="http://mageia.org/mageia/2"/>
-    <release-date>2013-05-19</release-date>
-    <eol-date>2014-11-19</eol-date>
-
-    <media arch="i686">
-      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-i586-DVD.iso</url>
-<!--
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
--->
-      <iso>
-        <volume-id>Mageia-3(-i586)?</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-x86_64-DVD.iso</url>
-<!--
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
--->
-      <iso>
-        <volume-id>Mageia-3(-x86_64)?</volume-id>
-      </iso>
-    </media>
-    <media live="true" arch="i686">
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso</url>
-<!--
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso</url>
-      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso</url>
--->
-      <iso>
-        <volume-id>Mageia-3-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/mageia/Makefile.am b/data/oses/mageia/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/mageia/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/mageia/mageia1.xml.in b/data/oses/mageia/mageia1.xml.in
new file mode 100644
index 0000000..39e6e5b
--- /dev/null
+++ b/data/oses/mageia/mageia1.xml.in
@@ -0,0 +1,58 @@
+<libosinfo version="0.0.1">
+  <os id="http://mageia.org/mageia/1">
+    <short-id>mageia1</short-id>
+    <_name>Mageia 1</_name>
+    <_vendor>Mageia</_vendor>
+    <family>linux</family>
+    <distro>mageia</distro>
+    <version>1</version>
+    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
+    <release-date>2011-06-01</release-date>
+    <eol-date>2012-12-01</eol-date>
+
+    <media arch="i686">
+      <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-i586</url>
+      <iso>
+        <volume-id>1-i586</volume-id>
+        <publisher-id>Mageia.Org</publisher-id>
+      </iso>
+    </media>
+    <media arch="i686">
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
+      <iso>
+        <volume-id>mageia-dual-1</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-cd-dualarch</url>
+      <iso>
+        <volume-id>mageia-dual-1</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <url>https://www.mageia.org/en/downloads/get/?q=mageia-1-dvd-x86_64</url>
+      <iso>
+        <volume-id>1-x86_64</volume-id>
+        <publisher-id>Mageia.Org</publisher-id>
+      </iso>
+    </media>
+    <media live="true" arch="i686">
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe1-cd-i586</url>
+<!--
+      The Mageia project releases several live CD isos for different languages, but libosinfo
+      currently only supports one <url> node per <media> node
+
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-europe2-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-asia-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-kde-africa-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe1-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-europe2-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-asia-cd-i586</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=mageia-1-live-gnome-africa-cd-i586</url>
+-->
+      <iso>
+        <volume-id>Livecd-1-(GNOME|KDE)</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/mageia/mageia2.xml.in b/data/oses/mageia/mageia2.xml.in
new file mode 100644
index 0000000..58d80f8
--- /dev/null
+++ b/data/oses/mageia/mageia2.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://mageia.org/mageia/2">
+    <short-id>mageia2</short-id>
+    <_name>Mageia 2</_name>
+    <_vendor>Mageia</_vendor>
+    <family>linux</family>
+    <distro>mageia</distro>
+    <version>2</version>
+    <derives-from id="http://mageia.org/mageia/1"/>
+    <release-date>2012-05-22</release-date>
+    <eol-date>2013-11-22</eol-date>
+
+    <media arch="i686">
+      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-i586-DVD.iso</url>
+<!--
+      <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
+-->
+      <iso>
+        <volume-id>Mageia-2(-i586)?</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-2-x86_64-DVD.iso</url>
+<!--
+      <url>http://www.mageia.org/en/downloads/get/?q=Mageia-2-dual-CD.iso</url>
+-->
+      <iso>
+        <volume-id>Mageia-2(-x86_64)?</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/mageia/mageia3.xml.in b/data/oses/mageia/mageia3.xml.in
new file mode 100644
index 0000000..429d475
--- /dev/null
+++ b/data/oses/mageia/mageia3.xml.in
@@ -0,0 +1,43 @@
+<libosinfo version="0.0.1">
+  <os id="http://mageia.org/mageia/3">
+    <short-id>mageia3</short-id>
+    <_name>Mageia 3</_name>
+    <_vendor>Mageia</_vendor>
+    <family>linux</family>
+    <distro>mageia</distro>
+    <version>3</version>
+    <derives-from id="http://mageia.org/mageia/2"/>
+    <release-date>2013-05-19</release-date>
+    <eol-date>2014-11-19</eol-date>
+
+    <media arch="i686">
+      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-i586-DVD.iso</url>
+<!--
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
+-->
+      <iso>
+        <volume-id>Mageia-3(-i586)?</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <url>https://www.mageia.org/en/downloads/get/?q=Mageia-3-x86_64-DVD.iso</url>
+<!--
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-dual-CD.iso</url>
+-->
+      <iso>
+        <volume-id>Mageia-3(-x86_64)?</volume-id>
+      </iso>
+    </media>
+    <media live="true" arch="i686">
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-KDE4-i586-DVD.iso</url>
+<!--
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveDVD-GNOME-i586-DVD.iso</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-KDE4-en-i586-CD.iso</url>
+      <url>http://www.mageia.org/fr/downloads/get/?q=Mageia-3-LiveCD-GNOME-en-i586-CD.iso</url>
+-->
+      <iso>
+        <volume-id>Mageia-3-(GNOME|KDE4)-Live(CD|DVD)</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb77fe5..ccf7fcd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -111,10 +111,12 @@ data/oses/macos/macosx10.4.xml.in
 data/oses/macos/macosx10.5.xml.in
 data/oses/macos/macosx10.6.xml.in
 data/oses/macos/macosx10.7.xml.in
+data/oses/mageia/mageia1.xml.in
+data/oses/mageia/mageia2.xml.in
+data/oses/mageia/mageia3.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
-data/oses/mageia.xml.in
 data/oses/mandrake.xml.in
 data/oses/mandriva.xml.in
 data/oses/suse.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:32 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:32 +0100
Subject: [Libosinfo] [PATCH 14/39] data: split mandrake into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-15-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                           |   1 +
 data/oses/Makefile.am                  |   2 +-
 data/oses/mandrake.xml.in              | 218 ---------------------------------
 data/oses/mandrake/Makefile.am         |   1 +
 data/oses/mandrake/mandrake10.0.xml.in |  13 ++
 data/oses/mandrake/mandrake10.1.xml.in |  13 ++
 data/oses/mandrake/mandrake10.2.xml.in |  13 ++
 data/oses/mandrake/mandrake5.1.xml.in  |  11 ++
 data/oses/mandrake/mandrake5.2.xml.in  |  14 +++
 data/oses/mandrake/mandrake5.3.xml.in  |  14 +++
 data/oses/mandrake/mandrake6.0.xml.in  |  14 +++
 data/oses/mandrake/mandrake6.1.xml.in  |  14 +++
 data/oses/mandrake/mandrake7.0.xml.in  |  14 +++
 data/oses/mandrake/mandrake7.1.xml.in  |  14 +++
 data/oses/mandrake/mandrake7.2.xml.in  |  14 +++
 data/oses/mandrake/mandrake8.0.xml.in  |  14 +++
 data/oses/mandrake/mandrake8.1.xml.in  |  14 +++
 data/oses/mandrake/mandrake8.2.xml.in  |  14 +++
 data/oses/mandrake/mandrake9.0.xml.in  |  14 +++
 data/oses/mandrake/mandrake9.1.xml.in  |  14 +++
 data/oses/mandrake/mandrake9.2.xml.in  |  14 +++
 po/POTFILES.in                         |  18 ++-
 22 files changed, 252 insertions(+), 220 deletions(-)
 delete mode 100644 data/oses/mandrake.xml.in
 create mode 100644 data/oses/mandrake/Makefile.am
 create mode 100644 data/oses/mandrake/mandrake10.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake10.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake10.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake5.3.xml.in
 create mode 100644 data/oses/mandrake/mandrake6.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake6.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake7.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake8.2.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.0.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.1.xml.in
 create mode 100644 data/oses/mandrake/mandrake9.2.xml.in

diff --git a/configure.ac b/configure.ac
index f12890a..30bb9f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,7 @@ AC_CONFIG_FILES([
 	data/oses/gnome/Makefile
 	data/oses/macos/Makefile
 	data/oses/mageia/Makefile
+	data/oses/mandrake/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index cb5de38..d4a4fc1 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -8,13 +8,13 @@ SUBDIRS = \
 	gnome \
 	macos \
 	mageia \
+	mandrake \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
 	mandriva.xml.in \
-	mandrake.xml.in \
 	netbsd.xml.in	\
 	netware.xml.in  \
 	openbsd.xml.in  \
diff --git a/data/oses/mandrake.xml.in b/data/oses/mandrake.xml.in
deleted file mode 100644
index 5911266..0000000
--- a/data/oses/mandrake.xml.in
+++ /dev/null
@@ -1,218 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://mandriva.com/mandrake/5.1">
-    <short-id>mandrake5.1</short-id>
-    <_name>Mandrake Linux 5.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Venice</codename>
-    <version>5.1</version>
-  </os>
-
-  <os id="http://mandriva.com/mandrake/5.2">
-    <short-id>mandrake5.2</short-id>
-    <_name>Mandrake Linux 5.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Leeloo</codename>
-    <version>5.2</version>
-    <upgrades id="http://mandriva.com/mandrake/5.1"/>
-    <derives-from id="http://mandriva.com/mandrake/5.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/5.3">
-    <short-id>mandrake5.3</short-id>
-    <_name>Mandrake Linux 5.3</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Festen</codename>
-    <version>5.3</version>
-    <upgrades id="http://mandriva.com/mandrake/5.2"/>
-    <derives-from id="http://mandriva.com/mandrake/5.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/6.0">
-    <short-id>mandrake6.0</short-id>
-    <_name>Mandrake Linux 6.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Venus</codename>
-    <version>6.0</version>
-    <upgrades id="http://mandriva.com/mandrake/5.2"/>
-    <derives-from id="http://mandriva.com/mandrake/5.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/6.1">
-    <short-id>mandrake6.1</short-id>
-    <_name>Mandrake Linux 6.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Helios</codename>
-    <version>6.1</version>
-    <upgrades id="http://mandriva.com/mandrake/6.0"/>
-    <derives-from id="http://mandriva.com/mandrake/6.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.0">
-    <short-id>mandrake7.0</short-id>
-    <_name>Mandrake Linux 7.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Air</codename>
-    <version>7.0</version>
-    <upgrades id="http://mandriva.com/mandrake/6.1"/>
-    <derives-from id="http://mandriva.com/mandrake/6.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.1">
-    <short-id>mandrake7.1</short-id>
-    <_name>Mandrake Linux 7.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Helium</codename>
-    <version>7.1</version>
-    <upgrades id="http://mandriva.com/mandrake/7.0"/>
-    <derives-from id="http://mandriva.com/mandrake/7.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/7.2">
-    <short-id>mandrake7.2</short-id>
-    <_name>Mandrake Linux 7.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Odyssey</codename>
-    <version>7.2</version>
-    <upgrades id="http://mandriva.com/mandrake/7.1"/>
-    <derives-from id="http://mandriva.com/mandrake/7.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.0">
-    <short-id>mandrake8.0</short-id>
-    <_name>Mandrake Linux 8.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Traktopel</codename>
-    <version>8.0</version>
-    <upgrades id="http://mandriva.com/mandrake/7.2"/>
-    <derives-from id="http://mandriva.com/mandrake/7.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.1">
-    <short-id>mandrake8.1</short-id>
-    <_name>Mandrake Linux 8.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Vitamin</codename>
-    <version>8.1</version>
-    <upgrades id="http://mandriva.com/mandrake/8.0"/>
-    <derives-from id="http://mandriva.com/mandrake/8.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/8.2">
-    <short-id>mandrake8.2</short-id>
-    <_name>Mandrake Linux 8.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Bluebird</codename>
-    <version>8.2</version>
-    <upgrades id="http://mandriva.com/mandrake/8.1"/>
-    <derives-from id="http://mandriva.com/mandrake/8.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.0">
-    <short-id>mandrake9.0</short-id>
-    <_name>Mandrake Linux 9.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Dolphin</codename>
-    <version>9.0</version>
-    <upgrades id="http://mandriva.com/mandrake/8.2"/>
-    <derives-from id="http://mandriva.com/mandrake/8.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.1">
-    <short-id>mandrake9.1</short-id>
-    <_name>Mandrake Linux 9.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>Bamboo</codename>
-    <version>9.1</version>
-    <upgrades id="http://mandriva.com/mandrake/9.0"/>
-    <derives-from id="http://mandriva.com/mandrake/9.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/9.2">
-    <short-id>mandrake9.2</short-id>
-    <_name>Mandrake Linux 9.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <codename>FiveStar</codename>
-    <version>9.2</version>
-    <upgrades id="http://mandriva.com/mandrake/9.1"/>
-    <derives-from id="http://mandriva.com/mandrake/9.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.0">
-    <short-id>mandrake10.0</short-id>
-    <_name>Mandrake Linux 10.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <version>10.0</version>
-    <upgrades id="http://mandriva.com/mandrake/9.2"/>
-    <derives-from id="http://mandriva.com/mandrake/9.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.1">
-    <short-id>mandrake10.1</short-id>
-    <_name>Mandrake Linux 10.1</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <version>10.1</version>
-    <upgrades id="http://mandriva.com/mandrake/10.0"/>
-    <derives-from id="http://mandriva.com/mandrake/10.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandrake/10.2">
-    <short-id>mandrake10.2</short-id>
-    <_name>Mandrake Linux 10.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandrake</distro>
-    <version>10.2</version>
-    <upgrades id="http://mandriva.com/mandrake/10.1"/>
-    <derives-from id="http://mandriva.com/mandrake/10.1"/>
-
-  </os>
-
-</libosinfo>
diff --git a/data/oses/mandrake/Makefile.am b/data/oses/mandrake/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/mandrake/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/mandrake/mandrake10.0.xml.in b/data/oses/mandrake/mandrake10.0.xml.in
new file mode 100644
index 0000000..4c6526c
--- /dev/null
+++ b/data/oses/mandrake/mandrake10.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/10.0">
+    <short-id>mandrake10.0</short-id>
+    <_name>Mandrake Linux 10.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <version>10.0</version>
+    <upgrades id="http://mandriva.com/mandrake/9.2"/>
+    <derives-from id="http://mandriva.com/mandrake/9.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake10.1.xml.in b/data/oses/mandrake/mandrake10.1.xml.in
new file mode 100644
index 0000000..b4a4943
--- /dev/null
+++ b/data/oses/mandrake/mandrake10.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/10.1">
+    <short-id>mandrake10.1</short-id>
+    <_name>Mandrake Linux 10.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <version>10.1</version>
+    <upgrades id="http://mandriva.com/mandrake/10.0"/>
+    <derives-from id="http://mandriva.com/mandrake/10.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake10.2.xml.in b/data/oses/mandrake/mandrake10.2.xml.in
new file mode 100644
index 0000000..2e0b553
--- /dev/null
+++ b/data/oses/mandrake/mandrake10.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/10.2">
+    <short-id>mandrake10.2</short-id>
+    <_name>Mandrake Linux 10.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <version>10.2</version>
+    <upgrades id="http://mandriva.com/mandrake/10.1"/>
+    <derives-from id="http://mandriva.com/mandrake/10.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake5.1.xml.in b/data/oses/mandrake/mandrake5.1.xml.in
new file mode 100644
index 0000000..2bd3669
--- /dev/null
+++ b/data/oses/mandrake/mandrake5.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/5.1">
+    <short-id>mandrake5.1</short-id>
+    <_name>Mandrake Linux 5.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Venice</codename>
+    <version>5.1</version>
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake5.2.xml.in b/data/oses/mandrake/mandrake5.2.xml.in
new file mode 100644
index 0000000..6a87a82
--- /dev/null
+++ b/data/oses/mandrake/mandrake5.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/5.2">
+    <short-id>mandrake5.2</short-id>
+    <_name>Mandrake Linux 5.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Leeloo</codename>
+    <version>5.2</version>
+    <upgrades id="http://mandriva.com/mandrake/5.1"/>
+    <derives-from id="http://mandriva.com/mandrake/5.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake5.3.xml.in b/data/oses/mandrake/mandrake5.3.xml.in
new file mode 100644
index 0000000..fe88f07
--- /dev/null
+++ b/data/oses/mandrake/mandrake5.3.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/5.3">
+    <short-id>mandrake5.3</short-id>
+    <_name>Mandrake Linux 5.3</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Festen</codename>
+    <version>5.3</version>
+    <upgrades id="http://mandriva.com/mandrake/5.2"/>
+    <derives-from id="http://mandriva.com/mandrake/5.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake6.0.xml.in b/data/oses/mandrake/mandrake6.0.xml.in
new file mode 100644
index 0000000..1f76327
--- /dev/null
+++ b/data/oses/mandrake/mandrake6.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/6.0">
+    <short-id>mandrake6.0</short-id>
+    <_name>Mandrake Linux 6.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Venus</codename>
+    <version>6.0</version>
+    <upgrades id="http://mandriva.com/mandrake/5.2"/>
+    <derives-from id="http://mandriva.com/mandrake/5.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake6.1.xml.in b/data/oses/mandrake/mandrake6.1.xml.in
new file mode 100644
index 0000000..6002f7c
--- /dev/null
+++ b/data/oses/mandrake/mandrake6.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/6.1">
+    <short-id>mandrake6.1</short-id>
+    <_name>Mandrake Linux 6.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Helios</codename>
+    <version>6.1</version>
+    <upgrades id="http://mandriva.com/mandrake/6.0"/>
+    <derives-from id="http://mandriva.com/mandrake/6.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake7.0.xml.in b/data/oses/mandrake/mandrake7.0.xml.in
new file mode 100644
index 0000000..7db15d8
--- /dev/null
+++ b/data/oses/mandrake/mandrake7.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/7.0">
+    <short-id>mandrake7.0</short-id>
+    <_name>Mandrake Linux 7.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Air</codename>
+    <version>7.0</version>
+    <upgrades id="http://mandriva.com/mandrake/6.1"/>
+    <derives-from id="http://mandriva.com/mandrake/6.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake7.1.xml.in b/data/oses/mandrake/mandrake7.1.xml.in
new file mode 100644
index 0000000..b95bb1a
--- /dev/null
+++ b/data/oses/mandrake/mandrake7.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/7.1">
+    <short-id>mandrake7.1</short-id>
+    <_name>Mandrake Linux 7.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Helium</codename>
+    <version>7.1</version>
+    <upgrades id="http://mandriva.com/mandrake/7.0"/>
+    <derives-from id="http://mandriva.com/mandrake/7.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake7.2.xml.in b/data/oses/mandrake/mandrake7.2.xml.in
new file mode 100644
index 0000000..434405a
--- /dev/null
+++ b/data/oses/mandrake/mandrake7.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/7.2">
+    <short-id>mandrake7.2</short-id>
+    <_name>Mandrake Linux 7.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Odyssey</codename>
+    <version>7.2</version>
+    <upgrades id="http://mandriva.com/mandrake/7.1"/>
+    <derives-from id="http://mandriva.com/mandrake/7.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake8.0.xml.in b/data/oses/mandrake/mandrake8.0.xml.in
new file mode 100644
index 0000000..23cada2
--- /dev/null
+++ b/data/oses/mandrake/mandrake8.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/8.0">
+    <short-id>mandrake8.0</short-id>
+    <_name>Mandrake Linux 8.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Traktopel</codename>
+    <version>8.0</version>
+    <upgrades id="http://mandriva.com/mandrake/7.2"/>
+    <derives-from id="http://mandriva.com/mandrake/7.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake8.1.xml.in b/data/oses/mandrake/mandrake8.1.xml.in
new file mode 100644
index 0000000..c39edb4
--- /dev/null
+++ b/data/oses/mandrake/mandrake8.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/8.1">
+    <short-id>mandrake8.1</short-id>
+    <_name>Mandrake Linux 8.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Vitamin</codename>
+    <version>8.1</version>
+    <upgrades id="http://mandriva.com/mandrake/8.0"/>
+    <derives-from id="http://mandriva.com/mandrake/8.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake8.2.xml.in b/data/oses/mandrake/mandrake8.2.xml.in
new file mode 100644
index 0000000..f907384
--- /dev/null
+++ b/data/oses/mandrake/mandrake8.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/8.2">
+    <short-id>mandrake8.2</short-id>
+    <_name>Mandrake Linux 8.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Bluebird</codename>
+    <version>8.2</version>
+    <upgrades id="http://mandriva.com/mandrake/8.1"/>
+    <derives-from id="http://mandriva.com/mandrake/8.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake9.0.xml.in b/data/oses/mandrake/mandrake9.0.xml.in
new file mode 100644
index 0000000..1be7358
--- /dev/null
+++ b/data/oses/mandrake/mandrake9.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/9.0">
+    <short-id>mandrake9.0</short-id>
+    <_name>Mandrake Linux 9.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Dolphin</codename>
+    <version>9.0</version>
+    <upgrades id="http://mandriva.com/mandrake/8.2"/>
+    <derives-from id="http://mandriva.com/mandrake/8.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake9.1.xml.in b/data/oses/mandrake/mandrake9.1.xml.in
new file mode 100644
index 0000000..ff94d48
--- /dev/null
+++ b/data/oses/mandrake/mandrake9.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/9.1">
+    <short-id>mandrake9.1</short-id>
+    <_name>Mandrake Linux 9.1</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>Bamboo</codename>
+    <version>9.1</version>
+    <upgrades id="http://mandriva.com/mandrake/9.0"/>
+    <derives-from id="http://mandriva.com/mandrake/9.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandrake/mandrake9.2.xml.in b/data/oses/mandrake/mandrake9.2.xml.in
new file mode 100644
index 0000000..629f3ad
--- /dev/null
+++ b/data/oses/mandrake/mandrake9.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandrake/9.2">
+    <short-id>mandrake9.2</short-id>
+    <_name>Mandrake Linux 9.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandrake</distro>
+    <codename>FiveStar</codename>
+    <version>9.2</version>
+    <upgrades id="http://mandriva.com/mandrake/9.1"/>
+    <derives-from id="http://mandriva.com/mandrake/9.1"/>
+
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ccf7fcd..42309f4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,10 +114,26 @@ data/oses/macos/macosx10.7.xml.in
 data/oses/mageia/mageia1.xml.in
 data/oses/mageia/mageia2.xml.in
 data/oses/mageia/mageia3.xml.in
+data/oses/mandrake/mandrake5.1.xml.in
+data/oses/mandrake/mandrake5.2.xml.in
+data/oses/mandrake/mandrake5.3.xml.in
+data/oses/mandrake/mandrake6.0.xml.in
+data/oses/mandrake/mandrake6.1.xml.in
+data/oses/mandrake/mandrake7.0.xml.in
+data/oses/mandrake/mandrake7.1.xml.in
+data/oses/mandrake/mandrake7.2.xml.in
+data/oses/mandrake/mandrake8.0.xml.in
+data/oses/mandrake/mandrake8.1.xml.in
+data/oses/mandrake/mandrake8.2.xml.in
+data/oses/mandrake/mandrake9.0.xml.in
+data/oses/mandrake/mandrake9.1.xml.in
+data/oses/mandrake/mandrake9.2.xml.in
+data/oses/mandrake/mandrake10.0.xml.in
+data/oses/mandrake/mandrake10.1.xml.in
+data/oses/mandrake/mandrake10.2.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
-data/oses/mandrake.xml.in
 data/oses/mandriva.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:33 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:33 +0100
Subject: [Libosinfo] [PATCH 15/39] data: split mandriva into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-16-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                             |   1 +
 data/oses/Makefile.am                    |   2 +-
 data/oses/mandriva.xml.in                | 176 -------------------------------
 data/oses/mandriva/Makefile.am           |   1 +
 data/oses/mandriva/mandriva2006.0.xml.in |  13 +++
 data/oses/mandriva/mandriva2007.1.xml.in |  13 +++
 data/oses/mandriva/mandriva2007.xml.in   |  13 +++
 data/oses/mandriva/mandriva2008.0.xml.in |  13 +++
 data/oses/mandriva/mandriva2008.1.xml.in |  13 +++
 data/oses/mandriva/mandriva2009.0.xml.in |  13 +++
 data/oses/mandriva/mandriva2009.1.xml.in |  13 +++
 data/oses/mandriva/mandriva2010.0.xml.in |  17 +++
 data/oses/mandriva/mandriva2010.1.xml.in |  13 +++
 data/oses/mandriva/mandriva2010.2.xml.in |  13 +++
 data/oses/mandriva/mandriva2011.xml.in   |  14 +++
 data/oses/mandriva/mbs1.0.xml.in         |  11 ++
 data/oses/mandriva/mes5.1.xml.in         |  17 +++
 data/oses/mandriva/mes5.xml.in           |  11 ++
 po/POTFILES.in                           |  15 ++-
 19 files changed, 204 insertions(+), 178 deletions(-)
 delete mode 100644 data/oses/mandriva.xml.in
 create mode 100644 data/oses/mandriva/Makefile.am
 create mode 100644 data/oses/mandriva/mandriva2006.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2007.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2007.xml.in
 create mode 100644 data/oses/mandriva/mandriva2008.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2008.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2009.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2009.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.0.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.1.xml.in
 create mode 100644 data/oses/mandriva/mandriva2010.2.xml.in
 create mode 100644 data/oses/mandriva/mandriva2011.xml.in
 create mode 100644 data/oses/mandriva/mbs1.0.xml.in
 create mode 100644 data/oses/mandriva/mes5.1.xml.in
 create mode 100644 data/oses/mandriva/mes5.xml.in

diff --git a/configure.ac b/configure.ac
index 30bb9f0..0efae31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,7 @@ AC_CONFIG_FILES([
 	data/oses/macos/Makefile
 	data/oses/mageia/Makefile
 	data/oses/mandrake/Makefile
+	data/oses/mandriva/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index d4a4fc1..0520cbd 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -9,12 +9,12 @@ SUBDIRS = \
 	macos \
 	mageia \
 	mandrake \
+	mandriva \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	mandriva.xml.in \
 	netbsd.xml.in	\
 	netware.xml.in  \
 	openbsd.xml.in  \
diff --git a/data/oses/mandriva.xml.in b/data/oses/mandriva.xml.in
deleted file mode 100644
index 2816367..0000000
--- a/data/oses/mandriva.xml.in
+++ /dev/null
@@ -1,176 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://mandriva.com/mandriva/2006.0">
-    <short-id>mandriva2006.0</short-id>
-    <_name>Mandriva Linux 2006.0</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2006.0</version>
-    <upgrades id="http://mandriva.com/mandrake/10.2"/>
-    <derives-from id="http://mandriva.com/mandrake/10.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2007">
-    <short-id>mandriva2007</short-id>
-    <_name>Mandriva Linux 2007</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2007</version>
-    <upgrades id="http://mandriva.com/mandriva/2006.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2006.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2007.1">
-    <short-id>mandriva2007.1</short-id>
-    <_name>Mandriva Linux 2007 Spring</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2007.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2007"/>
-    <derives-from id="http://mandriva.com/mandriva/2007"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2008.0">
-    <short-id>mandriva2008.0</short-id>
-    <_name>Mandriva Linux 2008</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2008.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2007.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2007.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2008.1">
-    <short-id>mandriva2008.1</short-id>
-    <_name>Mandriva Linux 2008 Spring</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2008.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2008.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2008.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2009.0">
-    <short-id>mandriva2009.0</short-id>
-    <_name>Mandriva Linux 2009</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2009.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2008.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2008.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2009.1">
-    <short-id>mandriva2009.1</short-id>
-    <_name>Mandriva Linux 2009 Spring</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2009.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2009.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2009.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.0">
-    <short-id>mandriva2010.0</short-id>
-    <_name>Mandriva Linux 2010</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.0</version>
-    <upgrades id="http://mandriva.com/mandriva/2009.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2009.1"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.1">
-    <short-id>mandriva2010.1</short-id>
-    <_name>Mandriva Linux 2010 Spring</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.1</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.0"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.0"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2010.2">
-    <short-id>mandriva2010.2</short-id>
-    <_name>Mandriva Linux 2010.2</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <version>2010.2</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.1"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mandriva/2011">
-    <short-id>mandriva2011</short-id>
-    <_name>Mandriva Linux 2011</_name>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mandriva</distro>
-    <codename>Hydrogen</codename>
-    <version>2011</version>
-    <upgrades id="http://mandriva.com/mandriva/2010.2"/>
-    <derives-from id="http://mandriva.com/mandriva/2010.2"/>
-
-  </os>
-
-  <os id="http://mandriva.com/mes/5.0">
-    <short-id>mes5</short-id>
-    <_name>Mandriva Enterprise Server 5.0</_name>
-    <version>5.0</version>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mes</distro>
-
-  </os>
-
-  <os id="http://mandriva.com/mes/5.1">
-    <short-id>mes5.1</short-id>
-    <_name>Mandriva Enterprise Server 5.1</_name>
-    <version>5.1</version>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mes</distro>
-    <upgrades id="http://mandriva.com/mes/5.0"/>
-    <derives-from id="http://mandriva.com/mes/5.0"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <os id="http://mandriva.com/mbs/1.0">
-    <short-id>mbs1.0</short-id>
-    <_name>Mandriva Business Server 1.0</_name>
-    <version>1.0</version>
-    <_vendor>Mandriva</_vendor>
-    <family>linux</family>
-    <distro>mbs</distro>
-
-  </os>
-
-</libosinfo>
diff --git a/data/oses/mandriva/Makefile.am b/data/oses/mandriva/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/mandriva/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/mandriva/mandriva2006.0.xml.in b/data/oses/mandriva/mandriva2006.0.xml.in
new file mode 100644
index 0000000..abb726b
--- /dev/null
+++ b/data/oses/mandriva/mandriva2006.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2006.0">
+    <short-id>mandriva2006.0</short-id>
+    <_name>Mandriva Linux 2006.0</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2006.0</version>
+    <upgrades id="http://mandriva.com/mandrake/10.2"/>
+    <derives-from id="http://mandriva.com/mandrake/10.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2007.1.xml.in b/data/oses/mandriva/mandriva2007.1.xml.in
new file mode 100644
index 0000000..70a09c8
--- /dev/null
+++ b/data/oses/mandriva/mandriva2007.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2007.1">
+    <short-id>mandriva2007.1</short-id>
+    <_name>Mandriva Linux 2007 Spring</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2007.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2007"/>
+    <derives-from id="http://mandriva.com/mandriva/2007"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2007.xml.in b/data/oses/mandriva/mandriva2007.xml.in
new file mode 100644
index 0000000..032780d
--- /dev/null
+++ b/data/oses/mandriva/mandriva2007.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2007">
+    <short-id>mandriva2007</short-id>
+    <_name>Mandriva Linux 2007</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2007</version>
+    <upgrades id="http://mandriva.com/mandriva/2006.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2006.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2008.0.xml.in b/data/oses/mandriva/mandriva2008.0.xml.in
new file mode 100644
index 0000000..da9743c
--- /dev/null
+++ b/data/oses/mandriva/mandriva2008.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2008.0">
+    <short-id>mandriva2008.0</short-id>
+    <_name>Mandriva Linux 2008</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2008.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2007.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2007.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2008.1.xml.in b/data/oses/mandriva/mandriva2008.1.xml.in
new file mode 100644
index 0000000..64593d8
--- /dev/null
+++ b/data/oses/mandriva/mandriva2008.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2008.1">
+    <short-id>mandriva2008.1</short-id>
+    <_name>Mandriva Linux 2008 Spring</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2008.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2008.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2008.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2009.0.xml.in b/data/oses/mandriva/mandriva2009.0.xml.in
new file mode 100644
index 0000000..1f2d9b3
--- /dev/null
+++ b/data/oses/mandriva/mandriva2009.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2009.0">
+    <short-id>mandriva2009.0</short-id>
+    <_name>Mandriva Linux 2009</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2009.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2008.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2008.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2009.1.xml.in b/data/oses/mandriva/mandriva2009.1.xml.in
new file mode 100644
index 0000000..c8bfb97
--- /dev/null
+++ b/data/oses/mandriva/mandriva2009.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2009.1">
+    <short-id>mandriva2009.1</short-id>
+    <_name>Mandriva Linux 2009 Spring</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2009.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2009.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2009.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2010.0.xml.in b/data/oses/mandriva/mandriva2010.0.xml.in
new file mode 100644
index 0000000..4023625
--- /dev/null
+++ b/data/oses/mandriva/mandriva2010.0.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2010.0">
+    <short-id>mandriva2010.0</short-id>
+    <_name>Mandriva Linux 2010</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.0</version>
+    <upgrades id="http://mandriva.com/mandriva/2009.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2009.1"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2010.1.xml.in b/data/oses/mandriva/mandriva2010.1.xml.in
new file mode 100644
index 0000000..f17651c
--- /dev/null
+++ b/data/oses/mandriva/mandriva2010.1.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2010.1">
+    <short-id>mandriva2010.1</short-id>
+    <_name>Mandriva Linux 2010 Spring</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.1</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.0"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.0"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2010.2.xml.in b/data/oses/mandriva/mandriva2010.2.xml.in
new file mode 100644
index 0000000..c4e9ec1
--- /dev/null
+++ b/data/oses/mandriva/mandriva2010.2.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2010.2">
+    <short-id>mandriva2010.2</short-id>
+    <_name>Mandriva Linux 2010.2</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <version>2010.2</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.1"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.1"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mandriva2011.xml.in b/data/oses/mandriva/mandriva2011.xml.in
new file mode 100644
index 0000000..3bec234
--- /dev/null
+++ b/data/oses/mandriva/mandriva2011.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mandriva/2011">
+    <short-id>mandriva2011</short-id>
+    <_name>Mandriva Linux 2011</_name>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mandriva</distro>
+    <codename>Hydrogen</codename>
+    <version>2011</version>
+    <upgrades id="http://mandriva.com/mandriva/2010.2"/>
+    <derives-from id="http://mandriva.com/mandriva/2010.2"/>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mbs1.0.xml.in b/data/oses/mandriva/mbs1.0.xml.in
new file mode 100644
index 0000000..0c8f19a
--- /dev/null
+++ b/data/oses/mandriva/mbs1.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mbs/1.0">
+    <short-id>mbs1.0</short-id>
+    <_name>Mandriva Business Server 1.0</_name>
+    <version>1.0</version>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mbs</distro>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mes5.1.xml.in b/data/oses/mandriva/mes5.1.xml.in
new file mode 100644
index 0000000..280e902
--- /dev/null
+++ b/data/oses/mandriva/mes5.1.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mes/5.1">
+    <short-id>mes5.1</short-id>
+    <_name>Mandriva Enterprise Server 5.1</_name>
+    <version>5.1</version>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mes</distro>
+    <upgrades id="http://mandriva.com/mes/5.0"/>
+    <derives-from id="http://mandriva.com/mes/5.0"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/mandriva/mes5.xml.in b/data/oses/mandriva/mes5.xml.in
new file mode 100644
index 0000000..547ffdc
--- /dev/null
+++ b/data/oses/mandriva/mes5.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://mandriva.com/mes/5.0">
+    <short-id>mes5</short-id>
+    <_name>Mandriva Enterprise Server 5.0</_name>
+    <version>5.0</version>
+    <_vendor>Mandriva</_vendor>
+    <family>linux</family>
+    <distro>mes</distro>
+
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 42309f4..8c37819 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -131,10 +131,23 @@ data/oses/mandrake/mandrake9.2.xml.in
 data/oses/mandrake/mandrake10.0.xml.in
 data/oses/mandrake/mandrake10.1.xml.in
 data/oses/mandrake/mandrake10.2.xml.in
+data/oses/mandriva/mandriva2006.0.xml.in
+data/oses/mandriva/mandriva2007.1.xml.in
+data/oses/mandriva/mandriva2007.xml.in
+data/oses/mandriva/mandriva2008.0.xml.in
+data/oses/mandriva/mandriva2008.1.xml.in
+data/oses/mandriva/mandriva2009.0.xml.in
+data/oses/mandriva/mandriva2009.1.xml.in
+data/oses/mandriva/mandriva2010.0.xml.in
+data/oses/mandriva/mandriva2010.1.xml.in
+data/oses/mandriva/mandriva2010.2.xml.in
+data/oses/mandriva/mandriva2011.xml.in
+data/oses/mandriva/mbs1.0.xml.in
+data/oses/mandriva/mes5.xml.in
+data/oses/mandriva/mes5.1.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
-data/oses/mandriva.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:34 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:34 +0100
Subject: [Libosinfo] [PATCH 16/39] data: split netbsd into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-17-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                      |   1 +
 data/oses/Makefile.am             |   2 +-
 data/oses/netbsd.xml.in           | 183 --------------------------------------
 data/oses/netbsd/Makefile.am      |   1 +
 data/oses/netbsd/netbsd0.8.xml.in |  12 +++
 data/oses/netbsd/netbsd0.9.xml.in |  14 +++
 data/oses/netbsd/netbsd1.0.xml.in |  14 +++
 data/oses/netbsd/netbsd1.1.xml.in |  14 +++
 data/oses/netbsd/netbsd1.2.xml.in |  14 +++
 data/oses/netbsd/netbsd1.3.xml.in |  14 +++
 data/oses/netbsd/netbsd1.4.xml.in |  14 +++
 data/oses/netbsd/netbsd1.5.xml.in |  14 +++
 data/oses/netbsd/netbsd1.6.xml.in |  14 +++
 data/oses/netbsd/netbsd2.0.xml.in |  14 +++
 data/oses/netbsd/netbsd3.0.xml.in |  14 +++
 data/oses/netbsd/netbsd4.0.xml.in |  14 +++
 data/oses/netbsd/netbsd5.0.xml.in |  14 +++
 data/oses/netbsd/netbsd5.1.xml.in |  14 +++
 po/POTFILES.in                    |  15 +++-
 19 files changed, 211 insertions(+), 185 deletions(-)
 delete mode 100644 data/oses/netbsd.xml.in
 create mode 100644 data/oses/netbsd/Makefile.am
 create mode 100644 data/oses/netbsd/netbsd0.8.xml.in
 create mode 100644 data/oses/netbsd/netbsd0.9.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.1.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.2.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.3.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.4.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.5.xml.in
 create mode 100644 data/oses/netbsd/netbsd1.6.xml.in
 create mode 100644 data/oses/netbsd/netbsd2.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd3.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd4.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd5.0.xml.in
 create mode 100644 data/oses/netbsd/netbsd5.1.xml.in

diff --git a/configure.ac b/configure.ac
index 0efae31..aa835db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,7 @@ AC_CONFIG_FILES([
 	data/oses/mandrake/Makefile
 	data/oses/mandriva/Makefile
 	data/oses/msdos/Makefile
+	data/oses/netbsd/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 0520cbd..c028790 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -11,11 +11,11 @@ SUBDIRS = \
 	mandrake \
 	mandriva \
 	msdos \
+	netbsd \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	netbsd.xml.in	\
 	netware.xml.in  \
 	openbsd.xml.in  \
 	opensuse.xml.in \
diff --git a/data/oses/netbsd.xml.in b/data/oses/netbsd.xml.in
deleted file mode 100644
index fcdc801..0000000
--- a/data/oses/netbsd.xml.in
+++ /dev/null
@@ -1,183 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://netbsd.org/netbsd/0.8">
-    <short-id>netbsd0.8</short-id>
-    <_name>NetBSD 0.8</_name>
-    <version>0.8</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-
-    <release-date>1993-04-20</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/0.9">
-    <short-id>netbsd0.9</short-id>
-    <_name>NetBSD 0.9</_name>
-    <version>0.9</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/0.8"/>
-    <derives-from id="http://netbsd.org/netbsd/0.8"/>
-
-    <release-date>1993-08-20</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.0">
-    <short-id>netbsd1.0</short-id>
-    <_name>NetBSD 1.0</_name>
-    <version>1.0</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/0.9"/>
-    <derives-from id="http://netbsd.org/netbsd/0.9"/>
-
-    <release-date>1994-10-26</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.1">
-    <short-id>netbsd1.1</short-id>
-    <_name>NetBSD 1.1</_name>
-    <version>1.1</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.0"/>
-    <derives-from id="http://netbsd.org/netbsd/1.0"/>
-
-    <release-date>1995-11-26</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.2">
-    <short-id>netbsd1.2</short-id>
-    <_name>NetBSD 1.2</_name>
-    <version>1.2</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.1"/>
-    <derives-from id="http://netbsd.org/netbsd/1.1"/>
-
-    <release-date>1996-10-04</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.3">
-    <short-id>netbsd1.3</short-id>
-    <_name>NetBSD 1.3</_name>
-    <version>1.3</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.2"/>
-    <derives-from id="http://netbsd.org/netbsd/1.2"/>
-
-    <release-date>1998-03-09</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.4">
-    <short-id>netbsd1.4</short-id>
-    <_name>NetBSD 1.4</_name>
-    <version>1.4</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.3"/>
-    <derives-from id="http://netbsd.org/netbsd/1.3"/>
-
-    <release-date>1999-05-12</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.5">
-    <short-id>netbsd1.5</short-id>
-    <_name>NetBSD 1.5</_name>
-    <version>1.5</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.4"/>
-    <derives-from id="http://netbsd.org/netbsd/1.4"/>
-
-    <release-date>2000-12-06</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/1.6">
-    <short-id>netbsd1.6</short-id>
-    <_name>NetBSD 1.6</_name>
-    <version>1.6</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.5"/>
-    <derives-from id="http://netbsd.org/netbsd/1.5"/>
-
-    <release-date>2002-09-14</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/2.0">
-    <short-id>netbsd2.0</short-id>
-    <_name>NetBSD 2.0</_name>
-    <version>2.0</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/1.6"/>
-    <derives-from id="http://netbsd.org/netbsd/1.6"/>
-
-    <release-date>2004-12-09</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/3.0">
-    <short-id>netbsd3.0</short-id>
-    <_name>NetBSD 3.0</_name>
-    <version>3.0</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/2.0"/>
-    <derives-from id="http://netbsd.org/netbsd/2.0"/>
-
-    <release-date>2005-12-23</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/4.0">
-    <short-id>netbsd4.0</short-id>
-    <_name>NetBSD 4.0</_name>
-    <version>4.0</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/3.0"/>
-    <derives-from id="http://netbsd.org/netbsd/3.0"/>
-
-    <release-date>2007-12-19</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/5.0">
-    <short-id>netbsd5.0</short-id>
-    <_name>NetBSD 5.0</_name>
-    <version>5.0</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/4.0"/>
-    <derives-from id="http://netbsd.org/netbsd/4.0"/>
-
-    <release-date>2009-04-29</release-date>
-  </os>
-
-  <os id="http://netbsd.org/netbsd/5.1">
-    <short-id>netbsd5.1</short-id>
-    <_name>NetBSD 5.1</_name>
-    <version>5.1</version>
-    <_vendor>NetBSD Project</_vendor>
-    <family>netbsd</family>
-    <distro>netbsd</distro>
-    <upgrades id="http://netbsd.org/netbsd/5.0"/>
-    <derives-from id="http://netbsd.org/netbsd/5.0"/>
-
-    <release-date>2010-11-19</release-date>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/netbsd/Makefile.am b/data/oses/netbsd/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/netbsd/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/netbsd/netbsd0.8.xml.in b/data/oses/netbsd/netbsd0.8.xml.in
new file mode 100644
index 0000000..1db181d
--- /dev/null
+++ b/data/oses/netbsd/netbsd0.8.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/0.8">
+    <short-id>netbsd0.8</short-id>
+    <_name>NetBSD 0.8</_name>
+    <version>0.8</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+
+    <release-date>1993-04-20</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd0.9.xml.in b/data/oses/netbsd/netbsd0.9.xml.in
new file mode 100644
index 0000000..3f3c2cc
--- /dev/null
+++ b/data/oses/netbsd/netbsd0.9.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/0.9">
+    <short-id>netbsd0.9</short-id>
+    <_name>NetBSD 0.9</_name>
+    <version>0.9</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/0.8"/>
+    <derives-from id="http://netbsd.org/netbsd/0.8"/>
+
+    <release-date>1993-08-20</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.0.xml.in b/data/oses/netbsd/netbsd1.0.xml.in
new file mode 100644
index 0000000..27164db
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.0">
+    <short-id>netbsd1.0</short-id>
+    <_name>NetBSD 1.0</_name>
+    <version>1.0</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/0.9"/>
+    <derives-from id="http://netbsd.org/netbsd/0.9"/>
+
+    <release-date>1994-10-26</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.1.xml.in b/data/oses/netbsd/netbsd1.1.xml.in
new file mode 100644
index 0000000..9c4a7b1
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.1">
+    <short-id>netbsd1.1</short-id>
+    <_name>NetBSD 1.1</_name>
+    <version>1.1</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.0"/>
+    <derives-from id="http://netbsd.org/netbsd/1.0"/>
+
+    <release-date>1995-11-26</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.2.xml.in b/data/oses/netbsd/netbsd1.2.xml.in
new file mode 100644
index 0000000..8ef5df4
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.2">
+    <short-id>netbsd1.2</short-id>
+    <_name>NetBSD 1.2</_name>
+    <version>1.2</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.1"/>
+    <derives-from id="http://netbsd.org/netbsd/1.1"/>
+
+    <release-date>1996-10-04</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.3.xml.in b/data/oses/netbsd/netbsd1.3.xml.in
new file mode 100644
index 0000000..7cd202f
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.3.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.3">
+    <short-id>netbsd1.3</short-id>
+    <_name>NetBSD 1.3</_name>
+    <version>1.3</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.2"/>
+    <derives-from id="http://netbsd.org/netbsd/1.2"/>
+
+    <release-date>1998-03-09</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.4.xml.in b/data/oses/netbsd/netbsd1.4.xml.in
new file mode 100644
index 0000000..428ebab
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.4.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.4">
+    <short-id>netbsd1.4</short-id>
+    <_name>NetBSD 1.4</_name>
+    <version>1.4</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.3"/>
+    <derives-from id="http://netbsd.org/netbsd/1.3"/>
+
+    <release-date>1999-05-12</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.5.xml.in b/data/oses/netbsd/netbsd1.5.xml.in
new file mode 100644
index 0000000..6829a27
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.5.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.5">
+    <short-id>netbsd1.5</short-id>
+    <_name>NetBSD 1.5</_name>
+    <version>1.5</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.4"/>
+    <derives-from id="http://netbsd.org/netbsd/1.4"/>
+
+    <release-date>2000-12-06</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd1.6.xml.in b/data/oses/netbsd/netbsd1.6.xml.in
new file mode 100644
index 0000000..2de7cda
--- /dev/null
+++ b/data/oses/netbsd/netbsd1.6.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/1.6">
+    <short-id>netbsd1.6</short-id>
+    <_name>NetBSD 1.6</_name>
+    <version>1.6</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.5"/>
+    <derives-from id="http://netbsd.org/netbsd/1.5"/>
+
+    <release-date>2002-09-14</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd2.0.xml.in b/data/oses/netbsd/netbsd2.0.xml.in
new file mode 100644
index 0000000..c626201
--- /dev/null
+++ b/data/oses/netbsd/netbsd2.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/2.0">
+    <short-id>netbsd2.0</short-id>
+    <_name>NetBSD 2.0</_name>
+    <version>2.0</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/1.6"/>
+    <derives-from id="http://netbsd.org/netbsd/1.6"/>
+
+    <release-date>2004-12-09</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd3.0.xml.in b/data/oses/netbsd/netbsd3.0.xml.in
new file mode 100644
index 0000000..f372e94
--- /dev/null
+++ b/data/oses/netbsd/netbsd3.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/3.0">
+    <short-id>netbsd3.0</short-id>
+    <_name>NetBSD 3.0</_name>
+    <version>3.0</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/2.0"/>
+    <derives-from id="http://netbsd.org/netbsd/2.0"/>
+
+    <release-date>2005-12-23</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd4.0.xml.in b/data/oses/netbsd/netbsd4.0.xml.in
new file mode 100644
index 0000000..aebaf7a
--- /dev/null
+++ b/data/oses/netbsd/netbsd4.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/4.0">
+    <short-id>netbsd4.0</short-id>
+    <_name>NetBSD 4.0</_name>
+    <version>4.0</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/3.0"/>
+    <derives-from id="http://netbsd.org/netbsd/3.0"/>
+
+    <release-date>2007-12-19</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd5.0.xml.in b/data/oses/netbsd/netbsd5.0.xml.in
new file mode 100644
index 0000000..860d08e
--- /dev/null
+++ b/data/oses/netbsd/netbsd5.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/5.0">
+    <short-id>netbsd5.0</short-id>
+    <_name>NetBSD 5.0</_name>
+    <version>5.0</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/4.0"/>
+    <derives-from id="http://netbsd.org/netbsd/4.0"/>
+
+    <release-date>2009-04-29</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/netbsd/netbsd5.1.xml.in b/data/oses/netbsd/netbsd5.1.xml.in
new file mode 100644
index 0000000..2eabddd
--- /dev/null
+++ b/data/oses/netbsd/netbsd5.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://netbsd.org/netbsd/5.1">
+    <short-id>netbsd5.1</short-id>
+    <_name>NetBSD 5.1</_name>
+    <version>5.1</version>
+    <_vendor>NetBSD Project</_vendor>
+    <family>netbsd</family>
+    <distro>netbsd</distro>
+    <upgrades id="http://netbsd.org/netbsd/5.0"/>
+    <derives-from id="http://netbsd.org/netbsd/5.0"/>
+
+    <release-date>2010-11-19</release-date>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8c37819..62cad53 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -146,6 +146,20 @@ data/oses/mandriva/mbs1.0.xml.in
 data/oses/mandriva/mes5.xml.in
 data/oses/mandriva/mes5.1.xml.in
 data/oses/msdos/msdos6.22.xml.in
+data/oses/netbsd/netbsd0.8.xml.in
+data/oses/netbsd/netbsd0.9.xml.in
+data/oses/netbsd/netbsd1.0.xml.in
+data/oses/netbsd/netbsd1.1.xml.in
+data/oses/netbsd/netbsd1.2.xml.in
+data/oses/netbsd/netbsd1.3.xml.in
+data/oses/netbsd/netbsd1.4.xml.in
+data/oses/netbsd/netbsd1.5.xml.in
+data/oses/netbsd/netbsd1.6.xml.in
+data/oses/netbsd/netbsd2.0.xml.in
+data/oses/netbsd/netbsd3.0.xml.in
+data/oses/netbsd/netbsd4.0.xml.in
+data/oses/netbsd/netbsd5.0.xml.in
+data/oses/netbsd/netbsd5.1.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
@@ -155,7 +169,6 @@ data/oses/opensuse.xml.in
 data/oses/ubuntu.xml.in
 data/oses/openbsd.xml.in
 data/oses/rhl.xml.in
-data/oses/netbsd.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:35 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:35 +0100
Subject: [Libosinfo] [PATCH 17/39] data: split netware into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-18-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                      |  1 +
 data/oses/Makefile.am             |  2 +-
 data/oses/netware.xml.in          | 29 -----------------------------
 data/oses/netware/Makefile.am     |  1 +
 data/oses/netware/netware4.xml.in | 10 ++++++++++
 data/oses/netware/netware5.xml.in | 10 ++++++++++
 data/oses/netware/netware6.xml.in | 10 ++++++++++
 po/POTFILES.in                    |  4 +++-
 8 files changed, 36 insertions(+), 31 deletions(-)
 delete mode 100644 data/oses/netware.xml.in
 create mode 100644 data/oses/netware/Makefile.am
 create mode 100644 data/oses/netware/netware4.xml.in
 create mode 100644 data/oses/netware/netware5.xml.in
 create mode 100644 data/oses/netware/netware6.xml.in

diff --git a/configure.ac b/configure.ac
index aa835db..2d1c28b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,7 @@ AC_CONFIG_FILES([
 	data/oses/mandriva/Makefile
 	data/oses/msdos/Makefile
 	data/oses/netbsd/Makefile
+	data/oses/netware/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index c028790..31634ff 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -12,11 +12,11 @@ SUBDIRS = \
 	mandriva \
 	msdos \
 	netbsd \
+	netware \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	netware.xml.in  \
 	openbsd.xml.in  \
 	opensuse.xml.in \
 	rhl.xml.in      \
diff --git a/data/oses/netware.xml.in b/data/oses/netware.xml.in
deleted file mode 100644
index 7fd984c..0000000
--- a/data/oses/netware.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<libosinfo version="0.0.1">
-  <os id="http://novell.com/netware4">
-    <short-id>netware4</short-id>
-    <_name>Novell Netware 4</_name>
-    <_vendor>Novell</_vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>4</version>
-  </os>
-
-  <os id="http://novell.com/netware5">
-    <short-id>netware5</short-id>
-    <_name>Novell Netware 5</_name>
-    <_vendor>Novell</_vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>5</version>
-  </os>
-
-  <os id="http://novell.com/netware6">
-    <short-id>netware6</short-id>
-    <_name>Novell Netware 6</_name>
-    <_vendor>Novell</_vendor>
-    <family>netware</family>
-    <distro>netware</distro>
-    <version>6</version>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/netware/Makefile.am b/data/oses/netware/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/netware/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/netware/netware4.xml.in b/data/oses/netware/netware4.xml.in
new file mode 100644
index 0000000..cab2975
--- /dev/null
+++ b/data/oses/netware/netware4.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://novell.com/netware4">
+    <short-id>netware4</short-id>
+    <_name>Novell Netware 4</_name>
+    <_vendor>Novell</_vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>4</version>
+  </os>
+</libosinfo>
diff --git a/data/oses/netware/netware5.xml.in b/data/oses/netware/netware5.xml.in
new file mode 100644
index 0000000..f52aaa7
--- /dev/null
+++ b/data/oses/netware/netware5.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://novell.com/netware5">
+    <short-id>netware5</short-id>
+    <_name>Novell Netware 5</_name>
+    <_vendor>Novell</_vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>5</version>
+  </os>
+</libosinfo>
diff --git a/data/oses/netware/netware6.xml.in b/data/oses/netware/netware6.xml.in
new file mode 100644
index 0000000..6a51027
--- /dev/null
+++ b/data/oses/netware/netware6.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://novell.com/netware6">
+    <short-id>netware6</short-id>
+    <_name>Novell Netware 6</_name>
+    <_vendor>Novell</_vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+    <version>6</version>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 62cad53..154e526 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -160,7 +160,9 @@ data/oses/netbsd/netbsd3.0.xml.in
 data/oses/netbsd/netbsd4.0.xml.in
 data/oses/netbsd/netbsd5.0.xml.in
 data/oses/netbsd/netbsd5.1.xml.in
-data/oses/netware.xml.in
+data/oses/netware/netware4.xml.in
+data/oses/netware/netware5.xml.in
+data/oses/netware/netware6.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:36 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:36 +0100
Subject: [Libosinfo] [PATCH 18/39] data: split openbsd into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-19-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                        |   1 +
 data/oses/Makefile.am               |   2 +-
 data/oses/openbsd.xml.in            | 401 ------------------------------------
 data/oses/openbsd/Makefile.am       |   1 +
 data/oses/openbsd/openbsd4.2.xml.in |  28 +++
 data/oses/openbsd/openbsd4.3.xml.in |  30 +++
 data/oses/openbsd/openbsd4.4.xml.in |  30 +++
 data/oses/openbsd/openbsd4.5.xml.in |  30 +++
 data/oses/openbsd/openbsd4.8.xml.in |  30 +++
 data/oses/openbsd/openbsd4.9.xml.in |  34 +++
 data/oses/openbsd/openbsd5.0.xml.in |  31 +++
 data/oses/openbsd/openbsd5.1.xml.in |  32 +++
 data/oses/openbsd/openbsd5.2.xml.in |  32 +++
 data/oses/openbsd/openbsd5.3.xml.in |  32 +++
 data/oses/openbsd/openbsd5.4.xml.in |  37 ++++
 data/oses/openbsd/openbsd5.5.xml.in |  32 +++
 data/oses/openbsd/openbsd5.6.xml.in |  32 +++
 po/POTFILES.in                      |  14 +-
 18 files changed, 426 insertions(+), 403 deletions(-)
 delete mode 100644 data/oses/openbsd.xml.in
 create mode 100644 data/oses/openbsd/Makefile.am
 create mode 100644 data/oses/openbsd/openbsd4.2.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.3.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.4.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.5.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.8.xml.in
 create mode 100644 data/oses/openbsd/openbsd4.9.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.0.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.1.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.2.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.3.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.4.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.5.xml.in
 create mode 100644 data/oses/openbsd/openbsd5.6.xml.in

diff --git a/configure.ac b/configure.ac
index 2d1c28b..ab192fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,7 @@ AC_CONFIG_FILES([
 	data/oses/msdos/Makefile
 	data/oses/netbsd/Makefile
 	data/oses/netware/Makefile
+	data/oses/openbsd/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 31634ff..b4edf42 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -13,11 +13,11 @@ SUBDIRS = \
 	msdos \
 	netbsd \
 	netware \
+	openbsd \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	openbsd.xml.in  \
 	opensuse.xml.in \
 	rhl.xml.in      \
 	rhel.xml.in     \
diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in
deleted file mode 100644
index d1d2e50..0000000
--- a/data/oses/openbsd.xml.in
+++ /dev/null
@@ -1,401 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://openbsd.org/openbsd/4.2">
-    <short-id>openbsd4.2</short-id>
-    <_name>OpenBSD 4.2</_name>
-    <version>4.2</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.3">
-    <short-id>openbsd4.3</short-id>
-    <_name>OpenBSD 4.3</_name>
-    <version>4.3</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.2'/>
-    <derives-from id='http://openbsd.org/openbsd/4.2'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.4">
-    <short-id>openbsd4.4</short-id>
-    <_name>OpenBSD 4.4</_name>
-    <version>4.4</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.3'/>
-    <derives-from id='http://openbsd.org/openbsd/4.3'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.5">
-    <short-id>openbsd4.5</short-id>
-    <_name>OpenBSD 4.5</_name>
-    <version>4.5</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.4'/>
-    <derives-from id='http://openbsd.org/openbsd/4.4'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.8">
-    <short-id>openbsd4.8</short-id>
-    <_name>OpenBSD 4.8</_name>
-    <version>4.8</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.5'/>
-    <derives-from id='http://openbsd.org/openbsd/4.5'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.9">
-    <short-id>openbsd4.9</short-id>
-    <_name>OpenBSD 4.9</_name>
-    <version>4.9</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.8'/>
-    <derives-from id='http://openbsd.org/openbsd/4.8'/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
-    </devices>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-
-  <os id="http://openbsd.org/openbsd/5.0">
-    <short-id>openbsd5.0</short-id>
-    <_name>OpenBSD 5.0</_name>
-    <version>5.0</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.9'/>
-    <derives-from id='http://openbsd.org/openbsd/4.9'/>
-
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.1">
-    <short-id>openbsd5.1</short-id>
-    <_name>OpenBSD 5.1</_name>
-    <version>5.1</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.0'/>
-    <derives-from id='http://openbsd.org/openbsd/5.0'/>
-
-    <release-date>2012-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.1 Install CD</volume-id>
-	<application-id>OpenBSD 5.1 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.1 Install CD</volume-id>
-	<application-id>OpenBSD 5.1 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.2">
-    <short-id>openbsd5.2</short-id>
-    <_name>OpenBSD 5.2</_name>
-    <version>5.2</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.1'/>
-    <derives-from id='http://openbsd.org/openbsd/5.1'/>
-
-    <release-date>2012-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.2 Install CD</volume-id>
-	<application-id>OpenBSD 5.2 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.2 Install CD</volume-id>
-	<application-id>OpenBSD 5.2 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.3">
-    <short-id>openbsd5.3</short-id>
-    <_name>OpenBSD 5.3</_name>
-    <version>5.3</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.2'/>
-    <derives-from id='http://openbsd.org/openbsd/5.2'/>
-
-    <release-date>2013-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.3 Install CD</volume-id>
-	<application-id>OpenBSD 5.3 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.3 Install CD</volume-id>
-	<application-id>OpenBSD 5.3 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.4">
-    <short-id>openbsd5.4</short-id>
-    <_name>OpenBSD 5.4</_name>
-    <version>5.4</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.3'/>
-    <derives-from id='http://openbsd.org/openbsd/5.3'/>
-
-    <release-date>2013-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.4 Install CD</volume-id>
-	<application-id>OpenBSD 5.4 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.4 Install CD</volume-id>
-	<application-id>OpenBSD 5.4 amd64 Install CD</application-id>
-      </iso>
-    </media>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.5">
-    <short-id>openbsd5.5</short-id>
-    <_name>OpenBSD 5.5</_name>
-    <version>5.5</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.4'/>
-    <derives-from id='http://openbsd.org/openbsd/5.4'/>
-
-    <release-date>2014-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.5 Install CD</volume-id>
-	<application-id>OpenBSD 5.5 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.5 Install CD</volume-id>
-	<application-id>OpenBSD 5.5 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.6">
-    <short-id>openbsd5.6</short-id>
-    <_name>OpenBSD 5.6</_name>
-    <version>5.6</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.5'/>
-    <derives-from id='http://openbsd.org/openbsd/5.5'/>
-
-    <release-date>2014-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.6 Install CD</volume-id>
-	<application-id>OpenBSD 5.6 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.6 Install CD</volume-id>
-	<application-id>OpenBSD 5.6 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/openbsd/Makefile.am b/data/oses/openbsd/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/openbsd/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/openbsd/openbsd4.2.xml.in b/data/oses/openbsd/openbsd4.2.xml.in
new file mode 100644
index 0000000..a322187
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.2.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.2">
+    <short-id>openbsd4.2</short-id>
+    <_name>OpenBSD 4.2</_name>
+    <version>4.2</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd4.3.xml.in b/data/oses/openbsd/openbsd4.3.xml.in
new file mode 100644
index 0000000..635b656
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.3.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.3">
+    <short-id>openbsd4.3</short-id>
+    <_name>OpenBSD 4.3</_name>
+    <version>4.3</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.2'/>
+    <derives-from id='http://openbsd.org/openbsd/4.2'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd4.4.xml.in b/data/oses/openbsd/openbsd4.4.xml.in
new file mode 100644
index 0000000..f5b4e8e
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.4.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.4">
+    <short-id>openbsd4.4</short-id>
+    <_name>OpenBSD 4.4</_name>
+    <version>4.4</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.3'/>
+    <derives-from id='http://openbsd.org/openbsd/4.3'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd4.5.xml.in b/data/oses/openbsd/openbsd4.5.xml.in
new file mode 100644
index 0000000..2f51347
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.5.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.5">
+    <short-id>openbsd4.5</short-id>
+    <_name>OpenBSD 4.5</_name>
+    <version>4.5</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.4'/>
+    <derives-from id='http://openbsd.org/openbsd/4.4'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd4.8.xml.in b/data/oses/openbsd/openbsd4.8.xml.in
new file mode 100644
index 0000000..ee53699
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.8.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.8">
+    <short-id>openbsd4.8</short-id>
+    <_name>OpenBSD 4.8</_name>
+    <version>4.8</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.5'/>
+    <derives-from id='http://openbsd.org/openbsd/4.5'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd4.9.xml.in b/data/oses/openbsd/openbsd4.9.xml.in
new file mode 100644
index 0000000..68bc963
--- /dev/null
+++ b/data/oses/openbsd/openbsd4.9.xml.in
@@ -0,0 +1,34 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.9">
+    <short-id>openbsd4.9</short-id>
+    <_name>OpenBSD 4.9</_name>
+    <version>4.9</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.8'/>
+    <derives-from id='http://openbsd.org/openbsd/4.8'/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
+    </devices>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.0.xml.in b/data/oses/openbsd/openbsd5.0.xml.in
new file mode 100644
index 0000000..fedfdda
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.0.xml.in
@@ -0,0 +1,31 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.0">
+    <short-id>openbsd5.0</short-id>
+    <_name>OpenBSD 5.0</_name>
+    <version>5.0</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.9'/>
+    <derives-from id='http://openbsd.org/openbsd/4.9'/>
+
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.1.xml.in b/data/oses/openbsd/openbsd5.1.xml.in
new file mode 100644
index 0000000..1fffa8a
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.1.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.1">
+    <short-id>openbsd5.1</short-id>
+    <_name>OpenBSD 5.1</_name>
+    <version>5.1</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.0'/>
+    <derives-from id='http://openbsd.org/openbsd/5.0'/>
+
+    <release-date>2012-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.1 Install CD</volume-id>
+	<application-id>OpenBSD 5.1 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.1 Install CD</volume-id>
+	<application-id>OpenBSD 5.1 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.2.xml.in b/data/oses/openbsd/openbsd5.2.xml.in
new file mode 100644
index 0000000..d4a4b24
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.2.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.2">
+    <short-id>openbsd5.2</short-id>
+    <_name>OpenBSD 5.2</_name>
+    <version>5.2</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.1'/>
+    <derives-from id='http://openbsd.org/openbsd/5.1'/>
+
+    <release-date>2012-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.2 Install CD</volume-id>
+	<application-id>OpenBSD 5.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.2 Install CD</volume-id>
+	<application-id>OpenBSD 5.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.3.xml.in b/data/oses/openbsd/openbsd5.3.xml.in
new file mode 100644
index 0000000..b23adb4
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.3.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.3">
+    <short-id>openbsd5.3</short-id>
+    <_name>OpenBSD 5.3</_name>
+    <version>5.3</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.2'/>
+    <derives-from id='http://openbsd.org/openbsd/5.2'/>
+
+    <release-date>2013-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.3 Install CD</volume-id>
+	<application-id>OpenBSD 5.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.3 Install CD</volume-id>
+	<application-id>OpenBSD 5.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.4.xml.in b/data/oses/openbsd/openbsd5.4.xml.in
new file mode 100644
index 0000000..525b8d9
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.4.xml.in
@@ -0,0 +1,37 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.4">
+    <short-id>openbsd5.4</short-id>
+    <_name>OpenBSD 5.4</_name>
+    <version>5.4</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.3'/>
+    <derives-from id='http://openbsd.org/openbsd/5.3'/>
+
+    <release-date>2013-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.4 Install CD</volume-id>
+	<application-id>OpenBSD 5.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.4 Install CD</volume-id>
+	<application-id>OpenBSD 5.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.5.xml.in b/data/oses/openbsd/openbsd5.5.xml.in
new file mode 100644
index 0000000..328b8d5
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.5.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.5">
+    <short-id>openbsd5.5</short-id>
+    <_name>OpenBSD 5.5</_name>
+    <version>5.5</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.4'/>
+    <derives-from id='http://openbsd.org/openbsd/5.4'/>
+
+    <release-date>2014-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.5 Install CD</volume-id>
+	<application-id>OpenBSD 5.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.5 Install CD</volume-id>
+	<application-id>OpenBSD 5.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd/openbsd5.6.xml.in b/data/oses/openbsd/openbsd5.6.xml.in
new file mode 100644
index 0000000..57f8b35
--- /dev/null
+++ b/data/oses/openbsd/openbsd5.6.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.6">
+    <short-id>openbsd5.6</short-id>
+    <_name>OpenBSD 5.6</_name>
+    <version>5.6</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.5'/>
+    <derives-from id='http://openbsd.org/openbsd/5.5'/>
+
+    <release-date>2014-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.6 Install CD</volume-id>
+	<application-id>OpenBSD 5.6 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.6 Install CD</volume-id>
+	<application-id>OpenBSD 5.6 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 154e526..5cbab59 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -163,13 +163,25 @@ data/oses/netbsd/netbsd5.1.xml.in
 data/oses/netware/netware4.xml.in
 data/oses/netware/netware5.xml.in
 data/oses/netware/netware6.xml.in
+data/oses/openbsd/openbsd4.2.xml.in
+data/oses/openbsd/openbsd4.3.xml.in
+data/oses/openbsd/openbsd4.4.xml.in
+data/oses/openbsd/openbsd4.5.xml.in
+data/oses/openbsd/openbsd4.8.xml.in
+data/oses/openbsd/openbsd4.9.xml.in
+data/oses/openbsd/openbsd5.0.xml.in
+data/oses/openbsd/openbsd5.1.xml.in
+data/oses/openbsd/openbsd5.2.xml.in
+data/oses/openbsd/openbsd5.3.xml.in
+data/oses/openbsd/openbsd5.4.xml.in
+data/oses/openbsd/openbsd5.5.xml.in
+data/oses/openbsd/openbsd5.6.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
 data/oses/ubuntu.xml.in
-data/oses/openbsd.xml.in
 data/oses/rhl.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:37 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:37 +0100
Subject: [Libosinfo] [PATCH 19/39] data: split opensuse into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-20-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                               |   1 +
 data/oses/Makefile.am                      |   2 +-
 data/oses/opensuse.xml.in                  | 574 -----------------------------
 data/oses/opensuse/Makefile.am             |   1 +
 data/oses/opensuse/opensuse-factory.xml.in |  47 +++
 data/oses/opensuse/opensuse-unknown.xml.in |  47 +++
 data/oses/opensuse/opensuse10.2.xml.in     |  10 +
 data/oses/opensuse/opensuse10.3.xml.in     |  12 +
 data/oses/opensuse/opensuse11.0.xml.in     |  12 +
 data/oses/opensuse/opensuse11.1.xml.in     |  12 +
 data/oses/opensuse/opensuse11.2.xml.in     |  12 +
 data/oses/opensuse/opensuse11.3.xml.in     |  67 ++++
 data/oses/opensuse/opensuse11.4.xml.in     |  67 ++++
 data/oses/opensuse/opensuse12.1.xml.in     |  68 ++++
 data/oses/opensuse/opensuse12.2.xml.in     |  68 ++++
 data/oses/opensuse/opensuse12.3.xml.in     |  48 +++
 data/oses/opensuse/opensuse13.1.xml.in     |  71 ++++
 data/oses/opensuse/opensuse13.2.xml.in     |  35 ++
 po/POTFILES.in                             |  15 +-
 19 files changed, 593 insertions(+), 576 deletions(-)
 delete mode 100644 data/oses/opensuse.xml.in
 create mode 100644 data/oses/opensuse/Makefile.am
 create mode 100644 data/oses/opensuse/opensuse-factory.xml.in
 create mode 100644 data/oses/opensuse/opensuse-unknown.xml.in
 create mode 100644 data/oses/opensuse/opensuse10.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse10.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.0.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse11.4.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.2.xml.in
 create mode 100644 data/oses/opensuse/opensuse12.3.xml.in
 create mode 100644 data/oses/opensuse/opensuse13.1.xml.in
 create mode 100644 data/oses/opensuse/opensuse13.2.xml.in

diff --git a/configure.ac b/configure.ac
index ab192fb..9ed19f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,6 +186,7 @@ AC_CONFIG_FILES([
 	data/oses/netbsd/Makefile
 	data/oses/netware/Makefile
 	data/oses/openbsd/Makefile
+	data/oses/opensuse/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index b4edf42..4799627 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -14,11 +14,11 @@ SUBDIRS = \
 	netbsd \
 	netware \
 	openbsd \
+	opensuse \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	opensuse.xml.in \
 	rhl.xml.in      \
 	rhel.xml.in     \
 	solaris.xml.in  \
diff --git a/data/oses/opensuse.xml.in b/data/oses/opensuse.xml.in
deleted file mode 100644
index d922965..0000000
--- a/data/oses/opensuse.xml.in
+++ /dev/null
@@ -1,574 +0,0 @@
-<!--
-    Find hardware requirements for new releases at
-    http://en.opensuse.org/Hardware_requirements
-  -->
-
-<libosinfo version="0.0.1">
-
-  <os id="http://opensuse.org/opensuse/10.2">
-    <short-id>opensuse10.2</short-id>
-    <_name>openSUSE 10.2</_name>
-    <version>10.2</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/10.3">
-    <short-id>opensuse10.3</short-id>
-    <_name>openSUSE 10.3</_name>
-    <version>10.3</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/10.2" />
-    <derives-from id="http://opensuse.org/opensuse/10.2" />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.0">
-    <short-id>opensuse11.0</short-id>
-    <_name>openSUSE 11.0</_name>
-    <version>11.0</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/10.3" />
-    <derives-from id="http://opensuse.org/opensuse/10.3" />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.1">
-    <short-id>opensuse11.1</short-id>
-    <_name>openSUSE 11.1</_name>
-    <version>11.1</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.0" />
-    <derives-from id="http://opensuse.org/opensuse/11.0" />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.2">
-    <short-id>opensuse11.2</short-id>
-    <_name>openSUSE 11.2</_name>
-    <version>11.2</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.1" />
-    <derives-from id="http://opensuse.org/opensuse/11.1" />
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.3">
-    <short-id>opensuse11.3</short-id>
-    <_name>openSUSE 11.3</_name>
-    <version>11.3</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.2" />
-    <derives-from id="http://opensuse.org/opensuse/11.2" />
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_64.0702..001</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-GNOME-LiveCD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/11.4">
-    <short-id>opensuse11.4</short-id>
-    <_name>openSUSE 11.4</_name>
-    <version>11.4</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.3" />
-    <derives-from id="http://opensuse.org/opensuse/11.3" />
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_640024</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-GNOME-LiveCD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/12.1">
-    <short-id>opensuse12.1</short-id>
-    <_name>openSUSE 12.1</_name>
-    <version>12.1</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/11.4" />
-    <derives-from id="http://opensuse.org/opensuse/11.4" />
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_640039</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-GNOME-LiveCD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/12.2">
-    <short-id>opensuse12.2</short-id>
-    <_name>openSUSE 12.2</_name>
-    <version>12.2</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/12.1" />
-    <derives-from id="http://opensuse.org/opensuse/12.1" />
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-DVD-x86_640167</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-GNOME-LiveCD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE Live CD.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/12.3">
-    <short-id>opensuse12.3</short-id>
-    <_name>openSUSE 12.3</_name>
-    <version>12.3</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/12.2" />
-    <derives-from id="http://opensuse.org/opensuse/12.2" />
-
-    <media arch="i686">
-      <url>http://download.opensuse.org/distribution/12.3/iso/openSUSE-12.3-DVD-i586.iso</url>
-      <iso>
-        <volume-id>openSUSE-12.3-DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/12.3/iso/openSUSE-12.3-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-12.3-DVD-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-    <!-- http://en.opensuse.org/Hardware_requirements -->
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/13.1">
-    <short-id>opensuse13.1</short-id>
-    <_name>openSUSE 13.1</_name>
-    <version>13.1</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/12.3" />
-    <derives-from id="http://opensuse.org/opensuse/12.3" />
-
-    <media arch="i686">
-      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-i586.iso</url>
-      <iso>
-        <volume-id>openSUSE-13.1-DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-13.1-DVD-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-GNOME-Live-i686.iso</url>
-      <iso>
-        <volume-id>openSUSE 13.1 .* Live</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-        <application-id>(0x3a19c523|0x675aadc1)</application-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-GNOME-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE 13.1 .* Live</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-        <application-id>(0x601bf7b2|0xa893698d)</application-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-    <!-- http://en.opensuse.org/Hardware_requirements -->
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/13.2">
-    <short-id>opensuse13.2</short-id>
-    <_name>openSUSE 13.2</_name>
-    <version>13.2</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/13.1" />
-    <derives-from id="http://opensuse.org/opensuse/13.1" />
-
-    <release-date>2014-11-04</release-date>
-
-    <media arch="i686">
-      <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso</url>
-      <iso>
-        <volume-id>openSUSE-13.2-DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso</url>
-      <iso>
-        <volume-id>openSUSE-13.2-DVD-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <!-- Generic entry for future openSUSE releases. Please update the
-       'upgrades', 'derives-from', 'volume-id' and 'resources' nodes
-       accordingly each time you add a new (specific) entry for a new
-       release. -->
-  <os id="http://opensuse.org/opensuse/unknown">
-    <short-id>opensuse-unknown</short-id>
-    <_name>openSUSE</_name>
-    <version>unknown</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/13.2" />
-    <derives-from id="http://opensuse.org/opensuse/13.2" />
-    <release-status>prerelease</release-status>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-    <!-- http://en.opensuse.org/Hardware_requirements -->
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://opensuse.org/opensuse/factory">
-    <short-id>opensuse-factory</short-id>
-    <_name>openSUSE</_name>
-    <version>factory</version>
-    <_vendor>openSUSE</_vendor>
-    <family>linux</family>
-    <distro>opensuse</distro>
-    <upgrades id="http://opensuse.org/opensuse/13.2" />
-    <derives-from id="http://opensuse.org/opensuse/13.2" />
-    <release-status>snapshot</release-status>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>openSUSE-.*-DVD-Snapshot.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>openSUSE-.*-DVD-x86_64-Snapshot.*</volume-id>
-        <system-id>LINUX</system-id>
-        <publisher-id>SUSE LINUX GmbH</publisher-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-    <!-- http://en.opensuse.org/Hardware_requirements -->
-      <minimum>
-        <cpu>500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <cpu>2400000000</cpu>
-        <ram>2147483648</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/opensuse/Makefile.am b/data/oses/opensuse/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/opensuse/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/opensuse/opensuse-factory.xml.in b/data/oses/opensuse/opensuse-factory.xml.in
new file mode 100644
index 0000000..5d81539
--- /dev/null
+++ b/data/oses/opensuse/opensuse-factory.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/factory">
+    <short-id>opensuse-factory</short-id>
+    <_name>openSUSE</_name>
+    <version>factory</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/13.2" />
+    <derives-from id="http://opensuse.org/opensuse/13.2" />
+    <release-status>snapshot</release-status>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>openSUSE-.*-DVD-Snapshot.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>openSUSE-.*-DVD-x86_64-Snapshot.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+    <!-- http://en.opensuse.org/Hardware_requirements -->
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse-unknown.xml.in b/data/oses/opensuse/opensuse-unknown.xml.in
new file mode 100644
index 0000000..79a8cd1
--- /dev/null
+++ b/data/oses/opensuse/opensuse-unknown.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/unknown">
+    <short-id>opensuse-unknown</short-id>
+    <_name>openSUSE</_name>
+    <version>unknown</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/13.2" />
+    <derives-from id="http://opensuse.org/opensuse/13.2" />
+    <release-status>prerelease</release-status>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>openSUSE-([1-9][4-9]\.[0-9]+|13\.[3-9])-DVD-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+    <!-- http://en.opensuse.org/Hardware_requirements -->
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse10.2.xml.in b/data/oses/opensuse/opensuse10.2.xml.in
new file mode 100644
index 0000000..c19c299
--- /dev/null
+++ b/data/oses/opensuse/opensuse10.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/10.2">
+    <short-id>opensuse10.2</short-id>
+    <_name>openSUSE 10.2</_name>
+    <version>10.2</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse10.3.xml.in b/data/oses/opensuse/opensuse10.3.xml.in
new file mode 100644
index 0000000..0d12a63
--- /dev/null
+++ b/data/oses/opensuse/opensuse10.3.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/10.3">
+    <short-id>opensuse10.3</short-id>
+    <_name>openSUSE 10.3</_name>
+    <version>10.3</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/10.2" />
+    <derives-from id="http://opensuse.org/opensuse/10.2" />
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse11.0.xml.in b/data/oses/opensuse/opensuse11.0.xml.in
new file mode 100644
index 0000000..6a4be33
--- /dev/null
+++ b/data/oses/opensuse/opensuse11.0.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/11.0">
+    <short-id>opensuse11.0</short-id>
+    <_name>openSUSE 11.0</_name>
+    <version>11.0</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/10.3" />
+    <derives-from id="http://opensuse.org/opensuse/10.3" />
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse11.1.xml.in b/data/oses/opensuse/opensuse11.1.xml.in
new file mode 100644
index 0000000..dd06101
--- /dev/null
+++ b/data/oses/opensuse/opensuse11.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/11.1">
+    <short-id>opensuse11.1</short-id>
+    <_name>openSUSE 11.1</_name>
+    <version>11.1</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.0" />
+    <derives-from id="http://opensuse.org/opensuse/11.0" />
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse11.2.xml.in b/data/oses/opensuse/opensuse11.2.xml.in
new file mode 100644
index 0000000..8269234
--- /dev/null
+++ b/data/oses/opensuse/opensuse11.2.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/11.2">
+    <short-id>opensuse11.2</short-id>
+    <_name>openSUSE 11.2</_name>
+    <version>11.2</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.1" />
+    <derives-from id="http://opensuse.org/opensuse/11.1" />
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse11.3.xml.in b/data/oses/opensuse/opensuse11.3.xml.in
new file mode 100644
index 0000000..d4ad203
--- /dev/null
+++ b/data/oses/opensuse/opensuse11.3.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/11.3">
+    <short-id>opensuse11.3</short-id>
+    <_name>openSUSE 11.3</_name>
+    <version>11.3</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.2" />
+    <derives-from id="http://opensuse.org/opensuse/11.2" />
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_64.0702..001</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-GNOME-LiveCD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse11.4.xml.in b/data/oses/opensuse/opensuse11.4.xml.in
new file mode 100644
index 0000000..53d2bb9
--- /dev/null
+++ b/data/oses/opensuse/opensuse11.4.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/11.4">
+    <short-id>opensuse11.4</short-id>
+    <_name>openSUSE 11.4</_name>
+    <version>11.4</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.3" />
+    <derives-from id="http://opensuse.org/opensuse/11.3" />
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_640024</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-GNOME-LiveCD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse12.1.xml.in b/data/oses/opensuse/opensuse12.1.xml.in
new file mode 100644
index 0000000..70f2157
--- /dev/null
+++ b/data/oses/opensuse/opensuse12.1.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/12.1">
+    <short-id>opensuse12.1</short-id>
+    <_name>openSUSE 12.1</_name>
+    <version>12.1</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/11.4" />
+    <derives-from id="http://opensuse.org/opensuse/11.4" />
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_640039</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-GNOME-LiveCD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse12.2.xml.in b/data/oses/opensuse/opensuse12.2.xml.in
new file mode 100644
index 0000000..88b9bb7
--- /dev/null
+++ b/data/oses/opensuse/opensuse12.2.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/12.2">
+    <short-id>opensuse12.2</short-id>
+    <_name>openSUSE 12.2</_name>
+    <version>12.2</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/12.1" />
+    <derives-from id="http://opensuse.org/opensuse/12.1" />
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-DVD-x86_640167</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.opensuse.org/distribution/12.2/iso/openSUSE-12.2-GNOME-LiveCD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE Live CD.*</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse12.3.xml.in b/data/oses/opensuse/opensuse12.3.xml.in
new file mode 100644
index 0000000..8cdfc21
--- /dev/null
+++ b/data/oses/opensuse/opensuse12.3.xml.in
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/12.3">
+    <short-id>opensuse12.3</short-id>
+    <_name>openSUSE 12.3</_name>
+    <version>12.3</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/12.2" />
+    <derives-from id="http://opensuse.org/opensuse/12.2" />
+
+    <media arch="i686">
+      <url>http://download.opensuse.org/distribution/12.3/iso/openSUSE-12.3-DVD-i586.iso</url>
+      <iso>
+        <volume-id>openSUSE-12.3-DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/12.3/iso/openSUSE-12.3-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-12.3-DVD-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+    <!-- http://en.opensuse.org/Hardware_requirements -->
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse13.1.xml.in b/data/oses/opensuse/opensuse13.1.xml.in
new file mode 100644
index 0000000..54d2ca6
--- /dev/null
+++ b/data/oses/opensuse/opensuse13.1.xml.in
@@ -0,0 +1,71 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/13.1">
+    <short-id>opensuse13.1</short-id>
+    <_name>openSUSE 13.1</_name>
+    <version>13.1</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/12.3" />
+    <derives-from id="http://opensuse.org/opensuse/12.3" />
+
+    <media arch="i686">
+      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-i586.iso</url>
+      <iso>
+        <volume-id>openSUSE-13.1-DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-13.1-DVD-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-GNOME-Live-i686.iso</url>
+      <iso>
+        <volume-id>openSUSE 13.1 .* Live</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+        <application-id>(0x3a19c523|0x675aadc1)</application-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.opensuse.org/distribution/13.1/iso/openSUSE-13.1-GNOME-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE 13.1 .* Live</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+        <application-id>(0x601bf7b2|0xa893698d)</application-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+    <!-- http://en.opensuse.org/Hardware_requirements -->
+      <minimum>
+        <cpu>500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/opensuse/opensuse13.2.xml.in b/data/oses/opensuse/opensuse13.2.xml.in
new file mode 100644
index 0000000..be35766
--- /dev/null
+++ b/data/oses/opensuse/opensuse13.2.xml.in
@@ -0,0 +1,35 @@
+<libosinfo version="0.0.1">
+  <os id="http://opensuse.org/opensuse/13.2">
+    <short-id>opensuse13.2</short-id>
+    <_name>openSUSE 13.2</_name>
+    <version>13.2</version>
+    <_vendor>openSUSE</_vendor>
+    <family>linux</family>
+    <distro>opensuse</distro>
+    <upgrades id="http://opensuse.org/opensuse/13.1" />
+    <derives-from id="http://opensuse.org/opensuse/13.1" />
+
+    <release-date>2014-11-04</release-date>
+
+    <media arch="i686">
+      <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-i586.iso</url>
+      <iso>
+        <volume-id>openSUSE-13.2-DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.opensuse.org/distribution/13.2/iso/openSUSE-13.2-DVD-x86_64.iso</url>
+      <iso>
+        <volume-id>openSUSE-13.2-DVD-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <publisher-id>SUSE LINUX GmbH</publisher-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cbab59..b15fca2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -176,11 +176,24 @@ data/oses/openbsd/openbsd5.3.xml.in
 data/oses/openbsd/openbsd5.4.xml.in
 data/oses/openbsd/openbsd5.5.xml.in
 data/oses/openbsd/openbsd5.6.xml.in
+data/oses/opensuse/opensuse10.2.xml.in
+data/oses/opensuse/opensuse10.3.xml.in
+data/oses/opensuse/opensuse11.0.xml.in
+data/oses/opensuse/opensuse11.1.xml.in
+data/oses/opensuse/opensuse11.2.xml.in
+data/oses/opensuse/opensuse11.3.xml.in
+data/oses/opensuse/opensuse11.4.xml.in
+data/oses/opensuse/opensuse12.1.xml.in
+data/oses/opensuse/opensuse12.2.xml.in
+data/oses/opensuse/opensuse12.3.xml.in
+data/oses/opensuse/opensuse13.1.xml.in
+data/oses/opensuse/opensuse13.2.xml.in
+data/oses/opensuse/opensuse-factory.xml.in
+data/oses/opensuse/opensuse-unknown.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
-data/oses/opensuse.xml.in
 data/oses/ubuntu.xml.in
 data/oses/rhl.xml.in
 data/devices/qemu-ps2.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:38 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:38 +0100
Subject: [Libosinfo] [PATCH 20/39] data: split rhel into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-21-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                          |    1 +
 data/oses/Makefile.am                 |    2 +-
 data/oses/rhel.xml.in                 | 1344 ---------------------------------
 data/oses/rhel/Makefile.am            |    1 +
 data/oses/rhel/rhel-atomic-7.0.xml.in |   43 ++
 data/oses/rhel/rhel-atomic-7.1.xml.in |   49 ++
 data/oses/rhel/rhel2.1.1.xml.in       |   16 +
 data/oses/rhel/rhel2.1.2.xml.in       |   16 +
 data/oses/rhel/rhel2.1.3.xml.in       |   16 +
 data/oses/rhel/rhel2.1.4.xml.in       |   16 +
 data/oses/rhel/rhel2.1.5.xml.in       |   16 +
 data/oses/rhel/rhel2.1.6.xml.in       |   16 +
 data/oses/rhel/rhel2.1.7.xml.in       |   16 +
 data/oses/rhel/rhel2.1.xml.in         |   14 +
 data/oses/rhel/rhel3.1.xml.in         |   16 +
 data/oses/rhel/rhel3.2.xml.in         |   16 +
 data/oses/rhel/rhel3.3.xml.in         |   16 +
 data/oses/rhel/rhel3.4.xml.in         |   16 +
 data/oses/rhel/rhel3.5.xml.in         |   16 +
 data/oses/rhel/rhel3.6.xml.in         |   16 +
 data/oses/rhel/rhel3.7.xml.in         |   16 +
 data/oses/rhel/rhel3.8.xml.in         |   16 +
 data/oses/rhel/rhel3.9.xml.in         |   16 +
 data/oses/rhel/rhel3.xml.in           |   14 +
 data/oses/rhel/rhel4.0.xml.in         |   14 +
 data/oses/rhel/rhel4.1.xml.in         |   16 +
 data/oses/rhel/rhel4.2.xml.in         |   16 +
 data/oses/rhel/rhel4.3.xml.in         |   16 +
 data/oses/rhel/rhel4.4.xml.in         |   16 +
 data/oses/rhel/rhel4.5.xml.in         |   16 +
 data/oses/rhel/rhel4.6.xml.in         |   16 +
 data/oses/rhel/rhel4.7.xml.in         |   16 +
 data/oses/rhel/rhel4.8.xml.in         |   29 +
 data/oses/rhel/rhel4.9.xml.in         |   29 +
 data/oses/rhel/rhel5.0.xml.in         |   14 +
 data/oses/rhel/rhel5.1.xml.in         |   16 +
 data/oses/rhel/rhel5.10.xml.in        |   29 +
 data/oses/rhel/rhel5.11.xml.in        |   29 +
 data/oses/rhel/rhel5.2.xml.in         |   16 +
 data/oses/rhel/rhel5.3.xml.in         |   16 +
 data/oses/rhel/rhel5.4.xml.in         |   29 +
 data/oses/rhel/rhel5.5.xml.in         |   29 +
 data/oses/rhel/rhel5.6.xml.in         |   34 +
 data/oses/rhel/rhel5.7.xml.in         |   29 +
 data/oses/rhel/rhel5.8.xml.in         |   29 +
 data/oses/rhel/rhel5.9.xml.in         |   29 +
 data/oses/rhel/rhel6.0.xml.in         |   55 ++
 data/oses/rhel/rhel6.1.xml.in         |   51 ++
 data/oses/rhel/rhel6.2.xml.in         |   51 ++
 data/oses/rhel/rhel6.3.xml.in         |   51 ++
 data/oses/rhel/rhel6.4.xml.in         |   51 ++
 data/oses/rhel/rhel6.5.xml.in         |   51 ++
 data/oses/rhel/rhel6.6.xml.in         |   51 ++
 data/oses/rhel/rhel7.0.xml.in         |   80 ++
 data/oses/rhel/rhel7.1.xml.in         |   73 ++
 po/POTFILES.in                        |   52 +-
 56 files changed, 1427 insertions(+), 1346 deletions(-)
 delete mode 100644 data/oses/rhel.xml.in
 create mode 100644 data/oses/rhel/Makefile.am
 create mode 100644 data/oses/rhel/rhel-atomic-7.0.xml.in
 create mode 100644 data/oses/rhel/rhel-atomic-7.1.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.1.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.2.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.3.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.4.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.5.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.6.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.7.xml.in
 create mode 100644 data/oses/rhel/rhel2.1.xml.in
 create mode 100644 data/oses/rhel/rhel3.1.xml.in
 create mode 100644 data/oses/rhel/rhel3.2.xml.in
 create mode 100644 data/oses/rhel/rhel3.3.xml.in
 create mode 100644 data/oses/rhel/rhel3.4.xml.in
 create mode 100644 data/oses/rhel/rhel3.5.xml.in
 create mode 100644 data/oses/rhel/rhel3.6.xml.in
 create mode 100644 data/oses/rhel/rhel3.7.xml.in
 create mode 100644 data/oses/rhel/rhel3.8.xml.in
 create mode 100644 data/oses/rhel/rhel3.9.xml.in
 create mode 100644 data/oses/rhel/rhel3.xml.in
 create mode 100644 data/oses/rhel/rhel4.0.xml.in
 create mode 100644 data/oses/rhel/rhel4.1.xml.in
 create mode 100644 data/oses/rhel/rhel4.2.xml.in
 create mode 100644 data/oses/rhel/rhel4.3.xml.in
 create mode 100644 data/oses/rhel/rhel4.4.xml.in
 create mode 100644 data/oses/rhel/rhel4.5.xml.in
 create mode 100644 data/oses/rhel/rhel4.6.xml.in
 create mode 100644 data/oses/rhel/rhel4.7.xml.in
 create mode 100644 data/oses/rhel/rhel4.8.xml.in
 create mode 100644 data/oses/rhel/rhel4.9.xml.in
 create mode 100644 data/oses/rhel/rhel5.0.xml.in
 create mode 100644 data/oses/rhel/rhel5.1.xml.in
 create mode 100644 data/oses/rhel/rhel5.10.xml.in
 create mode 100644 data/oses/rhel/rhel5.11.xml.in
 create mode 100644 data/oses/rhel/rhel5.2.xml.in
 create mode 100644 data/oses/rhel/rhel5.3.xml.in
 create mode 100644 data/oses/rhel/rhel5.4.xml.in
 create mode 100644 data/oses/rhel/rhel5.5.xml.in
 create mode 100644 data/oses/rhel/rhel5.6.xml.in
 create mode 100644 data/oses/rhel/rhel5.7.xml.in
 create mode 100644 data/oses/rhel/rhel5.8.xml.in
 create mode 100644 data/oses/rhel/rhel5.9.xml.in
 create mode 100644 data/oses/rhel/rhel6.0.xml.in
 create mode 100644 data/oses/rhel/rhel6.1.xml.in
 create mode 100644 data/oses/rhel/rhel6.2.xml.in
 create mode 100644 data/oses/rhel/rhel6.3.xml.in
 create mode 100644 data/oses/rhel/rhel6.4.xml.in
 create mode 100644 data/oses/rhel/rhel6.5.xml.in
 create mode 100644 data/oses/rhel/rhel6.6.xml.in
 create mode 100644 data/oses/rhel/rhel7.0.xml.in
 create mode 100644 data/oses/rhel/rhel7.1.xml.in

diff --git a/configure.ac b/configure.ac
index 9ed19f7..5d89444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,6 +187,7 @@ AC_CONFIG_FILES([
 	data/oses/netware/Makefile
 	data/oses/openbsd/Makefile
 	data/oses/opensuse/Makefile
+	data/oses/rhel/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 4799627..dd91a42 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -15,12 +15,12 @@ SUBDIRS = \
 	netware \
 	openbsd \
 	opensuse \
+	rhel \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
 	rhl.xml.in      \
-	rhel.xml.in     \
 	solaris.xml.in  \
 	suse.xml.in     \
 	ubuntu.xml.in   \
diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
deleted file mode 100644
index 8bfbbcd..0000000
--- a/data/oses/rhel.xml.in
+++ /dev/null
@@ -1,1344 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <!-- RHEL-2.1 Pensacola -->
-
-  <os id="http://redhat.com/rhel/2.1">
-    <short-id>rhel2.1</short-id>
-    <_name>Red Hat Enterprise Linux 2.1</_name>
-    <version>2.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-
-    <release-date>2002-03-26</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.1">
-    <short-id>rhel2.1.1</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 1</_name>
-    <version>2.1.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1"/>
-    <derives-from id="http://redhat.com/rhel/2.1"/>
-
-    <release-date>2003-02-14</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.2">
-    <short-id>rhel2.1.2</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 2</_name>
-    <version>2.1.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.1"/>
-    <derives-from id="http://redhat.com/rhel/2.1.1"/>
-
-    <release-date>2003-05-02</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.3">
-    <short-id>rhel2.1.3</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 3</_name>
-    <version>2.1.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.2"/>
-    <derives-from id="http://redhat.com/rhel/2.1.2"/>
-
-    <release-date>2003-12-19</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.4">
-    <short-id>rhel2.1.4</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 4</_name>
-    <version>2.1.4</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.3"/>
-    <derives-from id="http://redhat.com/rhel/2.1.3"/>
-
-    <release-date>2004-04-30</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.5">
-    <short-id>rhel2.1.5</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 5</_name>
-    <version>2.1.5</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.4"/>
-    <derives-from id="http://redhat.com/rhel/2.1.4"/>
-
-    <release-date>2004-08-18</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.6">
-    <short-id>rhel2.1.6</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 6</_name>
-    <version>2.1.6</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.5"/>
-    <derives-from id="http://redhat.com/rhel/2.1.5"/>
-
-    <release-date>2004-12-13</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/2.1.7">
-    <short-id>rhel2.1.7</short-id>
-    <_name>Red Hat Enterprise Linux 2.1 Update 7</_name>
-    <version>2.1.7</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Pensacola</codename>
-    <upgrades id="http://redhat.com/rhel/2.1.6"/>
-    <derives-from id="http://redhat.com/rhel/2.1.6"/>
-
-    <release-date>2005-04-28</release-date>
-    <eol-date>2009-05-31</eol-date>
-  </os>
-
-
-
-  <!-- RHEL-3 Taroon -->
-
-  <os id="http://redhat.com/rhel/3">
-    <short-id>rhel3</short-id>
-    <_name>Red Hat Enterprise Linux 3</_name>
-    <version>3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2003-10-22</release-date>
-    <eol-date>2014-01-30</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.1">
-    <short-id>rhel3.1</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 1</_name>
-    <version>3.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-01-16</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3"/>
-    <derives-from id="http://redhat.com/rhel/3"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.2">
-    <short-id>rhel3.2</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 2</_name>
-    <version>3.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-05-18</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.1"/>
-    <derives-from id="http://redhat.com/rhel/3.1"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.3">
-    <short-id>rhel3.3</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 3</_name>
-    <version>3.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-09-03</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.2"/>
-    <derives-from id="http://redhat.com/rhel/3.2"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.4">
-    <short-id>rhel3.4</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 4</_name>
-    <version>3.4</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2004-12-21</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.3"/>
-    <derives-from id="http://redhat.com/rhel/3.3"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.5">
-    <short-id>rhel3.5</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 5</_name>
-    <version>3.5</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2005-05-20</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.4"/>
-    <derives-from id="http://redhat.com/rhel/3.4"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.6">
-    <short-id>rhel3.6</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 6</_name>
-    <version>3.6</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2005-09-28</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.5"/>
-    <derives-from id="http://redhat.com/rhel/3.5"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.7">
-    <short-id>rhel3.7</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 7</_name>
-    <version>3.7</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2006-03-15</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.6"/>
-    <derives-from id="http://redhat.com/rhel/3.6"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.8">
-    <short-id>rhel3.8</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 8</_name>
-    <version>3.8</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2006-07-20</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.7"/>
-    <derives-from id="http://redhat.com/rhel/3.7"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/3.9">
-    <short-id>rhel3.9</short-id>
-    <_name>Red Hat Enterprise Linux 3 Update 9</_name>
-    <version>3.9</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Taroon</codename>
-
-    <release-date>2007-06-15</release-date>
-    <eol-date>2014-01-30</eol-date>
-    <upgrades id="http://redhat.com/rhel/3.8"/>
-    <derives-from id="http://redhat.com/rhel/3.8"/>
-  </os>
-
-
-
-  <!-- RHEL-4 Nahant -->
-
-  <os id="http://redhat.com/rhel/4.0">
-    <short-id>rhel4.0</short-id>
-    <_name>Red Hat Enterprise Linux 4.0</_name>
-    <version>4.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-
-    <release-date>2005-02-15</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.1">
-    <short-id>rhel4.1</short-id>
-    <_name>Red Hat Enterprise Linux 4.1</_name>
-    <version>4.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.0"/>
-    <derives-from id="http://redhat.com/rhel/4.0"/>
-
-    <release-date>2005-06-09</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.2">
-    <short-id>rhel4.2</short-id>
-    <_name>Red Hat Enterprise Linux 4.2</_name>
-    <version>4.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.1"/>
-    <derives-from id="http://redhat.com/rhel/4.1"/>
-
-    <release-date>2005-10-05</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.3">
-    <short-id>rhel4.3</short-id>
-    <_name>Red Hat Enterprise Linux 4.3</_name>
-    <version>4.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.2"/>
-    <derives-from id="http://redhat.com/rhel/4.2"/>
-
-    <release-date>2006-03-07</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.4">
-    <short-id>rhel4.4</short-id>
-    <_name>Red Hat Enterprise Linux 4.4</_name>
-    <version>4.4</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.3"/>
-    <derives-from id="http://redhat.com/rhel/4.3"/>
-
-    <release-date>2006-08-11</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.5">
-    <short-id>rhel4.5</short-id>
-    <_name>Red Hat Enterprise Linux 4.5</_name>
-    <version>4.5</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.4"/>
-    <derives-from id="http://redhat.com/rhel/4.4"/>
-
-    <release-date>2007-05-01</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.6">
-    <short-id>rhel4.6</short-id>
-    <_name>Red Hat Enterprise Linux 4.6</_name>
-    <version>4.6</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.5"/>
-    <derives-from id="http://redhat.com/rhel/4.5"/>
-
-    <release-date>2007-11-15</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.7">
-    <short-id>rhel4.7</short-id>
-    <_name>Red Hat Enterprise Linux 4.7</_name>
-    <version>4.7</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.6"/>
-    <derives-from id="http://redhat.com/rhel/4.6"/>
-
-    <release-date>2008-07-24</release-date>
-    <eol-date>2015-02-28</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.8">
-    <short-id>rhel4.8</short-id>
-    <_name>Red Hat Enterprise Linux 4.8</_name>
-    <version>4.8</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.7"/>
-    <derives-from id="http://redhat.com/rhel/4.7"/>
-
-    <release-date>2009-05-18</release-date>
-    <eol-date>2015-02-28</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/4-U8 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/4-U8 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.9">
-    <short-id>rhel4.9</short-id>
-    <_name>Red Hat Enterprise Linux 4.9</_name>
-    <version>4.9</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Nahant</codename>
-    <upgrades id="http://redhat.com/rhel/4.8"/>
-    <derives-from id="http://redhat.com/rhel/4.8"/>
-
-    <release-date>2011-02-16</release-date>
-    <eol-date>2015-02-28</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_4.9 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_4.9 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-
-
-  <!-- RHEL-5 Tikanga -->
-
-  <os id="http://redhat.com/rhel/5.0">
-    <short-id>rhel5.0</short-id>
-    <_name>Red Hat Enterprise Linux 5.0</_name>
-    <version>5.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-
-    <release-date>2007-03-14</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-
-  <os id="http://redhat.com/rhel/5.1">
-    <short-id>rhel5.1</short-id>
-    <_name>Red Hat Enterprise Linux 5.1</_name>
-    <version>5.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.0"/>
-    <derives-from id="http://redhat.com/rhel/5.0"/>
-
-    <release-date>2007-11-07</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.2">
-    <short-id>rhel5.2</short-id>
-    <_name>Red Hat Enterprise Linux 5.2</_name>
-    <version>5.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.1"/>
-    <derives-from id="http://redhat.com/rhel/5.1"/>
-
-    <release-date>2008-05-21</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.3">
-    <short-id>rhel5.3</short-id>
-    <_name>Red Hat Enterprise Linux 5.3</_name>
-    <version>5.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.2"/>
-    <derives-from id="http://redhat.com/rhel/5.2"/>
-
-    <release-date>2009-01-20</release-date>
-    <eol-date>2020-03-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.4">
-    <short-id>rhel5.4</short-id>
-    <_name>Red Hat Enterprise Linux 5.4</_name>
-    <version>5.4</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.3"/>
-    <derives-from id="http://redhat.com/rhel/5.3"/>
-
-    <release-date>2009-09-02</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.4 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.4 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.5">
-    <short-id>rhel5.5</short-id>
-    <_name>Red Hat Enterprise Linux 5.5</_name>
-    <version>5.5</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.4"/>
-    <derives-from id="http://redhat.com/rhel/5.4"/>
-
-    <release-date>2010-03-30</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.5 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.5 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.6">
-    <short-id>rhel5.6</short-id>
-    <_name>Red Hat Enterprise Linux 5.6</_name>
-    <version>5.6</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.5"/>
-    <derives-from id="http://redhat.com/rhel/5.5"/>
-
-    <release-date>2011-01-12</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.6 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.6 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.7">
-    <short-id>rhel5.7</short-id>
-    <_name>Red Hat Enterprise Linux 5.7</_name>
-    <version>5.7</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.6"/>
-    <derives-from id="http://redhat.com/rhel/5.6"/>
-
-    <release-date>2011-07-21</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.7 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.7 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.8">
-    <short-id>rhel5.8</short-id>
-    <_name>Red Hat Enterprise Linux 5.8</_name>
-    <version>5.8</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <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>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.8 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.8 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.9">
-    <short-id>rhel5.9</short-id>
-    <_name>Red Hat Enterprise Linux 5.9</_name>
-    <version>5.9</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <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"/>
-
-    <release-date>2013-01-07</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.9 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.9 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.10">
-    <short-id>rhel5.10</short-id>
-    <_name>Red Hat Enterprise Linux 5.10</_name>
-    <version>5.10</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.9"/>
-    <derives-from id="http://redhat.com/rhel/5.9"/>
-
-    <release-date>2013-10-01</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.10 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.10 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.11">
-    <short-id>rhel5.11</short-id>
-    <_name>Red Hat Enterprise Linux 5.11</_name>
-    <version>5.11</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Tikanga</codename>
-    <upgrades id="http://redhat.com/rhel/5.10"/>
-    <derives-from id="http://redhat.com/rhel/5.10"/>
-
-    <release-date>2014-09-16</release-date>
-    <eol-date>2020-03-31</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.11 i386.*</volume-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL/5.11 x86_64.*</volume-id>
-      </iso>
-    </media>
-  </os>
-
-  <!-- RHEL-6 Santiago -->
-
-  <os id="http://redhat.com/rhel/6.0">
-    <short-id>rhel6.0</short-id>
-    <_name>Red Hat Enterprise Linux 6.0</_name>
-    <version>6.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-
-    <release-date>2010-11-10</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.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_6.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>
-        <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>
-
-  <os id="http://redhat.com/rhel/6.1">
-    <short-id>rhel6.1</short-id>
-    <_name>Red Hat Enterprise Linux 6.1</_name>
-    <version>6.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.0"/>
-    <derives-from id="http://redhat.com/rhel/6.0"/>
-
-    <release-date>2011-05-19</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.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_6.1 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>
-
-  <os id="http://redhat.com/rhel/6.2">
-    <short-id>rhel6.2</short-id>
-    <_name>Red Hat Enterprise Linux 6.2</_name>
-    <version>6.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.1"/>
-    <derives-from id="http://redhat.com/rhel/6.1"/>
-
-    <release-date>2011-12-06</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.2 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.2 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>
-
-  <os id="http://redhat.com/rhel/6.3">
-    <short-id>rhel6.3</short-id>
-    <_name>Red Hat Enterprise Linux 6.3</_name>
-    <version>6.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.2"/>
-    <derives-from id="http://redhat.com/rhel/6.2"/>
-
-    <release-date>2012-06-21</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.3 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.3 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>
-
-  <os id="http://redhat.com/rhel/6.4">
-    <short-id>rhel6.4</short-id>
-    <_name>Red Hat Enterprise Linux 6.4</_name>
-    <version>6.4</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.3"/>
-    <derives-from id="http://redhat.com/rhel/6.3"/>
-
-    <release-date>2013-02-21</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*RHEL_6.4 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.4 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>
-
-  <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>
-
-  <os id="http://redhat.com/rhel/6.6">
-    <short-id>rhel6.6</short-id>
-    <_name>Red Hat Enterprise Linux 6.6</_name>
-    <version>6.6</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <codename>Santiago</codename>
-    <upgrades id="http://redhat.com/rhel/6.5"/>
-    <derives-from id="http://redhat.com/rhel/6.5"/>
-
-    <release-date>2014-10-14</release-date>
-    <eol-date>2023-11-30</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>RHEL-6.6 .*.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.6 .*.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>
-
-    <media arch="aarch64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>RHELSA-1.5 Server\.aarch64</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.0">
-    <short-id>rhel-atomic-7.0</short-id>
-    <_name>Red Hat Enterprise Linux Atomic Host 7.0</_name>
-    <version>7.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhel</distro>
-    <derives-from id="http://redhat.com/rhel/7.0"/>
-
-    <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="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>RHEL.*Atomic.*7 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>
-  </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>
-
-    <media arch="aarch64">
-       <iso>
-         <system-id>LINUX</system-id>
-         <volume-id>RHELSA-7.1.*aarch64</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/data/oses/rhel/Makefile.am b/data/oses/rhel/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/rhel/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/rhel/rhel-atomic-7.0.xml.in b/data/oses/rhel/rhel-atomic-7.0.xml.in
new file mode 100644
index 0000000..a300332
--- /dev/null
+++ b/data/oses/rhel/rhel-atomic-7.0.xml.in
@@ -0,0 +1,43 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel-atomic/7.0">
+    <short-id>rhel-atomic-7.0</short-id>
+    <_name>Red Hat Enterprise Linux Atomic Host 7.0</_name>
+    <version>7.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <derives-from id="http://redhat.com/rhel/7.0"/>
+
+    <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="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHEL.*Atomic.*7 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>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel-atomic-7.1.xml.in b/data/oses/rhel/rhel-atomic-7.1.xml.in
new file mode 100644
index 0000000..2ec8179
--- /dev/null
+++ b/data/oses/rhel/rhel-atomic-7.1.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <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/data/oses/rhel/rhel2.1.1.xml.in b/data/oses/rhel/rhel2.1.1.xml.in
new file mode 100644
index 0000000..d665847
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.1">
+    <short-id>rhel2.1.1</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 1</_name>
+    <version>2.1.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1"/>
+    <derives-from id="http://redhat.com/rhel/2.1"/>
+
+    <release-date>2003-02-14</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.2.xml.in b/data/oses/rhel/rhel2.1.2.xml.in
new file mode 100644
index 0000000..33f1f9f
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.2">
+    <short-id>rhel2.1.2</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 2</_name>
+    <version>2.1.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.1"/>
+    <derives-from id="http://redhat.com/rhel/2.1.1"/>
+
+    <release-date>2003-05-02</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.3.xml.in b/data/oses/rhel/rhel2.1.3.xml.in
new file mode 100644
index 0000000..8056bd7
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.3">
+    <short-id>rhel2.1.3</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 3</_name>
+    <version>2.1.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.2"/>
+    <derives-from id="http://redhat.com/rhel/2.1.2"/>
+
+    <release-date>2003-12-19</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.4.xml.in b/data/oses/rhel/rhel2.1.4.xml.in
new file mode 100644
index 0000000..89b81e5
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.4.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.4">
+    <short-id>rhel2.1.4</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 4</_name>
+    <version>2.1.4</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.3"/>
+    <derives-from id="http://redhat.com/rhel/2.1.3"/>
+
+    <release-date>2004-04-30</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.5.xml.in b/data/oses/rhel/rhel2.1.5.xml.in
new file mode 100644
index 0000000..2eb4679
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.5.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.5">
+    <short-id>rhel2.1.5</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 5</_name>
+    <version>2.1.5</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.4"/>
+    <derives-from id="http://redhat.com/rhel/2.1.4"/>
+
+    <release-date>2004-08-18</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.6.xml.in b/data/oses/rhel/rhel2.1.6.xml.in
new file mode 100644
index 0000000..0ecf587
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.6.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.6">
+    <short-id>rhel2.1.6</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 6</_name>
+    <version>2.1.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.5"/>
+    <derives-from id="http://redhat.com/rhel/2.1.5"/>
+
+    <release-date>2004-12-13</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.7.xml.in b/data/oses/rhel/rhel2.1.7.xml.in
new file mode 100644
index 0000000..ecb819d
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.7.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1.7">
+    <short-id>rhel2.1.7</short-id>
+    <_name>Red Hat Enterprise Linux 2.1 Update 7</_name>
+    <version>2.1.7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+    <upgrades id="http://redhat.com/rhel/2.1.6"/>
+    <derives-from id="http://redhat.com/rhel/2.1.6"/>
+
+    <release-date>2005-04-28</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel2.1.xml.in b/data/oses/rhel/rhel2.1.xml.in
new file mode 100644
index 0000000..217923d
--- /dev/null
+++ b/data/oses/rhel/rhel2.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/2.1">
+    <short-id>rhel2.1</short-id>
+    <_name>Red Hat Enterprise Linux 2.1</_name>
+    <version>2.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Pensacola</codename>
+
+    <release-date>2002-03-26</release-date>
+    <eol-date>2009-05-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.1.xml.in b/data/oses/rhel/rhel3.1.xml.in
new file mode 100644
index 0000000..f9b8cd3
--- /dev/null
+++ b/data/oses/rhel/rhel3.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.1">
+    <short-id>rhel3.1</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 1</_name>
+    <version>3.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-01-16</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3"/>
+    <derives-from id="http://redhat.com/rhel/3"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.2.xml.in b/data/oses/rhel/rhel3.2.xml.in
new file mode 100644
index 0000000..19e84cf
--- /dev/null
+++ b/data/oses/rhel/rhel3.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.2">
+    <short-id>rhel3.2</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 2</_name>
+    <version>3.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-05-18</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.1"/>
+    <derives-from id="http://redhat.com/rhel/3.1"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.3.xml.in b/data/oses/rhel/rhel3.3.xml.in
new file mode 100644
index 0000000..9440858
--- /dev/null
+++ b/data/oses/rhel/rhel3.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.3">
+    <short-id>rhel3.3</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 3</_name>
+    <version>3.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-09-03</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.2"/>
+    <derives-from id="http://redhat.com/rhel/3.2"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.4.xml.in b/data/oses/rhel/rhel3.4.xml.in
new file mode 100644
index 0000000..2b1f34b
--- /dev/null
+++ b/data/oses/rhel/rhel3.4.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.4">
+    <short-id>rhel3.4</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 4</_name>
+    <version>3.4</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2004-12-21</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.3"/>
+    <derives-from id="http://redhat.com/rhel/3.3"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.5.xml.in b/data/oses/rhel/rhel3.5.xml.in
new file mode 100644
index 0000000..dc858d3
--- /dev/null
+++ b/data/oses/rhel/rhel3.5.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.5">
+    <short-id>rhel3.5</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 5</_name>
+    <version>3.5</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2005-05-20</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.4"/>
+    <derives-from id="http://redhat.com/rhel/3.4"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.6.xml.in b/data/oses/rhel/rhel3.6.xml.in
new file mode 100644
index 0000000..388c2ae
--- /dev/null
+++ b/data/oses/rhel/rhel3.6.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.6">
+    <short-id>rhel3.6</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 6</_name>
+    <version>3.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2005-09-28</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.5"/>
+    <derives-from id="http://redhat.com/rhel/3.5"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.7.xml.in b/data/oses/rhel/rhel3.7.xml.in
new file mode 100644
index 0000000..792ebc0
--- /dev/null
+++ b/data/oses/rhel/rhel3.7.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.7">
+    <short-id>rhel3.7</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 7</_name>
+    <version>3.7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2006-03-15</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.6"/>
+    <derives-from id="http://redhat.com/rhel/3.6"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.8.xml.in b/data/oses/rhel/rhel3.8.xml.in
new file mode 100644
index 0000000..4237384
--- /dev/null
+++ b/data/oses/rhel/rhel3.8.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.8">
+    <short-id>rhel3.8</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 8</_name>
+    <version>3.8</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2006-07-20</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.7"/>
+    <derives-from id="http://redhat.com/rhel/3.7"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.9.xml.in b/data/oses/rhel/rhel3.9.xml.in
new file mode 100644
index 0000000..7dd6310
--- /dev/null
+++ b/data/oses/rhel/rhel3.9.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3.9">
+    <short-id>rhel3.9</short-id>
+    <_name>Red Hat Enterprise Linux 3 Update 9</_name>
+    <version>3.9</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2007-06-15</release-date>
+    <eol-date>2014-01-30</eol-date>
+    <upgrades id="http://redhat.com/rhel/3.8"/>
+    <derives-from id="http://redhat.com/rhel/3.8"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel3.xml.in b/data/oses/rhel/rhel3.xml.in
new file mode 100644
index 0000000..dceb58d
--- /dev/null
+++ b/data/oses/rhel/rhel3.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/3">
+    <short-id>rhel3</short-id>
+    <_name>Red Hat Enterprise Linux 3</_name>
+    <version>3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Taroon</codename>
+
+    <release-date>2003-10-22</release-date>
+    <eol-date>2014-01-30</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.0.xml.in b/data/oses/rhel/rhel4.0.xml.in
new file mode 100644
index 0000000..bb65ffb
--- /dev/null
+++ b/data/oses/rhel/rhel4.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.0">
+    <short-id>rhel4.0</short-id>
+    <_name>Red Hat Enterprise Linux 4.0</_name>
+    <version>4.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+
+    <release-date>2005-02-15</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.1.xml.in b/data/oses/rhel/rhel4.1.xml.in
new file mode 100644
index 0000000..0d8dee2
--- /dev/null
+++ b/data/oses/rhel/rhel4.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.1">
+    <short-id>rhel4.1</short-id>
+    <_name>Red Hat Enterprise Linux 4.1</_name>
+    <version>4.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.0"/>
+    <derives-from id="http://redhat.com/rhel/4.0"/>
+
+    <release-date>2005-06-09</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.2.xml.in b/data/oses/rhel/rhel4.2.xml.in
new file mode 100644
index 0000000..913f0b2
--- /dev/null
+++ b/data/oses/rhel/rhel4.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.2">
+    <short-id>rhel4.2</short-id>
+    <_name>Red Hat Enterprise Linux 4.2</_name>
+    <version>4.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.1"/>
+    <derives-from id="http://redhat.com/rhel/4.1"/>
+
+    <release-date>2005-10-05</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.3.xml.in b/data/oses/rhel/rhel4.3.xml.in
new file mode 100644
index 0000000..cbd03ad
--- /dev/null
+++ b/data/oses/rhel/rhel4.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.3">
+    <short-id>rhel4.3</short-id>
+    <_name>Red Hat Enterprise Linux 4.3</_name>
+    <version>4.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.2"/>
+    <derives-from id="http://redhat.com/rhel/4.2"/>
+
+    <release-date>2006-03-07</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.4.xml.in b/data/oses/rhel/rhel4.4.xml.in
new file mode 100644
index 0000000..58036d4
--- /dev/null
+++ b/data/oses/rhel/rhel4.4.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.4">
+    <short-id>rhel4.4</short-id>
+    <_name>Red Hat Enterprise Linux 4.4</_name>
+    <version>4.4</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.3"/>
+    <derives-from id="http://redhat.com/rhel/4.3"/>
+
+    <release-date>2006-08-11</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.5.xml.in b/data/oses/rhel/rhel4.5.xml.in
new file mode 100644
index 0000000..74f14aa
--- /dev/null
+++ b/data/oses/rhel/rhel4.5.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.5">
+    <short-id>rhel4.5</short-id>
+    <_name>Red Hat Enterprise Linux 4.5</_name>
+    <version>4.5</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.4"/>
+    <derives-from id="http://redhat.com/rhel/4.4"/>
+
+    <release-date>2007-05-01</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.6.xml.in b/data/oses/rhel/rhel4.6.xml.in
new file mode 100644
index 0000000..af78ae0
--- /dev/null
+++ b/data/oses/rhel/rhel4.6.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.6">
+    <short-id>rhel4.6</short-id>
+    <_name>Red Hat Enterprise Linux 4.6</_name>
+    <version>4.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.5"/>
+    <derives-from id="http://redhat.com/rhel/4.5"/>
+
+    <release-date>2007-11-15</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.7.xml.in b/data/oses/rhel/rhel4.7.xml.in
new file mode 100644
index 0000000..ace54dc
--- /dev/null
+++ b/data/oses/rhel/rhel4.7.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.7">
+    <short-id>rhel4.7</short-id>
+    <_name>Red Hat Enterprise Linux 4.7</_name>
+    <version>4.7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.6"/>
+    <derives-from id="http://redhat.com/rhel/4.6"/>
+
+    <release-date>2008-07-24</release-date>
+    <eol-date>2015-02-28</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.8.xml.in b/data/oses/rhel/rhel4.8.xml.in
new file mode 100644
index 0000000..5e45277
--- /dev/null
+++ b/data/oses/rhel/rhel4.8.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.8">
+    <short-id>rhel4.8</short-id>
+    <_name>Red Hat Enterprise Linux 4.8</_name>
+    <version>4.8</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.7"/>
+    <derives-from id="http://redhat.com/rhel/4.7"/>
+
+    <release-date>2009-05-18</release-date>
+    <eol-date>2015-02-28</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/4-U8 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/4-U8 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel4.9.xml.in b/data/oses/rhel/rhel4.9.xml.in
new file mode 100644
index 0000000..ed99061
--- /dev/null
+++ b/data/oses/rhel/rhel4.9.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/4.9">
+    <short-id>rhel4.9</short-id>
+    <_name>Red Hat Enterprise Linux 4.9</_name>
+    <version>4.9</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Nahant</codename>
+    <upgrades id="http://redhat.com/rhel/4.8"/>
+    <derives-from id="http://redhat.com/rhel/4.8"/>
+
+    <release-date>2011-02-16</release-date>
+    <eol-date>2015-02-28</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_4.9 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_4.9 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.0.xml.in b/data/oses/rhel/rhel5.0.xml.in
new file mode 100644
index 0000000..6d4be93
--- /dev/null
+++ b/data/oses/rhel/rhel5.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.0">
+    <short-id>rhel5.0</short-id>
+    <_name>Red Hat Enterprise Linux 5.0</_name>
+    <version>5.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+
+    <release-date>2007-03-14</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.1.xml.in b/data/oses/rhel/rhel5.1.xml.in
new file mode 100644
index 0000000..638d727
--- /dev/null
+++ b/data/oses/rhel/rhel5.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.1">
+    <short-id>rhel5.1</short-id>
+    <_name>Red Hat Enterprise Linux 5.1</_name>
+    <version>5.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.0"/>
+    <derives-from id="http://redhat.com/rhel/5.0"/>
+
+    <release-date>2007-11-07</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.10.xml.in b/data/oses/rhel/rhel5.10.xml.in
new file mode 100644
index 0000000..ae0eaf9
--- /dev/null
+++ b/data/oses/rhel/rhel5.10.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.10">
+    <short-id>rhel5.10</short-id>
+    <_name>Red Hat Enterprise Linux 5.10</_name>
+    <version>5.10</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.9"/>
+    <derives-from id="http://redhat.com/rhel/5.9"/>
+
+    <release-date>2013-10-01</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.10 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.10 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.11.xml.in b/data/oses/rhel/rhel5.11.xml.in
new file mode 100644
index 0000000..465f3af
--- /dev/null
+++ b/data/oses/rhel/rhel5.11.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.11">
+    <short-id>rhel5.11</short-id>
+    <_name>Red Hat Enterprise Linux 5.11</_name>
+    <version>5.11</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.10"/>
+    <derives-from id="http://redhat.com/rhel/5.10"/>
+
+    <release-date>2014-09-16</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.11 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.11 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.2.xml.in b/data/oses/rhel/rhel5.2.xml.in
new file mode 100644
index 0000000..b7591c7
--- /dev/null
+++ b/data/oses/rhel/rhel5.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.2">
+    <short-id>rhel5.2</short-id>
+    <_name>Red Hat Enterprise Linux 5.2</_name>
+    <version>5.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.1"/>
+    <derives-from id="http://redhat.com/rhel/5.1"/>
+
+    <release-date>2008-05-21</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.3.xml.in b/data/oses/rhel/rhel5.3.xml.in
new file mode 100644
index 0000000..3af0df6
--- /dev/null
+++ b/data/oses/rhel/rhel5.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.3">
+    <short-id>rhel5.3</short-id>
+    <_name>Red Hat Enterprise Linux 5.3</_name>
+    <version>5.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.2"/>
+    <derives-from id="http://redhat.com/rhel/5.2"/>
+
+    <release-date>2009-01-20</release-date>
+    <eol-date>2020-03-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.4.xml.in b/data/oses/rhel/rhel5.4.xml.in
new file mode 100644
index 0000000..456bee7
--- /dev/null
+++ b/data/oses/rhel/rhel5.4.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.4">
+    <short-id>rhel5.4</short-id>
+    <_name>Red Hat Enterprise Linux 5.4</_name>
+    <version>5.4</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.3"/>
+    <derives-from id="http://redhat.com/rhel/5.3"/>
+
+    <release-date>2009-09-02</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.4 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.4 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.5.xml.in b/data/oses/rhel/rhel5.5.xml.in
new file mode 100644
index 0000000..928874d
--- /dev/null
+++ b/data/oses/rhel/rhel5.5.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.5">
+    <short-id>rhel5.5</short-id>
+    <_name>Red Hat Enterprise Linux 5.5</_name>
+    <version>5.5</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.4"/>
+    <derives-from id="http://redhat.com/rhel/5.4"/>
+
+    <release-date>2010-03-30</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.5 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.5 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.6.xml.in b/data/oses/rhel/rhel5.6.xml.in
new file mode 100644
index 0000000..af83dab
--- /dev/null
+++ b/data/oses/rhel/rhel5.6.xml.in
@@ -0,0 +1,34 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.6">
+    <short-id>rhel5.6</short-id>
+    <_name>Red Hat Enterprise Linux 5.6</_name>
+    <version>5.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.5"/>
+    <derives-from id="http://redhat.com/rhel/5.5"/>
+
+    <release-date>2011-01-12</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.6 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.6 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.7.xml.in b/data/oses/rhel/rhel5.7.xml.in
new file mode 100644
index 0000000..c77a46c
--- /dev/null
+++ b/data/oses/rhel/rhel5.7.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.7">
+    <short-id>rhel5.7</short-id>
+    <_name>Red Hat Enterprise Linux 5.7</_name>
+    <version>5.7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.6"/>
+    <derives-from id="http://redhat.com/rhel/5.6"/>
+
+    <release-date>2011-07-21</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.7 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.7 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.8.xml.in b/data/oses/rhel/rhel5.8.xml.in
new file mode 100644
index 0000000..e2906e0
--- /dev/null
+++ b/data/oses/rhel/rhel5.8.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.8">
+    <short-id>rhel5.8</short-id>
+    <_name>Red Hat Enterprise Linux 5.8</_name>
+    <version>5.8</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <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>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.8 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.8 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel5.9.xml.in b/data/oses/rhel/rhel5.9.xml.in
new file mode 100644
index 0000000..6244339
--- /dev/null
+++ b/data/oses/rhel/rhel5.9.xml.in
@@ -0,0 +1,29 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/5.9">
+    <short-id>rhel5.9</short-id>
+    <_name>Red Hat Enterprise Linux 5.9</_name>
+    <version>5.9</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <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"/>
+
+    <release-date>2013-01-07</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.9 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.9 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.0.xml.in b/data/oses/rhel/rhel6.0.xml.in
new file mode 100644
index 0000000..edda615
--- /dev/null
+++ b/data/oses/rhel/rhel6.0.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.0">
+    <short-id>rhel6.0</short-id>
+    <_name>Red Hat Enterprise Linux 6.0</_name>
+    <version>6.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+
+    <release-date>2010-11-10</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.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_6.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>
+        <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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.1.xml.in b/data/oses/rhel/rhel6.1.xml.in
new file mode 100644
index 0000000..b523b36
--- /dev/null
+++ b/data/oses/rhel/rhel6.1.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.1">
+    <short-id>rhel6.1</short-id>
+    <_name>Red Hat Enterprise Linux 6.1</_name>
+    <version>6.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.0"/>
+    <derives-from id="http://redhat.com/rhel/6.0"/>
+
+    <release-date>2011-05-19</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.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_6.1 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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.2.xml.in b/data/oses/rhel/rhel6.2.xml.in
new file mode 100644
index 0000000..17bb230
--- /dev/null
+++ b/data/oses/rhel/rhel6.2.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.2">
+    <short-id>rhel6.2</short-id>
+    <_name>Red Hat Enterprise Linux 6.2</_name>
+    <version>6.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.1"/>
+    <derives-from id="http://redhat.com/rhel/6.1"/>
+
+    <release-date>2011-12-06</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.2 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.2 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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.3.xml.in b/data/oses/rhel/rhel6.3.xml.in
new file mode 100644
index 0000000..9183110
--- /dev/null
+++ b/data/oses/rhel/rhel6.3.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.3">
+    <short-id>rhel6.3</short-id>
+    <_name>Red Hat Enterprise Linux 6.3</_name>
+    <version>6.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.2"/>
+    <derives-from id="http://redhat.com/rhel/6.2"/>
+
+    <release-date>2012-06-21</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.3 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.3 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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.4.xml.in b/data/oses/rhel/rhel6.4.xml.in
new file mode 100644
index 0000000..2be3fdc
--- /dev/null
+++ b/data/oses/rhel/rhel6.4.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.4">
+    <short-id>rhel6.4</short-id>
+    <_name>Red Hat Enterprise Linux 6.4</_name>
+    <version>6.4</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.3"/>
+    <derives-from id="http://redhat.com/rhel/6.3"/>
+
+    <release-date>2013-02-21</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL_6.4 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.4 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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.5.xml.in b/data/oses/rhel/rhel6.5.xml.in
new file mode 100644
index 0000000..8670a99
--- /dev/null
+++ b/data/oses/rhel/rhel6.5.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel6.6.xml.in b/data/oses/rhel/rhel6.6.xml.in
new file mode 100644
index 0000000..0874a74
--- /dev/null
+++ b/data/oses/rhel/rhel6.6.xml.in
@@ -0,0 +1,51 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhel/6.6">
+    <short-id>rhel6.6</short-id>
+    <_name>Red Hat Enterprise Linux 6.6</_name>
+    <version>6.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.5"/>
+    <derives-from id="http://redhat.com/rhel/6.5"/>
+
+    <release-date>2014-10-14</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHEL-6.6 .*.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.6 .*.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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel7.0.xml.in b/data/oses/rhel/rhel7.0.xml.in
new file mode 100644
index 0000000..f72f25a
--- /dev/null
+++ b/data/oses/rhel/rhel7.0.xml.in
@@ -0,0 +1,80 @@
+<libosinfo version="0.0.1">
+  <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>
+
+    <media arch="aarch64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHELSA-1.5 Server\.aarch64</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>
+</libosinfo>
diff --git a/data/oses/rhel/rhel7.1.xml.in b/data/oses/rhel/rhel7.1.xml.in
new file mode 100644
index 0000000..750559d
--- /dev/null
+++ b/data/oses/rhel/rhel7.1.xml.in
@@ -0,0 +1,73 @@
+<libosinfo version="0.0.1">
+  <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>
+
+    <media arch="aarch64">
+       <iso>
+         <system-id>LINUX</system-id>
+         <volume-id>RHELSA-7.1.*aarch64</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>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b15fca2..1839383 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -190,9 +190,59 @@ data/oses/opensuse/opensuse13.1.xml.in
 data/oses/opensuse/opensuse13.2.xml.in
 data/oses/opensuse/opensuse-factory.xml.in
 data/oses/opensuse/opensuse-unknown.xml.in
+data/oses/rhel/rhel2.1.1.xml.in
+data/oses/rhel/rhel2.1.2.xml.in
+data/oses/rhel/rhel2.1.3.xml.in
+data/oses/rhel/rhel2.1.4.xml.in
+data/oses/rhel/rhel2.1.5.xml.in
+data/oses/rhel/rhel2.1.6.xml.in
+data/oses/rhel/rhel2.1.7.xml.in
+data/oses/rhel/rhel2.1.xml.in
+data/oses/rhel/rhel3.1.xml.in
+data/oses/rhel/rhel3.2.xml.in
+data/oses/rhel/rhel3.3.xml.in
+data/oses/rhel/rhel3.4.xml.in
+data/oses/rhel/rhel3.5.xml.in
+data/oses/rhel/rhel3.6.xml.in
+data/oses/rhel/rhel3.7.xml.in
+data/oses/rhel/rhel3.8.xml.in
+data/oses/rhel/rhel3.9.xml.in
+data/oses/rhel/rhel3.xml.in
+data/oses/rhel/rhel4.0.xml.in
+data/oses/rhel/rhel4.1.xml.in
+data/oses/rhel/rhel4.2.xml.in
+data/oses/rhel/rhel4.3.xml.in
+data/oses/rhel/rhel4.4.xml.in
+data/oses/rhel/rhel4.5.xml.in
+data/oses/rhel/rhel4.6.xml.in
+data/oses/rhel/rhel4.7.xml.in
+data/oses/rhel/rhel4.8.xml.in
+data/oses/rhel/rhel4.9.xml.in
+data/oses/rhel/rhel5.0.xml.in
+data/oses/rhel/rhel5.10.xml.in
+data/oses/rhel/rhel5.11.xml.in
+data/oses/rhel/rhel5.1.xml.in
+data/oses/rhel/rhel5.2.xml.in
+data/oses/rhel/rhel5.3.xml.in
+data/oses/rhel/rhel5.4.xml.in
+data/oses/rhel/rhel5.5.xml.in
+data/oses/rhel/rhel5.6.xml.in
+data/oses/rhel/rhel5.7.xml.in
+data/oses/rhel/rhel5.8.xml.in
+data/oses/rhel/rhel5.9.xml.in
+data/oses/rhel/rhel6.0.xml.in
+data/oses/rhel/rhel6.1.xml.in
+data/oses/rhel/rhel6.2.xml.in
+data/oses/rhel/rhel6.3.xml.in
+data/oses/rhel/rhel6.4.xml.in
+data/oses/rhel/rhel6.5.xml.in
+data/oses/rhel/rhel6.6.xml.in
+data/oses/rhel/rhel7.0.xml.in
+data/oses/rhel/rhel7.1.xml.in
+data/oses/rhel/rhel-atomic-7.0.xml.in
+data/oses/rhel/rhel-atomic-7.1.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
-data/oses/rhel.xml.in
 data/oses/windows.xml.in
 data/oses/ubuntu.xml.in
 data/oses/rhl.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:39 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:39 +0100
Subject: [Libosinfo] [PATCH 21/39] data: split rhl into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-22-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                  |   1 +
 data/oses/Makefile.am         |   2 +-
 data/oses/rhl.xml.in          | 285 ------------------------------------------
 data/oses/rhl/Makefile.am     |   1 +
 data/oses/rhl/rhl1.0.xml.in   |  13 ++
 data/oses/rhl/rhl1.1.xml.in   |  15 +++
 data/oses/rhl/rhl2.0.xml.in   |  14 +++
 data/oses/rhl/rhl2.1.xml.in   |  14 +++
 data/oses/rhl/rhl3.0.3.xml.in |  15 +++
 data/oses/rhl/rhl4.0.xml.in   |  15 +++
 data/oses/rhl/rhl4.1.xml.in   |  15 +++
 data/oses/rhl/rhl4.2.xml.in   |  15 +++
 data/oses/rhl/rhl5.0.xml.in   |  15 +++
 data/oses/rhl/rhl5.1.xml.in   |  15 +++
 data/oses/rhl/rhl5.2.xml.in   |  15 +++
 data/oses/rhl/rhl6.0.xml.in   |  15 +++
 data/oses/rhl/rhl6.1.xml.in   |  15 +++
 data/oses/rhl/rhl6.2.xml.in   |  15 +++
 data/oses/rhl/rhl7.1.xml.in   |  16 +++
 data/oses/rhl/rhl7.2.xml.in   |  16 +++
 data/oses/rhl/rhl7.3.xml.in   |  16 +++
 data/oses/rhl/rhl7.xml.in     |  15 +++
 data/oses/rhl/rhl8.0.xml.in   |  16 +++
 data/oses/rhl/rhl9.xml.in     |  16 +++
 po/POTFILES.in                |  21 +++-
 25 files changed, 324 insertions(+), 287 deletions(-)
 delete mode 100644 data/oses/rhl.xml.in
 create mode 100644 data/oses/rhl/Makefile.am
 create mode 100644 data/oses/rhl/rhl1.0.xml.in
 create mode 100644 data/oses/rhl/rhl1.1.xml.in
 create mode 100644 data/oses/rhl/rhl2.0.xml.in
 create mode 100644 data/oses/rhl/rhl2.1.xml.in
 create mode 100644 data/oses/rhl/rhl3.0.3.xml.in
 create mode 100644 data/oses/rhl/rhl4.0.xml.in
 create mode 100644 data/oses/rhl/rhl4.1.xml.in
 create mode 100644 data/oses/rhl/rhl4.2.xml.in
 create mode 100644 data/oses/rhl/rhl5.0.xml.in
 create mode 100644 data/oses/rhl/rhl5.1.xml.in
 create mode 100644 data/oses/rhl/rhl5.2.xml.in
 create mode 100644 data/oses/rhl/rhl6.0.xml.in
 create mode 100644 data/oses/rhl/rhl6.1.xml.in
 create mode 100644 data/oses/rhl/rhl6.2.xml.in
 create mode 100644 data/oses/rhl/rhl7.1.xml.in
 create mode 100644 data/oses/rhl/rhl7.2.xml.in
 create mode 100644 data/oses/rhl/rhl7.3.xml.in
 create mode 100644 data/oses/rhl/rhl7.xml.in
 create mode 100644 data/oses/rhl/rhl8.0.xml.in
 create mode 100644 data/oses/rhl/rhl9.xml.in

diff --git a/configure.ac b/configure.ac
index 5d89444..26221d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,6 +188,7 @@ AC_CONFIG_FILES([
 	data/oses/openbsd/Makefile
 	data/oses/opensuse/Makefile
 	data/oses/rhel/Makefile
+	data/oses/rhl/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index dd91a42..167bcb1 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -16,11 +16,11 @@ SUBDIRS = \
 	openbsd \
 	opensuse \
 	rhel \
+	rhl \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	rhl.xml.in      \
 	solaris.xml.in  \
 	suse.xml.in     \
 	ubuntu.xml.in   \
diff --git a/data/oses/rhl.xml.in b/data/oses/rhl.xml.in
deleted file mode 100644
index 2c134de..0000000
--- a/data/oses/rhl.xml.in
+++ /dev/null
@@ -1,285 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://redhat.com/rhl/1.0">
-    <short-id>rhl1.0</short-id>
-    <_name>Red Hat Linux 1.0</_name>
-    <version>1.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Mother's Day</codename>
-
-    <release-date>1994-11-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/1.1">
-    <short-id>rhl1.1</short-id>
-    <_name>Red Hat Linux 1.1</_name>
-    <version>1.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Mother's Day + 0.1</codename>
-    <upgrades id="http://redhat.com/rhl/1.0"/>
-    <derives-from id="http://redhat.com/rhl/1.0"/>
-
-    <release-date>1995-08-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/2.0">
-    <short-id>rhl2.0</short-id>
-    <_name>Red Hat Linux 2.0</_name>
-    <version>2.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <upgrades id="http://redhat.com/rhl/1.1"/>
-    <derives-from id="http://redhat.com/rhl/1.1"/>
-
-    <release-date>1995-09-20</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/2.1">
-    <short-id>rhl2.1</short-id>
-    <_name>Red Hat Linux 2.1</_name>
-    <version>2.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <upgrades id="http://redhat.com/rhl/2.0"/>
-    <derives-from id="http://redhat.com/rhl/2.0"/>
-
-    <release-date>1995-11-23</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/3.0.3">
-    <short-id>rhl3.0.3</short-id>
-    <_name>Red Hat Linux 3.0.3</_name>
-    <version>3.0.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Picasso</codename>
-    <upgrades id="http://redhat.com/rhl/2.1"/>
-    <derives-from id="http://redhat.com/rhl/2.1"/>
-
-    <release-date>1996-05-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.0">
-    <short-id>rhl4.0</short-id>
-    <_name>Red Hat Linux 4.0</_name>
-    <version>4.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Colgate</codename>
-    <upgrades id="http://redhat.com/rhl/3.0.3"/>
-    <derives-from id="http://redhat.com/rhl/3.0.3"/>
-
-    <release-date>1996-10-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.1">
-    <short-id>rhl4.1</short-id>
-    <_name>Red Hat Linux 4.1</_name>
-    <version>4.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Vanderbilt</codename>
-    <upgrades id="http://redhat.com/rhl/4.0"/>
-    <derives-from id="http://redhat.com/rhl/4.0"/>
-
-    <release-date>1997-02-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/4.2">
-    <short-id>rhl4.2</short-id>
-    <_name>Red Hat Linux 4.2</_name>
-    <version>4.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Biltmore</codename>
-    <upgrades id="http://redhat.com/rhl/4.1"/>
-    <derives-from id="http://redhat.com/rhl/4.1"/>
-
-    <release-date>1997-05-19</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.0">
-    <short-id>rhl5.0</short-id>
-    <_name>Red Hat Linux 5.0</_name>
-    <version>5.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Hurricane</codename>
-    <upgrades id="http://redhat.com/rhl/4.2"/>
-    <derives-from id="http://redhat.com/rhl/4.2"/>
-
-    <release-date>1997-12-01</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.1">
-    <short-id>rhl5.1</short-id>
-    <_name>Red Hat Linux 5.1</_name>
-    <version>5.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Manhattan</codename>
-    <upgrades id="http://redhat.com/rhl/5.0"/>
-    <derives-from id="http://redhat.com/rhl/5.0"/>
-
-    <release-date>1998-05-22</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/5.2">
-    <short-id>rhl5.2</short-id>
-    <_name>Red Hat Linux 5.2</_name>
-    <version>5.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Apollo</codename>
-    <upgrades id="http://redhat.com/rhl/5.1"/>
-    <derives-from id="http://redhat.com/rhl/5.1"/>
-
-    <release-date>1998-11-02</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.0">
-    <short-id>rhl6.0</short-id>
-    <_name>Red Hat Linux 6.0</_name>
-    <version>6.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Hedwig</codename>
-    <upgrades id="http://redhat.com/rhl/5.1"/>
-    <derives-from id="http://redhat.com/rhl/5.1"/>
-
-    <release-date>1999-04-26</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.1">
-    <short-id>rhl6.1</short-id>
-    <_name>Red Hat Linux 6.1</_name>
-    <version>6.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Cartman</codename>
-    <upgrades id="http://redhat.com/rhl/6.0"/>
-    <derives-from id="http://redhat.com/rhl/6.0"/>
-
-    <release-date>1999-10-04</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/6.2">
-    <short-id>rhl6.2</short-id>
-    <_name>Red Hat Linux 6.2</_name>
-    <version>6.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Zoot</codename>
-    <upgrades id="http://redhat.com/rhl/6.1"/>
-    <derives-from id="http://redhat.com/rhl/6.1"/>
-
-    <release-date>2000-04-03</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7">
-    <short-id>rhl7</short-id>
-    <_name>Red Hat Linux 7</_name>
-    <version>7</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Guinness</codename>
-    <upgrades id="http://redhat.com/rhl/6.1"/>
-    <derives-from id="http://redhat.com/rhl/6.1"/>
-
-    <release-date>2000-09-25</release-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.1">
-    <short-id>rhl7.1</short-id>
-    <_name>Red Hat Linux 7.1</_name>
-    <version>7.1</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Seawolf</codename>
-    <upgrades id="http://redhat.com/rhl/7"/>
-    <derives-from id="http://redhat.com/rhl/7"/>
-
-    <release-date>2001-04-16</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.2">
-    <short-id>rhl7.2</short-id>
-    <_name>Red Hat Linux 7.2</_name>
-    <version>7.2</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Enigma</codename>
-    <upgrades id="http://redhat.com/rhl/7.1"/>
-    <derives-from id="http://redhat.com/rhl/7.1"/>
-
-    <release-date>2001-10-22</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/7.3">
-    <short-id>rhl7.3</short-id>
-    <_name>Red Hat Linux 7.3</_name>
-    <version>7.3</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Valhalla</codename>
-    <upgrades id="http://redhat.com/rhl/7.2"/>
-    <derives-from id="http://redhat.com/rhl/7.2"/>
-
-    <release-date>2002-05-06</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/8.0">
-    <short-id>rhl8.0</short-id>
-    <_name>Red Hat Linux 8.0</_name>
-    <version>8.0</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Psyche</codename>
-    <upgrades id="http://redhat.com/rhl/7.3"/>
-    <derives-from id="http://redhat.com/rhl/7.3"/>
-
-    <release-date>2002-09-30</release-date>
-    <eol-date>2003-12-31</eol-date>
-  </os>
-
-  <os id="http://redhat.com/rhl/9">
-    <short-id>rhl9</short-id>
-    <_name>Red Hat Linux 9</_name>
-    <version>9</version>
-    <_vendor>Red Hat, Inc</_vendor>
-    <family>linux</family>
-    <distro>rhl</distro>
-    <codename>Shrike</codename>
-    <upgrades id="http://redhat.com/rhl/8.0"/>
-    <derives-from id="http://redhat.com/rhl/8.0"/>
-
-    <release-date>2003-03-31</release-date>
-    <eol-date>2004-05-01</eol-date>
-  </os>
-
-
-</libosinfo>
diff --git a/data/oses/rhl/Makefile.am b/data/oses/rhl/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/rhl/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/rhl/rhl1.0.xml.in b/data/oses/rhl/rhl1.0.xml.in
new file mode 100644
index 0000000..2d1496e
--- /dev/null
+++ b/data/oses/rhl/rhl1.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/1.0">
+    <short-id>rhl1.0</short-id>
+    <_name>Red Hat Linux 1.0</_name>
+    <version>1.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Mother's Day</codename>
+
+    <release-date>1994-11-03</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl1.1.xml.in b/data/oses/rhl/rhl1.1.xml.in
new file mode 100644
index 0000000..a11164b
--- /dev/null
+++ b/data/oses/rhl/rhl1.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/1.1">
+    <short-id>rhl1.1</short-id>
+    <_name>Red Hat Linux 1.1</_name>
+    <version>1.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Mother's Day + 0.1</codename>
+    <upgrades id="http://redhat.com/rhl/1.0"/>
+    <derives-from id="http://redhat.com/rhl/1.0"/>
+
+    <release-date>1995-08-01</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl2.0.xml.in b/data/oses/rhl/rhl2.0.xml.in
new file mode 100644
index 0000000..2f1dc7f
--- /dev/null
+++ b/data/oses/rhl/rhl2.0.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/2.0">
+    <short-id>rhl2.0</short-id>
+    <_name>Red Hat Linux 2.0</_name>
+    <version>2.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <upgrades id="http://redhat.com/rhl/1.1"/>
+    <derives-from id="http://redhat.com/rhl/1.1"/>
+
+    <release-date>1995-09-20</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl2.1.xml.in b/data/oses/rhl/rhl2.1.xml.in
new file mode 100644
index 0000000..ca6604c
--- /dev/null
+++ b/data/oses/rhl/rhl2.1.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/2.1">
+    <short-id>rhl2.1</short-id>
+    <_name>Red Hat Linux 2.1</_name>
+    <version>2.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <upgrades id="http://redhat.com/rhl/2.0"/>
+    <derives-from id="http://redhat.com/rhl/2.0"/>
+
+    <release-date>1995-11-23</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl3.0.3.xml.in b/data/oses/rhl/rhl3.0.3.xml.in
new file mode 100644
index 0000000..92bde87
--- /dev/null
+++ b/data/oses/rhl/rhl3.0.3.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/3.0.3">
+    <short-id>rhl3.0.3</short-id>
+    <_name>Red Hat Linux 3.0.3</_name>
+    <version>3.0.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Picasso</codename>
+    <upgrades id="http://redhat.com/rhl/2.1"/>
+    <derives-from id="http://redhat.com/rhl/2.1"/>
+
+    <release-date>1996-05-01</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl4.0.xml.in b/data/oses/rhl/rhl4.0.xml.in
new file mode 100644
index 0000000..183b799
--- /dev/null
+++ b/data/oses/rhl/rhl4.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/4.0">
+    <short-id>rhl4.0</short-id>
+    <_name>Red Hat Linux 4.0</_name>
+    <version>4.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Colgate</codename>
+    <upgrades id="http://redhat.com/rhl/3.0.3"/>
+    <derives-from id="http://redhat.com/rhl/3.0.3"/>
+
+    <release-date>1996-10-03</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl4.1.xml.in b/data/oses/rhl/rhl4.1.xml.in
new file mode 100644
index 0000000..ad1742d
--- /dev/null
+++ b/data/oses/rhl/rhl4.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/4.1">
+    <short-id>rhl4.1</short-id>
+    <_name>Red Hat Linux 4.1</_name>
+    <version>4.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Vanderbilt</codename>
+    <upgrades id="http://redhat.com/rhl/4.0"/>
+    <derives-from id="http://redhat.com/rhl/4.0"/>
+
+    <release-date>1997-02-03</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl4.2.xml.in b/data/oses/rhl/rhl4.2.xml.in
new file mode 100644
index 0000000..1f9fd14
--- /dev/null
+++ b/data/oses/rhl/rhl4.2.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/4.2">
+    <short-id>rhl4.2</short-id>
+    <_name>Red Hat Linux 4.2</_name>
+    <version>4.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Biltmore</codename>
+    <upgrades id="http://redhat.com/rhl/4.1"/>
+    <derives-from id="http://redhat.com/rhl/4.1"/>
+
+    <release-date>1997-05-19</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl5.0.xml.in b/data/oses/rhl/rhl5.0.xml.in
new file mode 100644
index 0000000..f36256a
--- /dev/null
+++ b/data/oses/rhl/rhl5.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/5.0">
+    <short-id>rhl5.0</short-id>
+    <_name>Red Hat Linux 5.0</_name>
+    <version>5.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Hurricane</codename>
+    <upgrades id="http://redhat.com/rhl/4.2"/>
+    <derives-from id="http://redhat.com/rhl/4.2"/>
+
+    <release-date>1997-12-01</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl5.1.xml.in b/data/oses/rhl/rhl5.1.xml.in
new file mode 100644
index 0000000..a89c24a
--- /dev/null
+++ b/data/oses/rhl/rhl5.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/5.1">
+    <short-id>rhl5.1</short-id>
+    <_name>Red Hat Linux 5.1</_name>
+    <version>5.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Manhattan</codename>
+    <upgrades id="http://redhat.com/rhl/5.0"/>
+    <derives-from id="http://redhat.com/rhl/5.0"/>
+
+    <release-date>1998-05-22</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl5.2.xml.in b/data/oses/rhl/rhl5.2.xml.in
new file mode 100644
index 0000000..e1e7c44
--- /dev/null
+++ b/data/oses/rhl/rhl5.2.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/5.2">
+    <short-id>rhl5.2</short-id>
+    <_name>Red Hat Linux 5.2</_name>
+    <version>5.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Apollo</codename>
+    <upgrades id="http://redhat.com/rhl/5.1"/>
+    <derives-from id="http://redhat.com/rhl/5.1"/>
+
+    <release-date>1998-11-02</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl6.0.xml.in b/data/oses/rhl/rhl6.0.xml.in
new file mode 100644
index 0000000..88b28fc
--- /dev/null
+++ b/data/oses/rhl/rhl6.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/6.0">
+    <short-id>rhl6.0</short-id>
+    <_name>Red Hat Linux 6.0</_name>
+    <version>6.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Hedwig</codename>
+    <upgrades id="http://redhat.com/rhl/5.1"/>
+    <derives-from id="http://redhat.com/rhl/5.1"/>
+
+    <release-date>1999-04-26</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl6.1.xml.in b/data/oses/rhl/rhl6.1.xml.in
new file mode 100644
index 0000000..515a813
--- /dev/null
+++ b/data/oses/rhl/rhl6.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/6.1">
+    <short-id>rhl6.1</short-id>
+    <_name>Red Hat Linux 6.1</_name>
+    <version>6.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Cartman</codename>
+    <upgrades id="http://redhat.com/rhl/6.0"/>
+    <derives-from id="http://redhat.com/rhl/6.0"/>
+
+    <release-date>1999-10-04</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl6.2.xml.in b/data/oses/rhl/rhl6.2.xml.in
new file mode 100644
index 0000000..7f41e7f
--- /dev/null
+++ b/data/oses/rhl/rhl6.2.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/6.2">
+    <short-id>rhl6.2</short-id>
+    <_name>Red Hat Linux 6.2</_name>
+    <version>6.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Zoot</codename>
+    <upgrades id="http://redhat.com/rhl/6.1"/>
+    <derives-from id="http://redhat.com/rhl/6.1"/>
+
+    <release-date>2000-04-03</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl7.1.xml.in b/data/oses/rhl/rhl7.1.xml.in
new file mode 100644
index 0000000..af43912
--- /dev/null
+++ b/data/oses/rhl/rhl7.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/7.1">
+    <short-id>rhl7.1</short-id>
+    <_name>Red Hat Linux 7.1</_name>
+    <version>7.1</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Seawolf</codename>
+    <upgrades id="http://redhat.com/rhl/7"/>
+    <derives-from id="http://redhat.com/rhl/7"/>
+
+    <release-date>2001-04-16</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl7.2.xml.in b/data/oses/rhl/rhl7.2.xml.in
new file mode 100644
index 0000000..66b500a
--- /dev/null
+++ b/data/oses/rhl/rhl7.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/7.2">
+    <short-id>rhl7.2</short-id>
+    <_name>Red Hat Linux 7.2</_name>
+    <version>7.2</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Enigma</codename>
+    <upgrades id="http://redhat.com/rhl/7.1"/>
+    <derives-from id="http://redhat.com/rhl/7.1"/>
+
+    <release-date>2001-10-22</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl7.3.xml.in b/data/oses/rhl/rhl7.3.xml.in
new file mode 100644
index 0000000..fd13219
--- /dev/null
+++ b/data/oses/rhl/rhl7.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/7.3">
+    <short-id>rhl7.3</short-id>
+    <_name>Red Hat Linux 7.3</_name>
+    <version>7.3</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Valhalla</codename>
+    <upgrades id="http://redhat.com/rhl/7.2"/>
+    <derives-from id="http://redhat.com/rhl/7.2"/>
+
+    <release-date>2002-05-06</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl7.xml.in b/data/oses/rhl/rhl7.xml.in
new file mode 100644
index 0000000..24d3420
--- /dev/null
+++ b/data/oses/rhl/rhl7.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/7">
+    <short-id>rhl7</short-id>
+    <_name>Red Hat Linux 7</_name>
+    <version>7</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Guinness</codename>
+    <upgrades id="http://redhat.com/rhl/6.1"/>
+    <derives-from id="http://redhat.com/rhl/6.1"/>
+
+    <release-date>2000-09-25</release-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl8.0.xml.in b/data/oses/rhl/rhl8.0.xml.in
new file mode 100644
index 0000000..d955087
--- /dev/null
+++ b/data/oses/rhl/rhl8.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/8.0">
+    <short-id>rhl8.0</short-id>
+    <_name>Red Hat Linux 8.0</_name>
+    <version>8.0</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Psyche</codename>
+    <upgrades id="http://redhat.com/rhl/7.3"/>
+    <derives-from id="http://redhat.com/rhl/7.3"/>
+
+    <release-date>2002-09-30</release-date>
+    <eol-date>2003-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/rhl/rhl9.xml.in b/data/oses/rhl/rhl9.xml.in
new file mode 100644
index 0000000..e237720
--- /dev/null
+++ b/data/oses/rhl/rhl9.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://redhat.com/rhl/9">
+    <short-id>rhl9</short-id>
+    <_name>Red Hat Linux 9</_name>
+    <version>9</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhl</distro>
+    <codename>Shrike</codename>
+    <upgrades id="http://redhat.com/rhl/8.0"/>
+    <derives-from id="http://redhat.com/rhl/8.0"/>
+
+    <release-date>2003-03-31</release-date>
+    <eol-date>2004-05-01</eol-date>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1839383..9448255 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -241,11 +241,30 @@ data/oses/rhel/rhel7.0.xml.in
 data/oses/rhel/rhel7.1.xml.in
 data/oses/rhel/rhel-atomic-7.0.xml.in
 data/oses/rhel/rhel-atomic-7.1.xml.in
+data/oses/rhl/rhl1.0.xml.in
+data/oses/rhl/rhl1.1.xml.in
+data/oses/rhl/rhl2.0.xml.in
+data/oses/rhl/rhl2.1.xml.in
+data/oses/rhl/rhl3.0.3.xml.in
+data/oses/rhl/rhl4.0.xml.in
+data/oses/rhl/rhl4.1.xml.in
+data/oses/rhl/rhl4.2.xml.in
+data/oses/rhl/rhl5.0.xml.in
+data/oses/rhl/rhl5.1.xml.in
+data/oses/rhl/rhl5.2.xml.in
+data/oses/rhl/rhl6.0.xml.in
+data/oses/rhl/rhl6.1.xml.in
+data/oses/rhl/rhl6.2.xml.in
+data/oses/rhl/rhl7.1.xml.in
+data/oses/rhl/rhl7.2.xml.in
+data/oses/rhl/rhl7.3.xml.in
+data/oses/rhl/rhl7.xml.in
+data/oses/rhl/rhl8.0.xml.in
+data/oses/rhl/rhl9.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
 data/oses/windows.xml.in
 data/oses/ubuntu.xml.in
-data/oses/rhl.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:40 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:40 +0100
Subject: [Libosinfo] [PATCH 22/39] data: split solaris into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-23-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                |  1 +
 data/oses/Makefile.am                       |  2 +-
 data/oses/solaris.xml.in                    | 49 -----------------------------
 data/oses/solaris/Makefile.am               |  1 +
 data/oses/solaris/opensolaris2009.06.xml.in | 14 +++++++++
 data/oses/solaris/solaris10.xml.in          | 15 +++++++++
 data/oses/solaris/solaris11.xml.in          | 11 +++++++
 data/oses/solaris/solaris9.xml.in           | 10 ++++++
 po/POTFILES.in                              |  5 ++-
 9 files changed, 57 insertions(+), 51 deletions(-)
 delete mode 100644 data/oses/solaris.xml.in
 create mode 100644 data/oses/solaris/Makefile.am
 create mode 100644 data/oses/solaris/opensolaris2009.06.xml.in
 create mode 100644 data/oses/solaris/solaris10.xml.in
 create mode 100644 data/oses/solaris/solaris11.xml.in
 create mode 100644 data/oses/solaris/solaris9.xml.in

diff --git a/configure.ac b/configure.ac
index 26221d6..e0df0b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,7 @@ AC_CONFIG_FILES([
 	data/oses/opensuse/Makefile
 	data/oses/rhel/Makefile
 	data/oses/rhl/Makefile
+	data/oses/solaris/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 167bcb1..1ca63e5 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -17,11 +17,11 @@ SUBDIRS = \
 	opensuse \
 	rhel \
 	rhl \
+	solaris \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	solaris.xml.in  \
 	suse.xml.in     \
 	ubuntu.xml.in   \
 	windows.xml.in  \
diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in
deleted file mode 100644
index 8c7c276..0000000
--- a/data/oses/solaris.xml.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://sun.com/solaris/9">
-    <short-id>solaris9</short-id>
-    <_name>Solaris 9</_name>
-    <version>9</version>
-    <_vendor>Sun</_vendor>
-    <family>solaris</family>
-    <distro>solaris</distro>
-  </os>
-
-  <os id="http://sun.com/solaris/10">
-    <short-id>solaris10</short-id>
-    <_name>Solaris 10</_name>
-    <version>10</version>
-    <_vendor>Sun</_vendor>
-    <family>solaris</family>
-    <distro>solaris</distro>
-    <upgrades id="http://sun.com/solaris/9"/>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-  </os>
-
-  <os id="http://oracle.com/solaris/11">
-    <short-id>solaris11</short-id>
-    <_name>Oracle Solaris 11</_name>
-    <version>11</version>
-    <_vendor>Oracle</_vendor>
-    <family>solaris</family>
-    <distro>solaris</distro>
-    <upgrades id="http://sun.com/solaris/10"/>
-  </os>
-
-  <os id="http://sun.com/opensolaris/2009.06">
-    <short-id>opensolaris2009.06</short-id>
-    <_name>OpenSolaris 2009.06</_name>
-    <version>2009.06</version>
-    <_vendor>Sun</_vendor>
-    <family>solaris</family>
-    <distro>opensolaris</distro>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-    </devices>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/solaris/Makefile.am b/data/oses/solaris/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/solaris/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/solaris/opensolaris2009.06.xml.in b/data/oses/solaris/opensolaris2009.06.xml.in
new file mode 100644
index 0000000..a5bfc81
--- /dev/null
+++ b/data/oses/solaris/opensolaris2009.06.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <os id="http://sun.com/opensolaris/2009.06">
+    <short-id>opensolaris2009.06</short-id>
+    <_name>OpenSolaris 2009.06</_name>
+    <version>2009.06</version>
+    <_vendor>Sun</_vendor>
+    <family>solaris</family>
+    <distro>opensolaris</distro>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/solaris/solaris10.xml.in b/data/oses/solaris/solaris10.xml.in
new file mode 100644
index 0000000..8e00b4a
--- /dev/null
+++ b/data/oses/solaris/solaris10.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://sun.com/solaris/10">
+    <short-id>solaris10</short-id>
+    <_name>Solaris 10</_name>
+    <version>10</version>
+    <_vendor>Sun</_vendor>
+    <family>solaris</family>
+    <distro>solaris</distro>
+    <upgrades id="http://sun.com/solaris/9"/>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/solaris/solaris11.xml.in b/data/oses/solaris/solaris11.xml.in
new file mode 100644
index 0000000..b6da98f
--- /dev/null
+++ b/data/oses/solaris/solaris11.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://oracle.com/solaris/11">
+    <short-id>solaris11</short-id>
+    <_name>Oracle Solaris 11</_name>
+    <version>11</version>
+    <_vendor>Oracle</_vendor>
+    <family>solaris</family>
+    <distro>solaris</distro>
+    <upgrades id="http://sun.com/solaris/10"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/solaris/solaris9.xml.in b/data/oses/solaris/solaris9.xml.in
new file mode 100644
index 0000000..fccb5f1
--- /dev/null
+++ b/data/oses/solaris/solaris9.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://sun.com/solaris/9">
+    <short-id>solaris9</short-id>
+    <_name>Solaris 9</_name>
+    <version>9</version>
+    <_vendor>Sun</_vendor>
+    <family>solaris</family>
+    <distro>solaris</distro>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9448255..5e7ecd3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -261,7 +261,10 @@ data/oses/rhl/rhl7.3.xml.in
 data/oses/rhl/rhl7.xml.in
 data/oses/rhl/rhl8.0.xml.in
 data/oses/rhl/rhl9.xml.in
-data/oses/solaris.xml.in
+data/oses/solaris/opensolaris2009.06.xml.in
+data/oses/solaris/solaris9.xml.in
+data/oses/solaris/solaris10.xml.in
+data/oses/solaris/solaris11.xml.in
 data/oses/suse.xml.in
 data/oses/windows.xml.in
 data/oses/ubuntu.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:41 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:41 +0100
Subject: [Libosinfo] [PATCH 23/39] data: split suse into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-24-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                    |   1 +
 data/oses/Makefile.am           |   2 +-
 data/oses/suse.xml.in           | 363 ----------------------------------------
 data/oses/suse/Makefile.am      |   1 +
 data/oses/suse/sled10.xml.in    |  22 +++
 data/oses/suse/sled11.xml.in    |  22 +++
 data/oses/suse/sled11sp1.xml.in |  28 ++++
 data/oses/suse/sled11sp2.xml.in |  28 ++++
 data/oses/suse/sled11sp3.xml.in |  28 ++++
 data/oses/suse/sled11sp4.xml.in |  28 ++++
 data/oses/suse/sled12.xml.in    |  32 ++++
 data/oses/suse/sled9.xml.in     |  10 ++
 data/oses/suse/sles10.xml.in    |  11 ++
 data/oses/suse/sles11.xml.in    |  16 ++
 data/oses/suse/sles11sp1.xml.in |  30 ++++
 data/oses/suse/sles11sp2.xml.in |  30 ++++
 data/oses/suse/sles11sp3.xml.in |  30 ++++
 data/oses/suse/sles11sp4.xml.in |  28 ++++
 data/oses/suse/sles12.xml.in    |  23 +++
 data/oses/suse/sles9.xml.in     |  10 ++
 po/POTFILES.in                  |  17 +-
 21 files changed, 395 insertions(+), 365 deletions(-)
 delete mode 100644 data/oses/suse.xml.in
 create mode 100644 data/oses/suse/Makefile.am
 create mode 100644 data/oses/suse/sled10.xml.in
 create mode 100644 data/oses/suse/sled11.xml.in
 create mode 100644 data/oses/suse/sled11sp1.xml.in
 create mode 100644 data/oses/suse/sled11sp2.xml.in
 create mode 100644 data/oses/suse/sled11sp3.xml.in
 create mode 100644 data/oses/suse/sled11sp4.xml.in
 create mode 100644 data/oses/suse/sled12.xml.in
 create mode 100644 data/oses/suse/sled9.xml.in
 create mode 100644 data/oses/suse/sles10.xml.in
 create mode 100644 data/oses/suse/sles11.xml.in
 create mode 100644 data/oses/suse/sles11sp1.xml.in
 create mode 100644 data/oses/suse/sles11sp2.xml.in
 create mode 100644 data/oses/suse/sles11sp3.xml.in
 create mode 100644 data/oses/suse/sles11sp4.xml.in
 create mode 100644 data/oses/suse/sles12.xml.in
 create mode 100644 data/oses/suse/sles9.xml.in

diff --git a/configure.ac b/configure.ac
index e0df0b7..a86378c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,7 @@ AC_CONFIG_FILES([
 	data/oses/rhel/Makefile
 	data/oses/rhl/Makefile
 	data/oses/solaris/Makefile
+	data/oses/suse/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 1ca63e5..f9b5876 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -18,11 +18,11 @@ SUBDIRS = \
 	rhel \
 	rhl \
 	solaris \
+	suse \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	suse.xml.in     \
 	ubuntu.xml.in   \
 	windows.xml.in  \
 	$(NULL)
diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in
deleted file mode 100644
index 1d913dc..0000000
--- a/data/oses/suse.xml.in
+++ /dev/null
@@ -1,363 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://suse.com/sles/9">
-    <short-id>sles9</short-id>
-    <_name>SUSE Linux Enterprise Server 9</_name>
-    <version>9</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-  </os>
-
-  <os id="http://suse.com/sles/10">
-    <short-id>sles10</short-id>
-    <_name>SUSE Linux Enterprise Server 10</_name>
-    <version>10</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/9"/>
-  </os>
-
-  <os id="http://suse.com/sles/11">
-    <short-id>sles11</short-id>
-    <_name>SUSE Linux Enterprise Server 11</_name>
-    <version>11</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/10"/>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <os id="http://suse.com/sles/11.1">
-    <short-id>sles11sp1</short-id>
-    <_name>SUSE Linux Enterprise Server 11 SP1</_name>
-    <version>11.1</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/11"/>
-
-    <release-date>2010-06-02</release-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP1-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP1-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sles/11.2">
-    <short-id>sles11sp2</short-id>
-    <_name>SUSE Linux Enterprise Server 11 SP2</_name>
-    <version>11.2</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/11.1"/>
-
-    <release-date>2012-02-15</release-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP2-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP2-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sles/11.3">
-    <short-id>sles11sp3</short-id>
-    <_name>SUSE Linux Enterprise Server 11 SP3</_name>
-    <version>11.3</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/11.2"/>
-
-    <release-date>2013-07-01</release-date>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP3-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP3-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sles/11.4">
-    <short-id>sles11sp4</short-id>
-    <_name>SUSE Linux Enterprise Server 11 SP4</_name>
-    <version>11.4</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/11.3"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP4-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLES-11-SP4-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sles/12">
-    <short-id>sles12</short-id>
-    <_name>SUSE Linux Enterprise Server 12</_name>
-    <version>12</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sles</distro>
-    <upgrades id="http://suse.com/sles/11.4"/>
-    <derives-from id="http://suse.com/sles/11.4"/>
-
-    <release-date>2014-10-28</release-date>
-
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLE-12-Server-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sled/9">
-    <short-id>sled9</short-id>
-    <_name>SUSE Linux Enterprise Desktop 9</_name>
-    <version>9</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-  </os>
-
-  <os id="http://suse.com/sled/10">
-    <short-id>sled10</short-id>
-    <_name>SUSE Linux Enterprise Desktop 10</_name>
-    <version>10</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/9"/>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://suse.com/sled/11">
-    <short-id>sled11</short-id>
-    <_name>SUSE Linux Enterprise Desktop 11</_name>
-    <version>11</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/10"/>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://suse.com/sled/11.1">
-    <short-id>sled11sp1</short-id>
-    <_name>SUSE Linux Enterprise Desktop 11 SP1</_name>
-    <version>11.1</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/11"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP1-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP1-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sled/11.2">
-    <short-id>sled11sp2</short-id>
-    <_name>SUSE Linux Enterprise Desktop 11 SP2</_name>
-    <version>11.2</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/11.1"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP2-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP2-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sled/11.3">
-    <short-id>sled11sp3</short-id>
-    <_name>SUSE Linux Enterprise Desktop 11 SP3</_name>
-    <version>11.3</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/11.2"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP3-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP3-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sled/11.4">
-    <short-id>sled11sp4</short-id>
-    <_name>SUSE Linux Enterprise Desktop 11 SP4</_name>
-    <version>11.4</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/11.3"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP4-DVD-i586</volume-id>
-      </iso>
-      <kernel>boot/i386/loader/linux</kernel>
-      <initrd>boot/i386/loader/initrd</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLED-11-SP4-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-  </os>
-
-  <os id="http://suse.com/sled/12">
-    <short-id>sled12</short-id>
-    <_name>SUSE Linux Enterprise Desktop 12</_name>
-    <version>12</version>
-    <_vendor>SUSE</_vendor>
-    <family>linux</family>
-    <distro>sled</distro>
-    <upgrades id="http://suse.com/sled/11.4"/>
-    <derives-from id="http://suse.com/sled/11.4"/>
-
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>SLE-12-Desktop-DVD-x86_64</volume-id>
-      </iso>
-      <kernel>boot/x86_64/loader/linux</kernel>
-      <initrd>boot/x86_64/loader/initrd</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>500000000</cpu>
-        <ram>536870912</ram>
-        <storage>3221225472</storage>
-      </minimum>
-      <recommended>
-        <ram>1073741824</ram>
-      </recommended>
-    </resources>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/suse/Makefile.am b/data/oses/suse/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/suse/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/suse/sled10.xml.in b/data/oses/suse/sled10.xml.in
new file mode 100644
index 0000000..9042f21
--- /dev/null
+++ b/data/oses/suse/sled10.xml.in
@@ -0,0 +1,22 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/10">
+    <short-id>sled10</short-id>
+    <_name>SUSE Linux Enterprise Desktop 10</_name>
+    <version>10</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/9"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled11.xml.in b/data/oses/suse/sled11.xml.in
new file mode 100644
index 0000000..72bf3f3
--- /dev/null
+++ b/data/oses/suse/sled11.xml.in
@@ -0,0 +1,22 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/11">
+    <short-id>sled11</short-id>
+    <_name>SUSE Linux Enterprise Desktop 11</_name>
+    <version>11</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/10"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled11sp1.xml.in b/data/oses/suse/sled11sp1.xml.in
new file mode 100644
index 0000000..23f2c22
--- /dev/null
+++ b/data/oses/suse/sled11sp1.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/11.1">
+    <short-id>sled11sp1</short-id>
+    <_name>SUSE Linux Enterprise Desktop 11 SP1</_name>
+    <version>11.1</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP1-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP1-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled11sp2.xml.in b/data/oses/suse/sled11sp2.xml.in
new file mode 100644
index 0000000..4fd2181
--- /dev/null
+++ b/data/oses/suse/sled11sp2.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/11.2">
+    <short-id>sled11sp2</short-id>
+    <_name>SUSE Linux Enterprise Desktop 11 SP2</_name>
+    <version>11.2</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11.1"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP2-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP2-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled11sp3.xml.in b/data/oses/suse/sled11sp3.xml.in
new file mode 100644
index 0000000..2a60b0c
--- /dev/null
+++ b/data/oses/suse/sled11sp3.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/11.3">
+    <short-id>sled11sp3</short-id>
+    <_name>SUSE Linux Enterprise Desktop 11 SP3</_name>
+    <version>11.3</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11.2"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP3-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP3-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled11sp4.xml.in b/data/oses/suse/sled11sp4.xml.in
new file mode 100644
index 0000000..23789b4
--- /dev/null
+++ b/data/oses/suse/sled11sp4.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/11.4">
+    <short-id>sled11sp4</short-id>
+    <_name>SUSE Linux Enterprise Desktop 11 SP4</_name>
+    <version>11.4</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11.3"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP4-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLED-11-SP4-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled12.xml.in b/data/oses/suse/sled12.xml.in
new file mode 100644
index 0000000..d9da018
--- /dev/null
+++ b/data/oses/suse/sled12.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/12">
+    <short-id>sled12</short-id>
+    <_name>SUSE Linux Enterprise Desktop 12</_name>
+    <version>12</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11.4"/>
+    <derives-from id="http://suse.com/sled/11.4"/>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-Desktop-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sled9.xml.in b/data/oses/suse/sled9.xml.in
new file mode 100644
index 0000000..2729c48
--- /dev/null
+++ b/data/oses/suse/sled9.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sled/9">
+    <short-id>sled9</short-id>
+    <_name>SUSE Linux Enterprise Desktop 9</_name>
+    <version>9</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles10.xml.in b/data/oses/suse/sles10.xml.in
new file mode 100644
index 0000000..651ce43
--- /dev/null
+++ b/data/oses/suse/sles10.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/10">
+    <short-id>sles10</short-id>
+    <_name>SUSE Linux Enterprise Server 10</_name>
+    <version>10</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/9"/>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles11.xml.in b/data/oses/suse/sles11.xml.in
new file mode 100644
index 0000000..9095611
--- /dev/null
+++ b/data/oses/suse/sles11.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/11">
+    <short-id>sles11</short-id>
+    <_name>SUSE Linux Enterprise Server 11</_name>
+    <version>11</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/10"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles11sp1.xml.in b/data/oses/suse/sles11sp1.xml.in
new file mode 100644
index 0000000..ba6bdae
--- /dev/null
+++ b/data/oses/suse/sles11sp1.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/11.1">
+    <short-id>sles11sp1</short-id>
+    <_name>SUSE Linux Enterprise Server 11 SP1</_name>
+    <version>11.1</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11"/>
+
+    <release-date>2010-06-02</release-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP1-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP1-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles11sp2.xml.in b/data/oses/suse/sles11sp2.xml.in
new file mode 100644
index 0000000..5686026
--- /dev/null
+++ b/data/oses/suse/sles11sp2.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/11.2">
+    <short-id>sles11sp2</short-id>
+    <_name>SUSE Linux Enterprise Server 11 SP2</_name>
+    <version>11.2</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11.1"/>
+
+    <release-date>2012-02-15</release-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP2-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP2-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles11sp3.xml.in b/data/oses/suse/sles11sp3.xml.in
new file mode 100644
index 0000000..7a9654d
--- /dev/null
+++ b/data/oses/suse/sles11sp3.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/11.3">
+    <short-id>sles11sp3</short-id>
+    <_name>SUSE Linux Enterprise Server 11 SP3</_name>
+    <version>11.3</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11.2"/>
+
+    <release-date>2013-07-01</release-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP3-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP3-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles11sp4.xml.in b/data/oses/suse/sles11sp4.xml.in
new file mode 100644
index 0000000..eff4d56
--- /dev/null
+++ b/data/oses/suse/sles11sp4.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/11.4">
+    <short-id>sles11sp4</short-id>
+    <_name>SUSE Linux Enterprise Server 11 SP4</_name>
+    <version>11.4</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11.3"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP4-DVD-i586</volume-id>
+      </iso>
+      <kernel>boot/i386/loader/linux</kernel>
+      <initrd>boot/i386/loader/initrd</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLES-11-SP4-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles12.xml.in b/data/oses/suse/sles12.xml.in
new file mode 100644
index 0000000..872de2a
--- /dev/null
+++ b/data/oses/suse/sles12.xml.in
@@ -0,0 +1,23 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/12">
+    <short-id>sles12</short-id>
+    <_name>SUSE Linux Enterprise Server 12</_name>
+    <version>12</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11.4"/>
+    <derives-from id="http://suse.com/sles/11.4"/>
+
+    <release-date>2014-10-28</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SLE-12-Server-DVD-x86_64</volume-id>
+      </iso>
+      <kernel>boot/x86_64/loader/linux</kernel>
+      <initrd>boot/x86_64/loader/initrd</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/suse/sles9.xml.in b/data/oses/suse/sles9.xml.in
new file mode 100644
index 0000000..4ff884f
--- /dev/null
+++ b/data/oses/suse/sles9.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <os id="http://suse.com/sles/9">
+    <short-id>sles9</short-id>
+    <_name>SUSE Linux Enterprise Server 9</_name>
+    <version>9</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e7ecd3..a090c12 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -265,7 +265,22 @@ data/oses/solaris/opensolaris2009.06.xml.in
 data/oses/solaris/solaris9.xml.in
 data/oses/solaris/solaris10.xml.in
 data/oses/solaris/solaris11.xml.in
-data/oses/suse.xml.in
+data/oses/suse/sled9.xml.in
+data/oses/suse/sled10.xml.in
+data/oses/suse/sled11sp1.xml.in
+data/oses/suse/sled11sp2.xml.in
+data/oses/suse/sled11sp3.xml.in
+data/oses/suse/sled11sp4.xml.in
+data/oses/suse/sled11.xml.in
+data/oses/suse/sled12.xml.in
+data/oses/suse/sles9.xml.in
+data/oses/suse/sles10.xml.in
+data/oses/suse/sles11sp1.xml.in
+data/oses/suse/sles11sp2.xml.in
+data/oses/suse/sles11sp3.xml.in
+data/oses/suse/sles11sp4.xml.in
+data/oses/suse/sles11.xml.in
+data/oses/suse/sles12.xml.in
 data/oses/windows.xml.in
 data/oses/ubuntu.xml.in
 data/devices/qemu-ps2.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:42 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:42 +0100
Subject: [Libosinfo] [PATCH 24/39] data: split ubuntu into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-25-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                        |    1 +
 data/oses/Makefile.am               |    2 +-
 data/oses/ubuntu.xml.in             | 1596 -----------------------------------
 data/oses/ubuntu/Makefile.am        |    1 +
 data/oses/ubuntu/ubuntu10.04.xml.in |   49 ++
 data/oses/ubuntu/ubuntu10.10.xml.in |   69 ++
 data/oses/ubuntu/ubuntu11.04.xml.in |   69 ++
 data/oses/ubuntu/ubuntu11.10.xml.in |   65 ++
 data/oses/ubuntu/ubuntu12.04.xml.in |   67 ++
 data/oses/ubuntu/ubuntu12.10.xml.in |   67 ++
 data/oses/ubuntu/ubuntu13.04.xml.in |   67 ++
 data/oses/ubuntu/ubuntu13.10.xml.in |   67 ++
 data/oses/ubuntu/ubuntu14.04.xml.in |   68 ++
 data/oses/ubuntu/ubuntu14.10.xml.in |   68 ++
 data/oses/ubuntu/ubuntu15.04.xml.in |   68 ++
 data/oses/ubuntu/ubuntu15.10.xml.in |   68 ++
 data/oses/ubuntu/ubuntu4.10.xml.in  |   44 +
 data/oses/ubuntu/ubuntu5.04.xml.in  |   74 ++
 data/oses/ubuntu/ubuntu5.10.xml.in  |  102 +++
 data/oses/ubuntu/ubuntu6.06.xml.in  |  148 ++++
 data/oses/ubuntu/ubuntu6.10.xml.in  |   82 ++
 data/oses/ubuntu/ubuntu7.04.xml.in  |   64 ++
 data/oses/ubuntu/ubuntu7.10.xml.in  |   64 ++
 data/oses/ubuntu/ubuntu8.04.xml.in  |   78 ++
 data/oses/ubuntu/ubuntu8.10.xml.in  |   55 ++
 data/oses/ubuntu/ubuntu9.04.xml.in  |   59 ++
 data/oses/ubuntu/ubuntu9.10.xml.in  |   55 ++
 po/POTFILES.in                      |   24 +-
 28 files changed, 1643 insertions(+), 1598 deletions(-)
 delete mode 100644 data/oses/ubuntu.xml.in
 create mode 100644 data/oses/ubuntu/Makefile.am
 create mode 100644 data/oses/ubuntu/ubuntu10.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu10.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu11.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu11.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu12.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu12.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu13.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu13.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu14.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu14.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu15.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu15.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu4.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu5.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu5.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu6.06.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu6.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu7.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu7.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu8.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu8.10.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu9.04.xml.in
 create mode 100644 data/oses/ubuntu/ubuntu9.10.xml.in

diff --git a/configure.ac b/configure.ac
index a86378c..40c75d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,7 @@ AC_CONFIG_FILES([
 	data/oses/rhl/Makefile
 	data/oses/solaris/Makefile
 	data/oses/suse/Makefile
+	data/oses/ubuntu/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index f9b5876..c1a552f 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -19,11 +19,11 @@ SUBDIRS = \
 	rhl \
 	solaris \
 	suse \
+	ubuntu \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	ubuntu.xml.in   \
 	windows.xml.in  \
 	$(NULL)
 
diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
deleted file mode 100644
index 4624d2c..0000000
--- a/data/oses/ubuntu.xml.in
+++ /dev/null
@@ -1,1596 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://ubuntu.com/ubuntu/4.10">
-    <short-id>ubuntu4.10</short-id>
-    <short-id>ubuntuwarty</short-id>
-    <_name>Ubuntu 4.10</_name>
-    <version>4.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Warty Warthog</codename>
-
-    <release-date>2004-10-26</release-date>
-    <eol-date>2006-04-30</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 4.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/5.04">
-    <short-id>ubuntu5.04</short-id>
-    <short-id>ubuntuhoary</short-id>
-    <_name>Ubuntu 5.04</_name>
-    <version>5.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Hoary Hedgehog</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/4.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/4.10"/>
-
-    <release-date>2005-04-08</release-date>
-    <eol-date>2006-10-31</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.04 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/5.10">
-    <short-id>ubuntu5.10</short-id>
-    <short-id>ubuntubreezy</short-id>
-    <_name>Ubuntu 5.10</_name>
-    <version>5.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Breezy Badger</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
-
-    <release-date>2005-10-12</release-date>
-    <eol-date>2007-04-13</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true" installer="false">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 5.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/6.06">
-    <short-id>ubuntu6.06</short-id>
-    <short-id>ubuntudapper</short-id>
-    <_name>Ubuntu 6.06 LTS</_name>
-    <version>6.06</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Dapper Drake</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/5.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/5.10"/>
-
-    <release-date>2006-06-01</release-date>
-    <eol-date>2011-06-01</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ia64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ia64">
-      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/6.10">
-    <short-id>ubuntu6.10</short-id>
-    <short-id>ubuntuedgy</short-id>
-    <_name>Ubuntu 6.10</_name>
-    <version>6.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Edgy Eft</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/6.06"/>
-    <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
-
-    <release-date>2006-10-26</release-date>
-    <eol-date>2008-04-26</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 6.10 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="ppc" live="true">
-      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso</url>
-      <iso>
-        <volume-id>Ubuntu 6.10 ppc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/7.04">
-    <short-id>ubuntu7.04</short-id>
-    <short-id>ubuntufeisty</short-id>
-    <_name>Ubuntu 7.04</_name>
-    <version>7.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Feisty Fawn</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/6.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/6.10"/>
-
-    <release-date>2007-04-19</release-date>
-    <eol-date>2008-10-19</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.04 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/7.10">
-    <short-id>ubuntu7.10</short-id>
-    <short-id>ubuntugutsy</short-id>
-    <_name>Ubuntu 7.10</_name>
-    <version>7.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Gutsy Gibbon</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/7.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/7.04"/>
-
-    <release-date>2007-10-18</release-date>
-    <eol-date>2009-04-18</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="sparc">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 7.10 sparc</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 7.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/8.04">
-    <short-id>ubuntu8.04</short-id>
-    <short-id>ubuntuhardy</short-id>
-    <_name>Ubuntu 8.04 LTS</_name>
-    <version>8.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Hardy Heron</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/7.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
-
-    <release-date>2008-04-24</release-date>
-    <eol-date>2013-05-09</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-    </devices>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/8.10">
-    <short-id>ubuntu8.10</short-id>
-    <short-id>ubuntuintrepid</short-id>
-    <_name>Ubuntu 8.10</_name>
-    <version>8.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Intrepid Ibex</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/8.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/8.04"/>
-
-    <release-date>2008-10-30</release-date>
-    <eol-date>2010-04-30</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 8.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 8.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/9.04">
-    <short-id>ubuntu9.04</short-id>
-    <short-id>ubuntujaunty</short-id>
-    <_name>Ubuntu 9.04</_name>
-    <version>9.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Jaunty Jackalope</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/8.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/8.10"/>
-
-    <release-date>2009-04-23</release-date>
-    <eol-date>2010-10-23</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/9.10">
-    <short-id>ubuntu9.10</short-id>
-    <short-id>ubuntukarmic</short-id>
-    <_name>Ubuntu 9.10</_name>
-    <version>9.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Karmic Koala</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/9.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/9.04"/>
-
-    <release-date>2009-10-29</release-date>
-    <eol-date>2011-04-30</eol-date>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 9.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 9.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/10.04">
-    <short-id>ubuntu10.04</short-id>
-    <short-id>ubuntulucid</short-id>
-    <_name>Ubuntu 10.04 LTS</_name>
-    <version>10.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Lucid Lynx</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/9.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
-
-    <release-date>2010-04-29</release-date>
-    <eol-date>2015-04-30</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-    <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>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/10.10">
-    <short-id>ubuntu10.10</short-id>
-    <short-id>ubuntumaverick</short-id>
-    <_name>Ubuntu 10.10</_name>
-    <version>10.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Maverick Meerkat</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/10.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
-
-    <release-date>2010-10-10</release-date>
-    <eol-date>2012-04-10</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 10.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 10.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.10 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 10.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/11.04">
-    <short-id>ubuntu11.04</short-id>
-    <short-id>ubuntunatty</short-id>
-    <_name>Ubuntu 11.04</_name>
-    <version>11.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Natty Narwhal</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/10.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
-
-    <release-date>2011-04-28</release-date>
-    <eol-date>2012-10-28</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.04 i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.04 amd64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/11.10">
-    <short-id>ubuntu11.10</short-id>
-    <short-id>ubuntuoneiric</short-id>
-    <_name>Ubuntu 11.10</_name>
-    <version>11.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Oneiric Ocelot</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/11.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
-
-    <release-date>2011-10-13</release-date>
-    <eol-date>2013-05-09</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 11.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/12.04">
-    <short-id>ubuntu12.04</short-id>
-    <short-id>ubuntuprecise</short-id>
-    <_name>Ubuntu 12.04 LTS</_name>
-    <version>12.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Precise Pangolin</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/11.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/11.10"/>
-
-    <release-date>2012-04-26</release-date>
-    <eol-date>2017-04-26</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>536870912</ram>
-        <storage>5368709120</storage>
-      </recommended>
-    </resources>
-    <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>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <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>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/12.10">
-    <short-id>ubuntu12.10</short-id>
-    <short-id>ubuntuquantal</short-id>
-    <_name>Ubuntu 12.10</_name>
-    <version>12.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Quantal Quetzal</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/12.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/12.04"/>
-
-    <release-date>2012-10-18</release-date>
-    <eol-date>2014-05-16</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 12.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/13.04">
-    <short-id>ubuntu13.04</short-id>
-    <short-id>ubunturaring</short-id>
-    <_name>Ubuntu 13.04</_name>
-    <version>13.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Raring Ringtail</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/12.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/12.10"/>
-
-    <release-date>2013-04-25</release-date>
-    <eol-date>2014-01-27</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 13.04 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 13.04 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 13.04 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 13.04 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/13.10">
-    <short-id>ubuntu13.10</short-id>
-    <short-id>ubuntusaucy</short-id>
-    <_name>Ubuntu 13.10</_name>
-    <version>13.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Saucy Salamander</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/13.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/13.04"/>
-
-    <release-date>2013-10-17</release-date>
-    <eol-date>2014-07-17</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-    <media arch="i686">
-      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 13.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 13.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 13.10 i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 13.10 amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/14.04">
-    <short-id>ubuntu14.04</short-id>
-    <short-id>ubuntutrusty</short-id>
-    <_name>Ubuntu 14.04 LTS</_name>
-    <version>14.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Trusty Tahr</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/13.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/13.10"/>
-
-    <release-date>2014-04-17</release-date>
-    <eol-date>2019-04-17</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/14.10">
-    <short-id>ubuntu14.10</short-id>
-    <short-id>ubuntututopic</short-id>
-    <_name>Ubuntu 14.10</_name>
-    <version>14.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Utopic Unicorn</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/14.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/14.04"/>
-
-    <release-date>2014-10-23</release-date>
-    <eol-date>2015-07-23</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 14.10(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/15.04">
-    <short-id>ubuntu15.04</short-id>
-    <short-id>ubuntutvivid</short-id>
-    <_name>Ubuntu 15.04</_name>
-    <version>15.04</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Vivid Vervet</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/14.10"/>
-    <derives-from id="http://ubuntu.com/ubuntu/14.10"/>
-
-    <release-date>2015-04-23</release-date>
-    <eol-date>2016-01-23</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 15.04(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://ubuntu.com/ubuntu/15.10">
-    <short-id>ubuntu15.10</short-id>
-    <short-id>ubuntutwily</short-id>
-    <_name>Ubuntu 15.10</_name>
-    <version>15.10</version>
-    <_vendor>Canonical Ltd</_vendor>
-    <family>linux</family>
-    <distro>ubuntu</distro>
-    <codename>Wily Werewolf</codename>
-    <upgrades id="http://ubuntu.com/ubuntu/15.04"/>
-    <derives-from id="http://ubuntu.com/ubuntu/15.04"/>
-
-    <release-date>2015-10-22</release-date>
-    <eol-date>2016-07-22</eol-date>
-
-    <resources arch="all">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>5368709120</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>16106127360</storage>
-      </recommended>
-    </resources>
-
-    <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-i386.iso</url>
-      <iso>
-        <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-amd64.iso</url>
-      <iso>
-        <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
-      </iso>
-      <kernel>casper/vmlinuz</kernel>
-      <initrd>casper/initrd.img</initrd>
-    </media>
-
-    <installer>
-      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
-    </installer>
-  </os>
-</libosinfo>
diff --git a/data/oses/ubuntu/Makefile.am b/data/oses/ubuntu/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/ubuntu/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/ubuntu/ubuntu10.04.xml.in b/data/oses/ubuntu/ubuntu10.04.xml.in
new file mode 100644
index 0000000..1b69a53
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu10.04.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/10.04">
+    <short-id>ubuntu10.04</short-id>
+    <short-id>ubuntulucid</short-id>
+    <_name>Ubuntu 10.04 LTS</_name>
+    <version>10.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Lucid Lynx</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/9.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
+
+    <release-date>2010-04-29</release-date>
+    <eol-date>2015-04-30</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu10.10.xml.in b/data/oses/ubuntu/ubuntu10.10.xml.in
new file mode 100644
index 0000000..0bd9270
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu10.10.xml.in
@@ -0,0 +1,69 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/10.10">
+    <short-id>ubuntu10.10</short-id>
+    <short-id>ubuntumaverick</short-id>
+    <_name>Ubuntu 10.10</_name>
+    <version>10.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Maverick Meerkat</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/10.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
+
+    <release-date>2010-10-10</release-date>
+    <eol-date>2012-04-10</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 10.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 10.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.10 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 10.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu11.04.xml.in b/data/oses/ubuntu/ubuntu11.04.xml.in
new file mode 100644
index 0000000..ab7e0a1
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu11.04.xml.in
@@ -0,0 +1,69 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/11.04">
+    <short-id>ubuntu11.04</short-id>
+    <short-id>ubuntunatty</short-id>
+    <_name>Ubuntu 11.04</_name>
+    <version>11.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Natty Narwhal</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/10.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
+
+    <release-date>2011-04-28</release-date>
+    <eol-date>2012-10-28</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.04 i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu11.10.xml.in b/data/oses/ubuntu/ubuntu11.10.xml.in
new file mode 100644
index 0000000..0ca88cf
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu11.10.xml.in
@@ -0,0 +1,65 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/11.10">
+    <short-id>ubuntu11.10</short-id>
+    <short-id>ubuntuoneiric</short-id>
+    <_name>Ubuntu 11.10</_name>
+    <version>11.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Oneiric Ocelot</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/11.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
+
+    <release-date>2011-10-13</release-date>
+    <eol-date>2013-05-09</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 11.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu12.04.xml.in b/data/oses/ubuntu/ubuntu12.04.xml.in
new file mode 100644
index 0000000..fa8ad2b
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu12.04.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/12.04">
+    <short-id>ubuntu12.04</short-id>
+    <short-id>ubuntuprecise</short-id>
+    <_name>Ubuntu 12.04 LTS</_name>
+    <version>12.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Precise Pangolin</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/11.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/11.10"/>
+
+    <release-date>2012-04-26</release-date>
+    <eol-date>2017-04-26</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>536870912</ram>
+        <storage>5368709120</storage>
+      </recommended>
+    </resources>
+    <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>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <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>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu12.10.xml.in b/data/oses/ubuntu/ubuntu12.10.xml.in
new file mode 100644
index 0000000..2a081fa
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu12.10.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/12.10">
+    <short-id>ubuntu12.10</short-id>
+    <short-id>ubuntuquantal</short-id>
+    <_name>Ubuntu 12.10</_name>
+    <version>12.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Quantal Quetzal</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/12.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/12.04"/>
+
+    <release-date>2012-10-18</release-date>
+    <eol-date>2014-05-16</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 12.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/quantal/ubuntu-12.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 12.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu13.04.xml.in b/data/oses/ubuntu/ubuntu13.04.xml.in
new file mode 100644
index 0000000..f1964b8
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu13.04.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/13.04">
+    <short-id>ubuntu13.04</short-id>
+    <short-id>ubunturaring</short-id>
+    <_name>Ubuntu 13.04</_name>
+    <version>13.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Raring Ringtail</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/12.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/12.10"/>
+
+    <release-date>2013-04-25</release-date>
+    <eol-date>2014-01-27</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 13.04 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 13.04 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 13.04 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/raring/ubuntu-13.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 13.04 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu13.10.xml.in b/data/oses/ubuntu/ubuntu13.10.xml.in
new file mode 100644
index 0000000..970f839
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu13.10.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/13.10">
+    <short-id>ubuntu13.10</short-id>
+    <short-id>ubuntusaucy</short-id>
+    <_name>Ubuntu 13.10</_name>
+    <version>13.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Saucy Salamander</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/13.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/13.04"/>
+
+    <release-date>2013-10-17</release-date>
+    <eol-date>2014-07-17</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+    <media arch="i686">
+      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 13.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 13.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 13.10 i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/saucy/ubuntu-13.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 13.10 amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu14.04.xml.in b/data/oses/ubuntu/ubuntu14.04.xml.in
new file mode 100644
index 0000000..7c5f82a
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu14.04.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/14.04">
+    <short-id>ubuntu14.04</short-id>
+    <short-id>ubuntutrusty</short-id>
+    <_name>Ubuntu 14.04 LTS</_name>
+    <version>14.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Trusty Tahr</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/13.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/13.10"/>
+
+    <release-date>2014-04-17</release-date>
+    <eol-date>2019-04-17</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu14.10.xml.in b/data/oses/ubuntu/ubuntu14.10.xml.in
new file mode 100644
index 0000000..155d55b
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu14.10.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/14.10">
+    <short-id>ubuntu14.10</short-id>
+    <short-id>ubuntututopic</short-id>
+    <_name>Ubuntu 14.10</_name>
+    <version>14.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Utopic Unicorn</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/14.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/14.04"/>
+
+    <release-date>2014-10-23</release-date>
+    <eol-date>2015-07-23</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 14.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu15.04.xml.in b/data/oses/ubuntu/ubuntu15.04.xml.in
new file mode 100644
index 0000000..69569a9
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu15.04.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/15.04">
+    <short-id>ubuntu15.04</short-id>
+    <short-id>ubuntutvivid</short-id>
+    <_name>Ubuntu 15.04</_name>
+    <version>15.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Vivid Vervet</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/14.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/14.10"/>
+
+    <release-date>2015-04-23</release-date>
+    <eol-date>2016-01-23</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.04(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu15.10.xml.in b/data/oses/ubuntu/ubuntu15.10.xml.in
new file mode 100644
index 0000000..71afa2c
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu15.10.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/15.10">
+    <short-id>ubuntu15.10</short-id>
+    <short-id>ubuntutwily</short-id>
+    <_name>Ubuntu 15.10</_name>
+    <version>15.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Wily Werewolf</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/15.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/15.04"/>
+
+    <release-date>2015-10-22</release-date>
+    <eol-date>2016-07-22</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>16106127360</storage>
+      </recommended>
+    </resources>
+
+    <media arch="i686">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="i686" live="true">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-i386.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <installer>
+      <script id='http://ubuntu.com/scripts/ubuntu/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu4.10.xml.in b/data/oses/ubuntu/ubuntu4.10.xml.in
new file mode 100644
index 0000000..db7601a
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu4.10.xml.in
@@ -0,0 +1,44 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/4.10">
+    <short-id>ubuntu4.10</short-id>
+    <short-id>ubuntuwarty</short-id>
+    <_name>Ubuntu 4.10</_name>
+    <version>4.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Warty Warthog</codename>
+
+    <release-date>2004-10-26</release-date>
+    <eol-date>2006-04-30</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/warty/warty-release-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 4.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu5.04.xml.in b/data/oses/ubuntu/ubuntu5.04.xml.in
new file mode 100644
index 0000000..d83bb0b
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu5.04.xml.in
@@ -0,0 +1,74 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/5.04">
+    <short-id>ubuntu5.04</short-id>
+    <short-id>ubuntuhoary</short-id>
+    <_name>Ubuntu 5.04</_name>
+    <version>5.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Hoary Hedgehog</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/4.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/4.10"/>
+
+    <release-date>2005-04-08</release-date>
+    <eol-date>2006-10-31</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-install-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/hoary/ubuntu-5.04-live-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.04 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu5.10.xml.in b/data/oses/ubuntu/ubuntu5.10.xml.in
new file mode 100644
index 0000000..ec7f2dc
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu5.10.xml.in
@@ -0,0 +1,102 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/5.10">
+    <short-id>ubuntu5.10</short-id>
+    <short-id>ubuntubreezy</short-id>
+    <_name>Ubuntu 5.10</_name>
+    <version>5.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Breezy Badger</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
+
+    <release-date>2005-10-12</release-date>
+    <eol-date>2007-04-13</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-install-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true" installer="false">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-live-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/breezy/ubuntu-5.10-dvd-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 5.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu6.06.xml.in b/data/oses/ubuntu/ubuntu6.06.xml.in
new file mode 100644
index 0000000..d4cdb1d
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu6.06.xml.in
@@ -0,0 +1,148 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/6.06">
+    <short-id>ubuntu6.06</short-id>
+    <short-id>ubuntudapper</short-id>
+    <_name>Ubuntu 6.06 LTS</_name>
+    <version>6.06</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Dapper Drake</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/5.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/5.10"/>
+
+    <release-date>2006-06-01</release-date>
+    <eol-date>2011-06-01</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ia64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ia64">
+      <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu6.10.xml.in b/data/oses/ubuntu/ubuntu6.10.xml.in
new file mode 100644
index 0000000..da6160b
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu6.10.xml.in
@@ -0,0 +1,82 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/6.10">
+    <short-id>ubuntu6.10</short-id>
+    <short-id>ubuntuedgy</short-id>
+    <_name>Ubuntu 6.10</_name>
+    <version>6.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Edgy Eft</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/6.06"/>
+    <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
+
+    <release-date>2006-10-26</release-date>
+    <eol-date>2008-04-26</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 6.10 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="ppc" live="true">
+      <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-desktop-powerpc.iso</url>
+      <iso>
+        <volume-id>Ubuntu 6.10 ppc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu7.04.xml.in b/data/oses/ubuntu/ubuntu7.04.xml.in
new file mode 100644
index 0000000..c41ba0d
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu7.04.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/7.04">
+    <short-id>ubuntu7.04</short-id>
+    <short-id>ubuntufeisty</short-id>
+    <_name>Ubuntu 7.04</_name>
+    <version>7.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Feisty Fawn</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/6.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/6.10"/>
+
+    <release-date>2007-04-19</release-date>
+    <eol-date>2008-10-19</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.04 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.04 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu7.10.xml.in b/data/oses/ubuntu/ubuntu7.10.xml.in
new file mode 100644
index 0000000..cf3fbf4
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu7.10.xml.in
@@ -0,0 +1,64 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/7.10">
+    <short-id>ubuntu7.10</short-id>
+    <short-id>ubuntugutsy</short-id>
+    <_name>Ubuntu 7.10</_name>
+    <version>7.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Gutsy Gibbon</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/7.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/7.04"/>
+
+    <release-date>2007-10-18</release-date>
+    <eol-date>2009-04-18</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="sparc">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 7.10 sparc</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 7.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu8.04.xml.in b/data/oses/ubuntu/ubuntu8.04.xml.in
new file mode 100644
index 0000000..f3b5c01
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu8.04.xml.in
@@ -0,0 +1,78 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/8.04">
+    <short-id>ubuntu8.04</short-id>
+    <short-id>ubuntuhardy</short-id>
+    <_name>Ubuntu 8.04 LTS</_name>
+    <version>8.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Hardy Heron</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/7.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
+
+    <release-date>2008-04-24</release-date>
+    <eol-date>2013-05-09</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+    </devices>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu8.10.xml.in b/data/oses/ubuntu/ubuntu8.10.xml.in
new file mode 100644
index 0000000..37399f0
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu8.10.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/8.10">
+    <short-id>ubuntu8.10</short-id>
+    <short-id>ubuntuintrepid</short-id>
+    <_name>Ubuntu 8.10</_name>
+    <version>8.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Intrepid Ibex</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/8.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/8.04"/>
+
+    <release-date>2008-10-30</release-date>
+    <eol-date>2010-04-30</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 8.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 8.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu9.04.xml.in b/data/oses/ubuntu/ubuntu9.04.xml.in
new file mode 100644
index 0000000..905c2c9
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu9.04.xml.in
@@ -0,0 +1,59 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/9.04">
+    <short-id>ubuntu9.04</short-id>
+    <short-id>ubuntujaunty</short-id>
+    <_name>Ubuntu 9.04</_name>
+    <version>9.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Jaunty Jackalope</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/8.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/8.10"/>
+
+    <release-date>2009-04-23</release-date>
+    <eol-date>2010-10-23</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/ubuntu/ubuntu9.10.xml.in b/data/oses/ubuntu/ubuntu9.10.xml.in
new file mode 100644
index 0000000..6ea48b2
--- /dev/null
+++ b/data/oses/ubuntu/ubuntu9.10.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://ubuntu.com/ubuntu/9.10">
+    <short-id>ubuntu9.10</short-id>
+    <short-id>ubuntukarmic</short-id>
+    <_name>Ubuntu 9.10</_name>
+    <version>9.10</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Karmic Koala</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/9.04"/>
+    <derives-from id="http://ubuntu.com/ubuntu/9.04"/>
+
+    <release-date>2009-10-29</release-date>
+    <eol-date>2011-04-30</eol-date>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 9.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+
+    <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>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-desktop-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu 9.10 amd64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd.img</initrd>
+    </media>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a090c12..c2479e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -281,8 +281,30 @@ data/oses/suse/sles11sp3.xml.in
 data/oses/suse/sles11sp4.xml.in
 data/oses/suse/sles11.xml.in
 data/oses/suse/sles12.xml.in
+data/oses/ubuntu/ubuntu4.10.xml.in
+data/oses/ubuntu/ubuntu5.04.xml.in
+data/oses/ubuntu/ubuntu5.10.xml.in
+data/oses/ubuntu/ubuntu6.06.xml.in
+data/oses/ubuntu/ubuntu6.10.xml.in
+data/oses/ubuntu/ubuntu7.04.xml.in
+data/oses/ubuntu/ubuntu7.10.xml.in
+data/oses/ubuntu/ubuntu8.04.xml.in
+data/oses/ubuntu/ubuntu8.10.xml.in
+data/oses/ubuntu/ubuntu9.04.xml.in
+data/oses/ubuntu/ubuntu9.10.xml.in
+data/oses/ubuntu/ubuntu10.04.xml.in
+data/oses/ubuntu/ubuntu10.10.xml.in
+data/oses/ubuntu/ubuntu11.04.xml.in
+data/oses/ubuntu/ubuntu11.10.xml.in
+data/oses/ubuntu/ubuntu12.04.xml.in
+data/oses/ubuntu/ubuntu12.10.xml.in
+data/oses/ubuntu/ubuntu13.04.xml.in
+data/oses/ubuntu/ubuntu13.10.xml.in
+data/oses/ubuntu/ubuntu14.04.xml.in
+data/oses/ubuntu/ubuntu14.10.xml.in
+data/oses/ubuntu/ubuntu15.04.xml.in
+data/oses/ubuntu/ubuntu15.10.xml.in
 data/oses/windows.xml.in
-data/oses/ubuntu.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:43 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:43 +0100
Subject: [Libosinfo] [PATCH 25/39] data: split windows into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-26-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                       |    1 +
 data/oses/Makefile.am              |   12 +-
 data/oses/windows.xml.in           | 1357 ------------------------------------
 data/oses/windows/Makefile.am      |    1 +
 data/oses/windows/win1.0.xml.in    |   13 +
 data/oses/windows/win10.xml.in     |   63 ++
 data/oses/windows/win2.0.xml.in    |   15 +
 data/oses/windows/win2.1.xml.in    |   15 +
 data/oses/windows/win2k.xml.in     |   49 ++
 data/oses/windows/win2k12.xml.in   |   68 ++
 data/oses/windows/win2k12r2.xml.in |   67 ++
 data/oses/windows/win2k3.xml.in    |   72 ++
 data/oses/windows/win2k3r2.xml.in  |   65 ++
 data/oses/windows/win2k8.xml.in    |   65 ++
 data/oses/windows/win2k8r2.xml.in  |   50 ++
 data/oses/windows/win3.1.xml.in    |   15 +
 data/oses/windows/win7.xml.in      |  231 ++++++
 data/oses/windows/win8.1.xml.in    |  149 ++++
 data/oses/windows/win8.xml.in      |   59 ++
 data/oses/windows/win95.xml.in     |   30 +
 data/oses/windows/win98.xml.in     |   28 +
 data/oses/windows/winme.xml.in     |   28 +
 data/oses/windows/winnt3.1.xml.in  |   12 +
 data/oses/windows/winnt3.5.xml.in  |   15 +
 data/oses/windows/winnt3.51.xml.in |   15 +
 data/oses/windows/winnt4.0.xml.in  |   15 +
 data/oses/windows/winvista.xml.in  |   49 ++
 data/oses/windows/winxp.xml.in     |  113 +++
 po/POTFILES.in                     |   25 +-
 29 files changed, 1328 insertions(+), 1369 deletions(-)
 delete mode 100644 data/oses/windows.xml.in
 create mode 100644 data/oses/windows/Makefile.am
 create mode 100644 data/oses/windows/win1.0.xml.in
 create mode 100644 data/oses/windows/win10.xml.in
 create mode 100644 data/oses/windows/win2.0.xml.in
 create mode 100644 data/oses/windows/win2.1.xml.in
 create mode 100644 data/oses/windows/win2k.xml.in
 create mode 100644 data/oses/windows/win2k12.xml.in
 create mode 100644 data/oses/windows/win2k12r2.xml.in
 create mode 100644 data/oses/windows/win2k3.xml.in
 create mode 100644 data/oses/windows/win2k3r2.xml.in
 create mode 100644 data/oses/windows/win2k8.xml.in
 create mode 100644 data/oses/windows/win2k8r2.xml.in
 create mode 100644 data/oses/windows/win3.1.xml.in
 create mode 100644 data/oses/windows/win7.xml.in
 create mode 100644 data/oses/windows/win8.1.xml.in
 create mode 100644 data/oses/windows/win8.xml.in
 create mode 100644 data/oses/windows/win95.xml.in
 create mode 100644 data/oses/windows/win98.xml.in
 create mode 100644 data/oses/windows/winme.xml.in
 create mode 100644 data/oses/windows/winnt3.1.xml.in
 create mode 100644 data/oses/windows/winnt3.5.xml.in
 create mode 100644 data/oses/windows/winnt3.51.xml.in
 create mode 100644 data/oses/windows/winnt4.0.xml.in
 create mode 100644 data/oses/windows/winvista.xml.in
 create mode 100644 data/oses/windows/winxp.xml.in

diff --git a/configure.ac b/configure.ac
index 40c75d3..3e3968b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ AC_CONFIG_FILES([
 	data/oses/solaris/Makefile
 	data/oses/suse/Makefile
 	data/oses/ubuntu/Makefile
+	data/oses/windows/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index c1a552f..9306db0 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -20,15 +20,5 @@ SUBDIRS = \
 	solaris \
 	suse \
 	ubuntu \
+	windows \
 	$(NULL)
-
-databasedir = $(pkgdatadir)/db/oses/
-database_in_files =	\
-	windows.xml.in  \
-	$(NULL)
-
-database_DATA = $(database_in_files:.xml.in=.xml)
-
- at INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
deleted file mode 100644
index bbe1852..0000000
--- a/data/oses/windows.xml.in
+++ /dev/null
@@ -1,1357 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <!--
-
-      The upgrade/derives relationship for Windows is more complex than
-      you might think, because of the merge/fork between WinME/XP/2k/2k3:
-
-
-   Win1.0 (Nov 1985)
-     |
-     | U, D
-     |
-     V
-   Win2.0 (Dec 1987)
-     |
-     | U, D
-     |
-     V
-   Win2.1 (May 1988)
-     |
-     | U, D
-     |
-     V
-   Win3.0 (May 1990)
-     |
-     | U, D
-     |
-     V
-   Win3.1 (Apr 1992)            WinNT3.1  (July 1993)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     |                            V
-     |                          WinNT3.4  (Sept 1994)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win95 (Aug 1995)             WinNT3.51 (May 1995)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            V
-   Win98 (Jun 1998)             WinNT4.0 (Aug 1996)
-     |                            |
-     | U, D                       | U, D
-     |                            |
-     V                            |
-   WinME (Sep 2000)             Win2k  (Feb 2000)
-     |                           ||
-     \======+====================/| U, D
-       U    |  D                  |
-            V                     V
-          WinXP (Aug 2001)      Win2k3  (April 2003)
-            |                     |
-            | UD                  | U, D
-            |                     |
-            V                     V
-          WinVista (Jan 2007)   Win2k3r2 (Dec 2005)
-            |                     |
-            | U, D                | U, D
-            |                     |
-            |                     V
-            |                   Win2k8  (Feb 2008)
-            |                     |
-            |                     | U, D
-            |                     |
-            |                     V
-          Win7 (Oct 2009)       Win2k8r2 (Oct 2009)
-            |                     |
-            | U,D                 | U, D
-            |                     |
-            V                     V
-          Win8 (??? 2012)       ??????
-
-  -->
-
-  <os id="http://microsoft.com/win/1.0">
-    <short-id>win1.0</short-id>
-    <_name>Microsoft Windows 1.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>1.0</version>
-
-    <release-date>1985-11-20</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.0">
-    <short-id>win2.0</short-id>
-    <_name>Microsoft Windows 2.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.0</version>
-    <upgrades id="http://microsoft.com/win/1.0"/>
-    <derives-from id="http://microsoft.com/win/1.0"/>
-
-    <release-date>1987-12-09</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/2.1">
-    <short-id>win2.1</short-id>
-    <_name>Microsoft Windows 2.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>2.1</version>
-    <upgrades id="http://microsoft.com/win/2.0"/>
-    <derives-from id="http://microsoft.com/win/2.0"/>
-
-    <release-date>1988-05-27</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/3.1">
-    <short-id>win3.1</short-id>
-    <_name>Microsoft Windows 3.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win16</family>
-    <distro>win</distro>
-    <version>3.1</version>
-    <upgrades id="http://microsoft.com/win/2.1"/>
-    <derives-from id="http://microsoft.com/win/2.1"/>
-
-    <release-date>1992-04-06</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.1">
-    <short-id>winnt3.1</short-id>
-    <_name>Microsoft Windows NT Server 3.1</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.1</version>
-    <release-date>1993-07-27</release-date>
-    <eol-date>2000-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.5">
-    <short-id>winnt3.5</short-id>
-    <_name>Microsoft Windows NT Server 3.5</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.5</version>
-    <upgrades id="http://microsoft.com/winnt/3.1"/>
-    <derives-from id="http://microsoft.com/winnt/3.1"/>
-
-    <release-date>1994-09-21</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/3.51">
-    <short-id>winnt3.51</short-id>
-    <_name>Microsoft Windows NT Server 3.51</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>3.51</version>
-    <upgrades id="http://microsoft.com/winnt/3.5"/>
-    <derives-from id="http://microsoft.com/winnt/3.5"/>
-
-    <release-date>1995-05-30</release-date>
-    <eol-date>2001-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/winnt/4.0">
-    <short-id>winnt4.0</short-id>
-    <_name>Microsoft Windows NT Server 4.0</_name>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>winnt</distro>
-    <version>4.0</version>
-    <upgrades id="http://microsoft.com/winnt/3.51"/>
-    <derives-from id="http://microsoft.com/winnt/3.51"/>
-
-    <release-date>1996-08-24</release-date>
-    <eol-date>2004-12-31</eol-date>
-  </os>
-
-  <os id="http://microsoft.com/win/95">
-    <short-id>win95</short-id>
-    <_name>Microsoft Windows 95</_name>
-    <version>4.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <upgrades id="http://microsoft.com/win/3.1"/>
-    <derives-from id="http://microsoft.com/win/3.1"/>
-
-    <release-date>1995-08-24</release-date>
-    <eol-date>2001-12-13</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
-    </devices>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>12000000</cpu>
-        <ram>4194304</ram>
-        <storage>41943040</storage>
-      </minimum>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/98">
-    <short-id>win98</short-id>
-    <_name>Microsoft Windows 98</_name>
-    <version>4.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/95"/>
-    <upgrades id="http://microsoft.com/win/95"/>
-
-    <release-date>1998-06-25</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>66000000</cpu>
-        <ram>16777216</ram>
-        <storage>125829120</storage>
-      </minimum>
-      <recommended>
-        <cpu>233000000</cpu>
-        <ram>25165824</ram>
-        <storage>419430400</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <os id="http://microsoft.com/win/me">
-    <short-id>winme</short-id>
-    <_name>Microsoft Windows Millennium Edition</_name>
-    <version>4.9</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>win9x</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/98"/>
-    <upgrades id="http://microsoft.com/win/98"/>
-
-    <release-date>2000-09-14</release-date>
-    <eol-date>2006-07-11</eol-date>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>150000000</cpu>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>67108864</ram>
-        <storage>2147483648</storage>
-      </recommended>
-    </resources>
-  </os>
-
-
-  <os id="http://microsoft.com/win/2k">
-    <short-id>win2k</short-id>
-    <_name>Microsoft Windows 2000</_name>
-    <version>5.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/me"/>
-
-    <release-date>2000-02-17</release-date>
-    <eol-date>2010-07-13</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
-    </devices>
-
-    <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>
-      </iso>
-    </media>
-
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>33554432</ram>
-        <storage>335544320</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>350000000</cpu>
-        <ram>100663296</ram>
-        <storage>1073741824</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-    </installer>
-  </os>
-
-
-  <os id="http://microsoft.com/win/xp">
-    <short-id>winxp</short-id>
-    <_name>Microsoft Windows XP</_name>
-    <version>5.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <derives-from id="http://microsoft.com/win/me"/>
-    <upgrades id="http://microsoft.com/win/me"/>
-
-    <release-date>2001-10-25</release-date>
-    <eol-date>2009-04-19</eol-date>
-
-    <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>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>233000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>67108864</ram>
-        <storage>1610612736</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>300000000</cpu>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>733000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>268435456</ram>
-        <storage>1610612736</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>733000000</cpu>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <!-- For now we require this for pre-installation but we should probably generate this too -->
-      <file>txtsetup.oem</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </driver>
-
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <!-- For now we require this for pre-installation but we should probably generate this too -->
-      <file>txtsetup.oem</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </driver>
-
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
-    </driver>
-
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
-    </driver>
-  </os>
-
-  <os id="http://microsoft.com/win/2k3">
-    <short-id>win2k3</short-id>
-    <_name>Microsoft Windows Server 2003</_name>
-    <version>5.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k"/>
-    <upgrades id="http://microsoft.com/win/2k"/>
-
-    <release-date>2003-04-24</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <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>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k3r2">
-    <short-id>win2k3r2</short-id>
-    <_name>Microsoft Windows Server 2003 R2</_name>
-    <version>5.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3"/>
-    <upgrades id="http://microsoft.com/win/2k3"/>
-
-    <release-date>2005-12-06</release-date>
-    <eol-date>2015-07-14</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>133000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>134217728</ram>
-        <storage>2147483648</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>550000000</cpu>
-        <ram>268435456</ram>
-        <storage>4294967296</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1500000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>4294967296</storage>
-      </minimum>
-
-      <recommended>
-        <storage>8589934592</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/sif/jeos'/>
-      <script id='http://microsoft.com/windows/sif/desktop'/>
-      <script id='http://microsoft.com/windows/reg/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8">
-    <short-id>win2k8</short-id>
-    <_name>Microsoft Windows Server 2008</_name>
-    <version>6.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k3r2"/>
-    <upgrades id="http://microsoft.com/win/2k3r2"/>
-
-    <release-date>2008-02-27</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/2k8r2">
-    <short-id>win2k8r2</short-id>
-    <_name>Microsoft Windows Server 2008 R2</_name>
-    <version>6.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k8"/>
-    <upgrades id="http://microsoft.com/win/2k8"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2013-07-09</eol-date>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="ia64">
-      <iso>
-        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1400000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>2000000000</cpu>
-        <ram>2147483648</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/vista">
-    <short-id>winvista</short-id>
-    <_name>Microsoft Windows Vista</_name>
-    <version>6.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/xp"/>
-    <upgrades id="http://microsoft.com/win/xp"/>
-
-    <release-date>2006-11-30</release-date>
-    <eol-date>2012-04-10</eol-date>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_</volume-id>
-       <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-
-    <resources arch="all">
-      <minimum>
-        <cpu>800000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-        <storage>16106127360</storage>
-      </minimum>
-      <recommended>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>42949672960</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/7">
-    <short-id>win7</short-id>
-    <_name>Microsoft Windows 7</_name>
-    <version>6.1</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/vista"/>
-    <upgrades id="http://microsoft.com/win/vista"/>
-
-    <release-date>2009-10-22</release-date>
-    <eol-date>2015-01-13</eol-date>
-
-    <variant id="debug">
-      <_name>Microsoft Windows 7 Debug Checked Build</_name>
-    </variant>
-    <variant id="starter">
-      <_name>Microsoft Windows 7 Starter</_name>
-    </variant>
-    <variant id="home-basic">
-      <_name>Microsoft Windows 7 Home Basic</_name>
-    </variant>
-    <variant id="home-premium">
-      <_name>Microsoft Windows 7 Home Premium</_name>
-    </variant>
-    <variant id="professional">
-      <_name>Microsoft Windows 7 Professional</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 7 Enterprise</_name>
-    </variant>
-    <variant id="ultimate">
-      <_name>Microsoft Windows 7 Ultimate</_name>
-    </variant>
-
-    <!-- Debug -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(GRMCCHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(GRMCXCHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Starter -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="starter"/>
-      <iso>
-        <volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Home Basic -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="home-basic"/>
-      <iso>
-        <volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Home Premium -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="home-premium"/>
-      <iso>
-        <volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="home-premium"/>
-      <iso>
-        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Professional -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Ultimate -->
-    <media arch="i686" installer-reboots="2">
-      <variant id="ultimate"/>
-      <iso>
-        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <variant id="ultimate"/>
-      <iso>
-        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Variant unknown -->
-    <media arch="i686" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCPRFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64" installer-reboots="2">
-      <iso>
-        <volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-      <script id='http://microsoft.com/windows/cmd/desktop'/>
-    </installer>
-
-    <!-- virtio block device driver -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </driver>
-
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/amd64" pre-installable="true" signed="false">
-      <file>viostor.cat</file>
-      <file>viostor.inf</file>
-      <file>viostor.sys</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </driver>
-
-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
-    </driver>
-
-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
-      <file>spice-guest-tools-0.65.exe</file>
-      <file>spice-guest-tools-0.65.cmd</file>
-      <file>redhat09.cer</file>
-      <file>redhat10.cer</file>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
-    </driver>
-  </os>
-
-  <os id="http://microsoft.com/win/8">
-    <short-id>win8</short-id>
-    <_name>Microsoft Windows 8</_name>
-    <version>6.2</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/7"/>
-    <upgrades id="http://microsoft.com/win/7"/>
-
-<!--
-    <release-date></release-date>
-    <eol-date></eol-date>
--->
-
-    <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>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSA_X64FRE|HRM_CCSA_X64CHK|HRM_CCSNA_X64FRE|HRM_CCSNA_X64CHK|HRM_CENNA_X64FREV|HRM_CENNA_X64CHKV|HRM_CENA_X64FREV|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-
-    <installer>
-      <script id='http://microsoft.com/windows/unattend/jeos'/>
-      <script id='http://microsoft.com/windows/unattend/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://microsoft.com/win/8.1">
-    <short-id>win8.1</short-id>
-    <_name>Microsoft Windows 8.1</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/8"/>
-    <upgrades id="http://microsoft.com/win/8"/>
-
-<!--
-    <release-date></release-date>
-    <eol-date></eol-date>
--->
-
-    <variant id="debug">
-      <_name>Microsoft Windows 8.1 Debug Checked Build</_name>
-    </variant>
-    <variant id="enterprise-debug">
-      <_name>Microsoft Windows 8.1 Enterprise Debug Checked Build</_name>
-    </variant>
-    <variant id="professional">
-      <_name>Microsoft Windows 8.1 Professional</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 8.1 Enterprise</_name>
-    </variant>
-
-    <!-- Debug -->
-    <media arch="i686">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="debug"/>
-      <iso>
-        <volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise Debug -->
-    <media arch="i686">
-      <variant id="enterprise-debug"/>
-      <iso>
-        <volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="enterprise-debug"/>
-      <iso>
-        <volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Professional -->
-    <media arch="i686">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="professional"/>
-      <iso>
-        <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(IR1_CENNA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- No variant -->
-    <media arch="i686">
-      <iso>
-        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Variant unknown -->
-    <media arch="i686">
-      <iso>
-        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-  </os>
-
-  <os id="http://microsoft.com/win/2k12">
-    <short-id>win2k12</short-id>
-    <_name>Microsoft Windows Server 2012</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k8r2"/>
-    <upgrades id="http://microsoft.com/win/2k8r2"/>
-
-    <release-date>2012-09-04</release-date>
-
-    <variant id="storage">
-      <_name>Windows Server 2012 Storage</_name>
-    </variant>
-    <variant id="hyperv">
-      <_name>Windows Server 2012 for HyperV</_name>
-    </variant>
-    <variant id="essentials">
-      <_name>Windows Server 2012 Essentials</_name>
-    </variant>
-    <variant id="volume-license">
-      <_name>Windows Server 2012 Volume License</_name>
-    </variant>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <media arch="x86_64">
-      <variant id="essentials"/>
-      <iso>
-        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="hyperv"/>
-      <iso>
-        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="storage"/>
-      <iso>
-        <volume-id>(HRM_SFST_X64FREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="volume-licence"/>
-      <iso>
-        <volume-id>(HRM_SSS_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://microsoft.com/win/2k12r2">
-    <short-id>win2k12r2</short-id>
-    <_name>Microsoft Windows Server 2012 R2</_name>
-    <version>6.3</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/2k12"/>
-    <upgrades id="http://microsoft.com/win/2k12"/>
-
-    <variant id="storage">
-      <_name>Windows Server 2012 R2 Storage</_name>
-    </variant>
-    <variant id="hyperv">
-      <_name>Windows Server 2012 R2 for HyperV</_name>
-    </variant>
-    <variant id="essentials">
-      <_name>Windows Server 2012 R2 Essentials</_name>
-    </variant>
-    <variant id="volume-license">
-      <_name>Windows Server 2012 R2 Volume License</_name>
-    </variant>
-
-    <release-date>2013-10-18</release-date>
-
-    <media arch="x86_64">
-      <iso>
-        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="essentials"/>
-      <iso>
-        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="hyperv"/>
-      <iso>
-        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="volume-licence"/>
-      <iso>
-        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <variant id="storage"/>
-      <iso>
-        <volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://microsoft.com/win/10">
-    <short-id>win10</short-id>
-    <_name>Microsoft Windows 10</_name>
-    <version>10.0</version>
-    <_vendor>Microsoft Corporation</_vendor>
-    <family>winnt</family>
-    <distro>win</distro>
-    <derives-from id="http://microsoft.com/win/8.1"/>
-    <upgrades id="http://microsoft.com/win/8.1"/>
-
-    <release-date>2015-07-29</release-date>
-
-    <variant id="education">
-      <_name>Microsoft Windows 10 Education</_name>
-    </variant>
-    <variant id="enterprise">
-      <_name>Microsoft Windows 10 Enterprise</_name>
-    </variant>
-
-    <!-- Education -->
-    <media arch="i686">
-      <variant id="education"/>
-      <iso>
-        <volume-id>J_CEDA_X86FRE_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <!-- Enterprise -->
-    <media arch="i686">
-      <variant id="enterprise"/>
-      <iso>
-        <volume-id>J_CENA_X86FREV_</volume-id>
-        <publisher-id>MICROSOFT CORPORATION</publisher-id>
-        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
-      </iso>
-    </media>
-
-    <resources arch="i686">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>1073741824</ram>
-        <storage>17179869184</storage>
-      </minimum>
-    </resources>
-
-    <resources arch="x86_64">
-      <minimum>
-        <cpu>1000000000</cpu>
-        <n-cpus>1</n-cpus>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </minimum>
-    </resources>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
-    </devices>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/windows/Makefile.am b/data/oses/windows/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/windows/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/windows/win1.0.xml.in b/data/oses/windows/win1.0.xml.in
new file mode 100644
index 0000000..7ce76de
--- /dev/null
+++ b/data/oses/windows/win1.0.xml.in
@@ -0,0 +1,13 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/1.0">
+    <short-id>win1.0</short-id>
+    <_name>Microsoft Windows 1.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>1.0</version>
+
+    <release-date>1985-11-20</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win10.xml.in b/data/oses/windows/win10.xml.in
new file mode 100644
index 0000000..6ea8210
--- /dev/null
+++ b/data/oses/windows/win10.xml.in
@@ -0,0 +1,63 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/10">
+    <short-id>win10</short-id>
+    <_name>Microsoft Windows 10</_name>
+    <version>10.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8.1"/>
+    <upgrades id="http://microsoft.com/win/8.1"/>
+
+    <release-date>2015-07-29</release-date>
+
+    <variant id="education">
+      <_name>Microsoft Windows 10 Education</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 10 Enterprise</_name>
+    </variant>
+
+    <!-- Education -->
+    <media arch="i686">
+      <variant id="education"/>
+      <iso>
+        <volume-id>J_CEDA_X86FRE_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>J_CENA_X86FREV_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2.0.xml.in b/data/oses/windows/win2.0.xml.in
new file mode 100644
index 0000000..6f6a3ae
--- /dev/null
+++ b/data/oses/windows/win2.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2.0">
+    <short-id>win2.0</short-id>
+    <_name>Microsoft Windows 2.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.0</version>
+    <upgrades id="http://microsoft.com/win/1.0"/>
+    <derives-from id="http://microsoft.com/win/1.0"/>
+
+    <release-date>1987-12-09</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2.1.xml.in b/data/oses/windows/win2.1.xml.in
new file mode 100644
index 0000000..6c43799
--- /dev/null
+++ b/data/oses/windows/win2.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2.1">
+    <short-id>win2.1</short-id>
+    <_name>Microsoft Windows 2.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>2.1</version>
+    <upgrades id="http://microsoft.com/win/2.0"/>
+    <derives-from id="http://microsoft.com/win/2.0"/>
+
+    <release-date>1988-05-27</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k.xml.in b/data/oses/windows/win2k.xml.in
new file mode 100644
index 0000000..b999297
--- /dev/null
+++ b/data/oses/windows/win2k.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k">
+    <short-id>win2k</short-id>
+    <_name>Microsoft Windows 2000</_name>
+    <version>5.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/me"/>
+
+    <release-date>2000-02-17</release-date>
+    <eol-date>2010-07-13</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+    </devices>
+
+    <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>
+      </iso>
+    </media>
+
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>350000000</cpu>
+        <ram>100663296</ram>
+        <storage>1073741824</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k12.xml.in b/data/oses/windows/win2k12.xml.in
new file mode 100644
index 0000000..5a82b7f
--- /dev/null
+++ b/data/oses/windows/win2k12.xml.in
@@ -0,0 +1,68 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k12">
+    <short-id>win2k12</short-id>
+    <_name>Microsoft Windows Server 2012</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k8r2"/>
+    <upgrades id="http://microsoft.com/win/2k8r2"/>
+
+    <release-date>2012-09-04</release-date>
+
+    <variant id="storage">
+      <_name>Windows Server 2012 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 Volume License</_name>
+    </variant>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(HRM_SFST_X64FREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(HRM_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k12r2.xml.in b/data/oses/windows/win2k12r2.xml.in
new file mode 100644
index 0000000..7a1e6cf
--- /dev/null
+++ b/data/oses/windows/win2k12r2.xml.in
@@ -0,0 +1,67 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k12r2">
+    <short-id>win2k12r2</short-id>
+    <_name>Microsoft Windows Server 2012 R2</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k12"/>
+    <upgrades id="http://microsoft.com/win/2k12"/>
+
+    <variant id="storage">
+      <_name>Windows Server 2012 R2 Storage</_name>
+    </variant>
+    <variant id="hyperv">
+      <_name>Windows Server 2012 R2 for HyperV</_name>
+    </variant>
+    <variant id="essentials">
+      <_name>Windows Server 2012 R2 Essentials</_name>
+    </variant>
+    <variant id="volume-license">
+      <_name>Windows Server 2012 R2 Volume License</_name>
+    </variant>
+
+    <release-date>2013-10-18</release-date>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="essentials"/>
+      <iso>
+        <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="hyperv"/>
+      <iso>
+        <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="volume-licence"/>
+      <iso>
+        <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="storage"/>
+      <iso>
+        <volume-id>(IRM_SFST_X64FREO|IR5_SFST_X64FREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k3.xml.in b/data/oses/windows/win2k3.xml.in
new file mode 100644
index 0000000..e22c95a
--- /dev/null
+++ b/data/oses/windows/win2k3.xml.in
@@ -0,0 +1,72 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k3">
+    <short-id>win2k3</short-id>
+    <_name>Microsoft Windows Server 2003</_name>
+    <version>5.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <upgrades id="http://microsoft.com/win/2k"/>
+
+    <release-date>2003-04-24</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <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>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k3r2.xml.in b/data/oses/windows/win2k3r2.xml.in
new file mode 100644
index 0000000..f9b6186
--- /dev/null
+++ b/data/oses/windows/win2k3r2.xml.in
@@ -0,0 +1,65 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k3r2">
+    <short-id>win2k3r2</short-id>
+    <_name>Microsoft Windows Server 2003 R2</_name>
+    <version>5.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3"/>
+    <upgrades id="http://microsoft.com/win/2k3"/>
+
+    <release-date>2005-12-06</release-date>
+    <eol-date>2015-07-14</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>133000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>2147483648</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>550000000</cpu>
+        <ram>268435456</ram>
+        <storage>4294967296</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1500000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>4294967296</storage>
+      </minimum>
+
+      <recommended>
+        <storage>8589934592</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k8.xml.in b/data/oses/windows/win2k8.xml.in
new file mode 100644
index 0000000..116e242
--- /dev/null
+++ b/data/oses/windows/win2k8.xml.in
@@ -0,0 +1,65 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k8">
+    <short-id>win2k8</short-id>
+    <_name>Microsoft Windows Server 2008</_name>
+    <version>6.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k3r2"/>
+    <upgrades id="http://microsoft.com/win/2k3r2"/>
+
+    <release-date>2008-02-27</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win2k8r2.xml.in b/data/oses/windows/win2k8r2.xml.in
new file mode 100644
index 0000000..9a59e9b
--- /dev/null
+++ b/data/oses/windows/win2k8r2.xml.in
@@ -0,0 +1,50 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/2k8r2">
+    <short-id>win2k8r2</short-id>
+    <_name>Microsoft Windows Server 2008 R2</_name>
+    <version>6.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k8"/>
+    <upgrades id="http://microsoft.com/win/2k8"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2013-07-09</eol-date>
+
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="ia64">
+      <iso>
+        <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1400000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>2147483648</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win3.1.xml.in b/data/oses/windows/win3.1.xml.in
new file mode 100644
index 0000000..f13d31b
--- /dev/null
+++ b/data/oses/windows/win3.1.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/3.1">
+    <short-id>win3.1</short-id>
+    <_name>Microsoft Windows 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win16</family>
+    <distro>win</distro>
+    <version>3.1</version>
+    <upgrades id="http://microsoft.com/win/2.1"/>
+    <derives-from id="http://microsoft.com/win/2.1"/>
+
+    <release-date>1992-04-06</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win7.xml.in b/data/oses/windows/win7.xml.in
new file mode 100644
index 0000000..27dd292
--- /dev/null
+++ b/data/oses/windows/win7.xml.in
@@ -0,0 +1,231 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/7">
+    <short-id>win7</short-id>
+    <_name>Microsoft Windows 7</_name>
+    <version>6.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/vista"/>
+    <upgrades id="http://microsoft.com/win/vista"/>
+
+    <release-date>2009-10-22</release-date>
+    <eol-date>2015-01-13</eol-date>
+
+    <variant id="debug">
+      <_name>Microsoft Windows 7 Debug Checked Build</_name>
+    </variant>
+    <variant id="starter">
+      <_name>Microsoft Windows 7 Starter</_name>
+    </variant>
+    <variant id="home-basic">
+      <_name>Microsoft Windows 7 Home Basic</_name>
+    </variant>
+    <variant id="home-premium">
+      <_name>Microsoft Windows 7 Home Premium</_name>
+    </variant>
+    <variant id="professional">
+      <_name>Microsoft Windows 7 Professional</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 7 Enterprise</_name>
+    </variant>
+    <variant id="ultimate">
+      <_name>Microsoft Windows 7 Ultimate</_name>
+    </variant>
+
+    <!-- Debug -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(GRMCXCHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Starter -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="starter"/>
+      <iso>
+        <volume-id>(GSP1RMCNSTFREO|GRMCNSTFREO|GRMCSTFREO|GSP1RMCSTFREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Home Basic -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-basic"/>
+      <iso>
+        <volume-id>(GSP1RMCHBFRER|GRMCHBFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Home Premium -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="home-premium"/>
+      <iso>
+        <volume-id>(GSP1RMCNHPFRER|GRMCNHPFRER|GSP1RMCHPFRER|GRMCHPFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="home-premium"/>
+      <iso>
+        <volume-id>(GSP1RMCNHPXFRER|GSP1RMCHPXFRER|GSP1RMCNHPXFRER|GRMCNHPXFRER|GRMCHPXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Professional -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(GRMCNPRFRER|GRMCPRVOL|GSP1RMCPRVOL|GRMCPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL|GRMCPRFREO)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(GRMCNPRXFRER|GRMCPRXVOL|GSP1RMCPRXVOL|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(GRMCENVOL|GRMCNENVOL|GSP1RMCNENVOL|GSP1RMCENVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GSP1RMCNENXVOL)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Ultimate -->
+    <media arch="i686" installer-reboots="2">
+      <variant id="ultimate"/>
+      <iso>
+        <volume-id>(GRMCULFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GRMCNULFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <variant id="ultimate"/>
+      <iso>
+        <volume-id>(GRMCULXFRER|GSP1RMCNULXFRER|GSP1RMCULXFRER|GRMCNULXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Variant unknown -->
+    <media arch="i686" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCPRFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(GRMCHPXFRER|GRMCXCHK|GRMCPRXFRER)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+
+    <!-- virtio block device driver -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86" pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <file>viostor.sys</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </driver>
+
+    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/amd64" pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <file>viostor.sys</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </driver>
+
+    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+    </driver>
+
+    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+    </driver>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win8.1.xml.in b/data/oses/windows/win8.1.xml.in
new file mode 100644
index 0000000..8698349
--- /dev/null
+++ b/data/oses/windows/win8.1.xml.in
@@ -0,0 +1,149 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/8.1">
+    <short-id>win8.1</short-id>
+    <_name>Microsoft Windows 8.1</_name>
+    <version>6.3</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/8"/>
+    <upgrades id="http://microsoft.com/win/8"/>
+
+<!--
+    <release-date></release-date>
+    <eol-date></eol-date>
+-->
+
+    <variant id="debug">
+      <_name>Microsoft Windows 8.1 Debug Checked Build</_name>
+    </variant>
+    <variant id="enterprise-debug">
+      <_name>Microsoft Windows 8.1 Enterprise Debug Checked Build</_name>
+    </variant>
+    <variant id="professional">
+      <_name>Microsoft Windows 8.1 Professional</_name>
+    </variant>
+    <variant id="enterprise">
+      <_name>Microsoft Windows 8.1 Enterprise</_name>
+    </variant>
+
+    <!-- Debug -->
+    <media arch="i686">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X86CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="debug"/>
+      <iso>
+        <volume-id>(IRM_CCSN?A_X64CHK)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise Debug -->
+    <media arch="i686">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X86CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise-debug"/>
+      <iso>
+        <volume-id>(IRM_CENN?A_X64CHKV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Professional -->
+    <media arch="i686">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="professional"/>
+      <iso>
+        <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Enterprise -->
+    <media arch="i686">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR1_CENNA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <variant id="enterprise"/>
+      <iso>
+        <volume-id>(IR[135]_CENN?A_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- No variant -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IR5_CCSNA_X86FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <!-- Variant unknown -->
+    <media arch="i686">
+      <iso>
+        <volume-id>(IRM_CENNA_X86FREV|IRM_CENA_X86FREV|IR1_CENA_X86FREV|IRM_CCSNA_X86FRE|IRM_CPRNA_X86FREV|IRM_CPRA_X86FREV|IRM_CCSA_X86FRE|IR3_CCSNA_X86FRE|IR3_CENA_X86FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(IRM_CENNA_X64FREV|IRM_CENA_X64FREV|IR1_CENA_X64FREV|IRM_CCSNA_X64FRE|IRM_CPRNA_X64FREV|IRM_CPRA_X64FREV|IRM_CCSA_X64FRE|IR3_CCSNA_X64FRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win8.xml.in b/data/oses/windows/win8.xml.in
new file mode 100644
index 0000000..517d0d6
--- /dev/null
+++ b/data/oses/windows/win8.xml.in
@@ -0,0 +1,59 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/8">
+    <short-id>win8</short-id>
+    <_name>Microsoft Windows 8</_name>
+    <version>6.2</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/7"/>
+    <upgrades id="http://microsoft.com/win/7"/>
+
+<!--
+    <release-date></release-date>
+    <eol-date></eol-date>
+-->
+
+    <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>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(HB1_CCPA_X64FRE|HRM_CCSA_X64FRE|HRM_CCSA_X64CHK|HRM_CCSNA_X64FRE|HRM_CCSNA_X64CHK|HRM_CENNA_X64FREV|HRM_CENNA_X64CHKV|HRM_CENA_X64FREV|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </minimum>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </minimum>
+    </resources>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/> <!-- ICH6 -->
+    </devices>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend/jeos'/>
+      <script id='http://microsoft.com/windows/unattend/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win95.xml.in b/data/oses/windows/win95.xml.in
new file mode 100644
index 0000000..4dc08a5
--- /dev/null
+++ b/data/oses/windows/win95.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/95">
+    <short-id>win95</short-id>
+    <_name>Microsoft Windows 95</_name>
+    <version>4.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <upgrades id="http://microsoft.com/win/3.1"/>
+    <derives-from id="http://microsoft.com/win/3.1"/>
+
+    <release-date>1995-08-24</release-date>
+    <eol-date>2001-12-13</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/> <!-- QXL -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/> <!-- VGA -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/> <!-- AC97 -->
+    </devices>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>12000000</cpu>
+        <ram>4194304</ram>
+        <storage>41943040</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/win98.xml.in b/data/oses/windows/win98.xml.in
new file mode 100644
index 0000000..97f092d
--- /dev/null
+++ b/data/oses/windows/win98.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/98">
+    <short-id>win98</short-id>
+    <_name>Microsoft Windows 98</_name>
+    <version>4.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/95"/>
+    <upgrades id="http://microsoft.com/win/95"/>
+
+    <release-date>1998-06-25</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>66000000</cpu>
+        <ram>16777216</ram>
+        <storage>125829120</storage>
+      </minimum>
+      <recommended>
+        <cpu>233000000</cpu>
+        <ram>25165824</ram>
+        <storage>419430400</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winme.xml.in b/data/oses/windows/winme.xml.in
new file mode 100644
index 0000000..a43e320
--- /dev/null
+++ b/data/oses/windows/winme.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/me">
+    <short-id>winme</short-id>
+    <_name>Microsoft Windows Millennium Edition</_name>
+    <version>4.9</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>win9x</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/98"/>
+    <upgrades id="http://microsoft.com/win/98"/>
+
+    <release-date>2000-09-14</release-date>
+    <eol-date>2006-07-11</eol-date>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>150000000</cpu>
+        <ram>33554432</ram>
+        <storage>335544320</storage>
+      </minimum>
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>67108864</ram>
+        <storage>2147483648</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winnt3.1.xml.in b/data/oses/windows/winnt3.1.xml.in
new file mode 100644
index 0000000..a873e18
--- /dev/null
+++ b/data/oses/windows/winnt3.1.xml.in
@@ -0,0 +1,12 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.1">
+    <short-id>winnt3.1</short-id>
+    <_name>Microsoft Windows NT Server 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.1</version>
+    <release-date>1993-07-27</release-date>
+    <eol-date>2000-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winnt3.5.xml.in b/data/oses/windows/winnt3.5.xml.in
new file mode 100644
index 0000000..202466a
--- /dev/null
+++ b/data/oses/windows/winnt3.5.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.5">
+    <short-id>winnt3.5</short-id>
+    <_name>Microsoft Windows NT Server 3.5</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.5</version>
+    <upgrades id="http://microsoft.com/winnt/3.1"/>
+    <derives-from id="http://microsoft.com/winnt/3.1"/>
+
+    <release-date>1994-09-21</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winnt3.51.xml.in b/data/oses/windows/winnt3.51.xml.in
new file mode 100644
index 0000000..18397c9
--- /dev/null
+++ b/data/oses/windows/winnt3.51.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/3.51">
+    <short-id>winnt3.51</short-id>
+    <_name>Microsoft Windows NT Server 3.51</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>3.51</version>
+    <upgrades id="http://microsoft.com/winnt/3.5"/>
+    <derives-from id="http://microsoft.com/winnt/3.5"/>
+
+    <release-date>1995-05-30</release-date>
+    <eol-date>2001-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winnt4.0.xml.in b/data/oses/windows/winnt4.0.xml.in
new file mode 100644
index 0000000..34836bf
--- /dev/null
+++ b/data/oses/windows/winnt4.0.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/winnt/4.0">
+    <short-id>winnt4.0</short-id>
+    <_name>Microsoft Windows NT Server 4.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>winnt</distro>
+    <version>4.0</version>
+    <upgrades id="http://microsoft.com/winnt/3.51"/>
+    <derives-from id="http://microsoft.com/winnt/3.51"/>
+
+    <release-date>1996-08-24</release-date>
+    <eol-date>2004-12-31</eol-date>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winvista.xml.in b/data/oses/windows/winvista.xml.in
new file mode 100644
index 0000000..bc65690
--- /dev/null
+++ b/data/oses/windows/winvista.xml.in
@@ -0,0 +1,49 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/vista">
+    <short-id>winvista</short-id>
+    <_name>Microsoft Windows Vista</_name>
+    <version>6.0</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/xp"/>
+    <upgrades id="http://microsoft.com/win/xp"/>
+
+    <release-date>2006-11-30</release-date>
+    <eol-date>2012-04-10</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRTMEVOL|FRMBVOL|FRMEVOL|FRMCFRE)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMEXVOL|FRTMEXVOL|FRMBXVOL|FRMCXFRE)_</volume-id>
+       <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+
+    <resources arch="all">
+      <minimum>
+        <cpu>800000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+        <storage>16106127360</storage>
+      </minimum>
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>42949672960</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/unattend'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/windows/winxp.xml.in b/data/oses/windows/winxp.xml.in
new file mode 100644
index 0000000..fd76b37
--- /dev/null
+++ b/data/oses/windows/winxp.xml.in
@@ -0,0 +1,113 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/win/xp">
+    <short-id>winxp</short-id>
+    <_name>Microsoft Windows XP</_name>
+    <version>5.1</version>
+    <_vendor>Microsoft Corporation</_vendor>
+    <family>winnt</family>
+    <distro>win</distro>
+    <derives-from id="http://microsoft.com/win/2k"/>
+    <derives-from id="http://microsoft.com/win/me"/>
+    <upgrades id="http://microsoft.com/win/me"/>
+
+    <release-date>2001-10-25</release-date>
+    <eol-date>2009-04-19</eol-date>
+
+    <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>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <media arch="x86_64" installer-reboots="2">
+      <iso>
+        <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
+        <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
+      </iso>
+    </media>
+
+    <resources arch="i686">
+      <minimum>
+        <cpu>233000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>67108864</ram>
+        <storage>1610612736</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>300000000</cpu>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+    <resources arch="x86_64">
+      <minimum>
+        <cpu>733000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>268435456</ram>
+        <storage>1610612736</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>733000000</cpu>
+        <ram>536870912</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://microsoft.com/windows/sif/jeos'/>
+      <script id='http://microsoft.com/windows/sif/desktop'/>
+      <script id='http://microsoft.com/windows/reg/desktop'/>
+      <script id='http://microsoft.com/windows/cmd/desktop'/>
+    </installer>
+
+    <!-- virtio block device driver -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86" pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <file>viostor.sys</file>
+      <!-- For now we require this for pre-installation but we should probably generate this too -->
+      <file>txtsetup.oem</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </driver>
+
+    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64" pre-installable="true" signed="false">
+      <file>viostor.cat</file>
+      <file>viostor.inf</file>
+      <file>viostor.sys</file>
+      <!-- For now we require this for pre-installation but we should probably generate this too -->
+      <file>txtsetup.oem</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </driver>
+
+    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+    </driver>
+
+    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+      <file>spice-guest-tools-0.65.exe</file>
+      <file>spice-guest-tools-0.65.cmd</file>
+      <file>redhat09.cer</file>
+      <file>redhat10.cer</file>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+    </driver>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c2479e7..e7ed628 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -304,7 +304,30 @@ data/oses/ubuntu/ubuntu14.04.xml.in
 data/oses/ubuntu/ubuntu14.10.xml.in
 data/oses/ubuntu/ubuntu15.04.xml.in
 data/oses/ubuntu/ubuntu15.10.xml.in
-data/oses/windows.xml.in
+data/oses/windows/win1.0.xml.in
+data/oses/windows/win10.xml.in
+data/oses/windows/win2.0.xml.in
+data/oses/windows/win2.1.xml.in
+data/oses/windows/win2k12r2.xml.in
+data/oses/windows/win2k12.xml.in
+data/oses/windows/win2k3r2.xml.in
+data/oses/windows/win2k3.xml.in
+data/oses/windows/win2k8r2.xml.in
+data/oses/windows/win2k8.xml.in
+data/oses/windows/win2k.xml.in
+data/oses/windows/win3.1.xml.in
+data/oses/windows/win7.xml.in
+data/oses/windows/win8.1.xml.in
+data/oses/windows/win8.xml.in
+data/oses/windows/win95.xml.in
+data/oses/windows/win98.xml.in
+data/oses/windows/winme.xml.in
+data/oses/windows/winnt3.1.xml.in
+data/oses/windows/winnt3.51.xml.in
+data/oses/windows/winnt3.5.xml.in
+data/oses/windows/winnt4.0.xml.in
+data/oses/windows/winvista.xml.in
+data/oses/windows/winxp.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:44 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:44 +0100
Subject: [Libosinfo] [PATCH 26/39] data: split kvm into one file per platform
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-27-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                  |  1 +
 data/platforms/Makefile.am                    |  7 ++-
 data/platforms/kvm.xml.in                     | 63 ---------------------------
 data/platforms/qemu-kvm/Makefile.am           |  1 +
 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in   | 10 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in | 11 +++++
 po/POTFILES.in                                |  7 ++-
 11 files changed, 79 insertions(+), 65 deletions(-)
 delete mode 100644 data/platforms/kvm.xml.in
 create mode 100644 data/platforms/qemu-kvm/Makefile.am
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in

diff --git a/configure.ac b/configure.ac
index 3e3968b..ce65160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,7 @@ AC_CONFIG_FILES([
 	data/datamaps/Makefile
 	data/devices/Makefile
 	data/platforms/Makefile
+	data/platforms/qemu-kvm/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am
index 4b84d3e..6bbb126 100644
--- a/data/platforms/Makefile.am
+++ b/data/platforms/Makefile.am
@@ -1,6 +1,11 @@
 
+SUBDIRS = \
+	qemu-kvm \
+	$(NULL)
+
 databasedir = $(pkgdatadir)/db/hypervisors/
-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
+database_in_files = \
+	qemu.xml.in rhel-xen.xml.in xen.xml.in
 
 database_DATA = $(database_in_files:.xml.in=.xml)
 
diff --git a/data/platforms/kvm.xml.in b/data/platforms/kvm.xml.in
deleted file mode 100644
index 3833943..0000000
--- a/data/platforms/kvm.xml.in
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<libosinfo version="0.0.1">
-
-  <platform id="http://linux-kvm.org/1.0">
-    <short-id>qemu-kvm-1.0</short-id>
-    <_name>QEMU-KVM 1.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.0</version>
-    <release-date>2011-12-04</release-date>
-    <derives-from id="http://qemu.org/1.0"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.0.1">
-    <short-id>qemu-kvm-1.0.1</short-id>
-    <_name>QEMU-KVM 1.0.1</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.0.1</version>
-    <release-date>2012-04-17</release-date>
-    <upgrades id="http://linux-kvm.org/1.0"/>
-    <derives-from id="http://qemu.org/1.0.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.0">
-    <short-id>qemu-kvm-1.1.0</short-id>
-    <_name>QEMU-KVM 1.1.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.0</version>
-    <release-date>2012-07-02</release-date>
-    <upgrades id="http://linux-kvm.org/1.0.1"/>
-    <derives-from id="http://qemu.org/1.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.1">
-    <short-id>qemu-kvm-1.1.1</short-id>
-    <_name>QEMU-KVM 1.1.1</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.1</version>
-    <release-date>2012-08-27</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.0"/>
-    <derives-from id="http://qemu.org/1.1.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.2">
-    <short-id>qemu-kvm-1.1.2</short-id>
-    <_name>QEMU-KVM 1.1.2</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.2</version>
-    <release-date>2012-09-10</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.1"/>
-    <derives-from id="http://qemu.org/1.1.2"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.2.0">
-    <short-id>qemu-kvm-1.2.0</short-id>
-    <_name>QEMU-KVM 1.2.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.2.0</version>
-    <release-date>2012-09-10</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.1-1"/>
-    <derives-from id="http://qemu.org/1.2.0"/>
-  </platform>
-
-</libosinfo>
diff --git a/data/platforms/qemu-kvm/Makefile.am b/data/platforms/qemu-kvm/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/platforms/qemu-kvm/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
new file mode 100644
index 0000000..a49abbc
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.0.1">
+    <short-id>qemu-kvm-1.0.1</short-id>
+    <_name>QEMU-KVM 1.0.1</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.0.1</version>
+    <release-date>2012-04-17</release-date>
+    <upgrades id="http://linux-kvm.org/1.0"/>
+    <derives-from id="http://qemu.org/1.0.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
new file mode 100644
index 0000000..fbfadad
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.0">
+    <short-id>qemu-kvm-1.0</short-id>
+    <_name>QEMU-KVM 1.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.0</version>
+    <release-date>2011-12-04</release-date>
+    <derives-from id="http://qemu.org/1.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
new file mode 100644
index 0000000..ed21a5f
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.0">
+    <short-id>qemu-kvm-1.1.0</short-id>
+    <_name>QEMU-KVM 1.1.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.0</version>
+    <release-date>2012-07-02</release-date>
+    <upgrades id="http://linux-kvm.org/1.0.1"/>
+    <derives-from id="http://qemu.org/1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
new file mode 100644
index 0000000..3582ff1
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.1">
+    <short-id>qemu-kvm-1.1.1</short-id>
+    <_name>QEMU-KVM 1.1.1</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.1</version>
+    <release-date>2012-08-27</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.0"/>
+    <derives-from id="http://qemu.org/1.1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
new file mode 100644
index 0000000..c5fea92
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.2">
+    <short-id>qemu-kvm-1.1.2</short-id>
+    <_name>QEMU-KVM 1.1.2</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.2</version>
+    <release-date>2012-09-10</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.1"/>
+    <derives-from id="http://qemu.org/1.1.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
new file mode 100644
index 0000000..cfe87c5
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.2.0">
+    <short-id>qemu-kvm-1.2.0</short-id>
+    <_name>QEMU-KVM 1.2.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.2.0</version>
+    <release-date>2012-09-10</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.1-1"/>
+    <derives-from id="http://qemu.org/1.2.0"/>
+  </platform>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e7ed628..927c2d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -332,7 +332,12 @@ data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
 data/devices/qemu-usb.xml.in
-data/platforms/kvm.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
 data/platforms/qemu.xml.in
 data/platforms/rhel-xen.xml.in
 data/platforms/xen.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:45 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:45 +0100
Subject: [Libosinfo] [PATCH 27/39] data: split qemu into one file per
	platform
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-28-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                            |   1 +
 data/platforms/Makefile.am              |   3 +-
 data/platforms/qemu.xml.in              | 363 --------------------------------
 data/platforms/qemu/Makefile.am         |   1 +
 data/platforms/qemu/qemu-1.0.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.0.xml.in     |  55 +++++
 data/platforms/qemu/qemu-1.1.1-1.xml.in |  10 +
 data/platforms/qemu/qemu-1.1.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.1.2.xml.in   |  10 +
 data/platforms/qemu/qemu-1.1.xml.in     |  10 +
 data/platforms/qemu/qemu-1.2.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.2.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.2.2.xml.in   |  10 +
 data/platforms/qemu/qemu-1.3.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.3.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.4.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.4.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.4.2.xml.in   |  10 +
 data/platforms/qemu/qemu-1.5.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.5.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.5.2.xml.in   |  10 +
 data/platforms/qemu/qemu-1.5.3.xml.in   |  10 +
 data/platforms/qemu/qemu-1.6.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.6.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.6.2.xml.in   |  10 +
 data/platforms/qemu/qemu-1.7.0.xml.in   |  10 +
 data/platforms/qemu/qemu-1.7.1.xml.in   |  10 +
 data/platforms/qemu/qemu-1.7.2.xml.in   |  10 +
 data/platforms/qemu/qemu-2.0.0.xml.in   |  10 +
 data/platforms/qemu/qemu-2.0.1.xml.in   |  10 +
 data/platforms/qemu/qemu-2.0.2.xml.in   |  10 +
 data/platforms/qemu/qemu-2.1.0.xml.in   |  10 +
 data/platforms/qemu/qemu-2.1.1.xml.in   |  10 +
 data/platforms/qemu/qemu-2.1.2.xml.in   |  10 +
 data/platforms/qemu/qemu-2.1.3.xml.in   |  10 +
 data/platforms/qemu/qemu-2.2.0.xml.in   |  10 +
 data/platforms/qemu/qemu-2.2.1.xml.in   |  10 +
 data/platforms/qemu/qemu-2.3.0.xml.in   |  10 +
 po/POTFILES.in                          |  35 ++-
 39 files changed, 423 insertions(+), 365 deletions(-)
 delete mode 100644 data/platforms/qemu.xml.in
 create mode 100644 data/platforms/qemu/Makefile.am
 create mode 100644 data/platforms/qemu/qemu-1.0.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.1-1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.2.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.3.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.3.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.4.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.5.3.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.6.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-1.7.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.0.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.2.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.1.3.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.2.0.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.2.1.xml.in
 create mode 100644 data/platforms/qemu/qemu-2.3.0.xml.in

diff --git a/configure.ac b/configure.ac
index ce65160..9d7a4f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,7 @@ AC_CONFIG_FILES([
 	data/datamaps/Makefile
 	data/devices/Makefile
 	data/platforms/Makefile
+	data/platforms/qemu/Makefile
 	data/platforms/qemu-kvm/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am
index 6bbb126..7e88613 100644
--- a/data/platforms/Makefile.am
+++ b/data/platforms/Makefile.am
@@ -1,11 +1,12 @@
 
 SUBDIRS = \
 	qemu-kvm \
+	qemu \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/hypervisors/
 database_in_files = \
-	qemu.xml.in rhel-xen.xml.in xen.xml.in
+	rhel-xen.xml.in xen.xml.in
 
 database_DATA = $(database_in_files:.xml.in=.xml)
 
diff --git a/data/platforms/qemu.xml.in b/data/platforms/qemu.xml.in
deleted file mode 100644
index fa40c13..0000000
--- a/data/platforms/qemu.xml.in
+++ /dev/null
@@ -1,363 +0,0 @@
-<!-- Official QEMU releases -->
-<libosinfo version="0.0.1">
-
-  <platform id="http://qemu.org/1.0">
-    <short-id>qemu-1.0</short-id>
-    <_name>QEMU 1.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.0</version>
-    <release-date>2011-12-01</release-date>
-
-    <devices>
-      <!-- block: LSI -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012"/>
-      <!-- video: vga -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/>
-      <!-- video: cirrus -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8"/>
-      <!-- video: vmvga -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710"/>
-      <!-- video: qxl -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
-      <!-- network: ne2k_pci-->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
-      <!-- network: pcnet -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
-      <!-- network: rtl8139 -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139"/>
-      <!-- network: e1000 -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
-      <!-- audio: es1370 -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000"/>
-      <!-- audio: AC97 -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/>
-      <!-- audio: ICH6 -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/>
-      <!-- watchdog devices -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
-      <device id="http://ibasetechnologies.net/ib700"/>
-      <!-- ps2: keyboard -->
-      <device id="http://ibm.com/ps2/keyboard"/>
-      <!-- ps2: mouse -->
-      <device id="http://ibm.com/ps2/mouse"/>
-      <!-- USB tablet -->
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
-      <!-- virtio-net -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <!-- virtio-block -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      <!-- virtio-balloon -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
-      <!-- virtio-console -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
-      <!-- virtio-9p -->
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009"/>
-    </devices>
-  </platform>
-
-  <platform id="http://qemu.org/1.0.1">
-    <short-id>qemu-1.0.1</short-id>
-    <_name>QEMU 1.0.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.0.1</version>
-    <release-date>2012-02-17</release-date>
-    <upgrades id="http://qemu.org/1.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.1">
-    <short-id>qemu-1.1</short-id>
-    <_name>QEMU 1.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.1</version>
-    <release-date>2012-06-01</release-date>
-    <upgrades id="http://qemu.org/1.0.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.1.1">
-    <short-id>qemu-1.1.1</short-id>
-    <_name>QEMU 1.1.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.1.1</version>
-    <release-date>2012-07-12</release-date>
-    <upgrades id="http://qemu.org/1.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.1.1-1">
-    <short-id>qemu-1.1.1-1</short-id>
-    <_name>QEMU 1.1.1-1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.1.1-1</version>
-    <release-date>2012-07-17</release-date>
-    <upgrades id="http://qemu.org/1.1.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.1.2">
-    <short-id>qemu-1.1.2</short-id>
-    <_name>QEMU 1.1.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.1.2</version>
-    <release-date>2012-09-05</release-date>
-    <upgrades id="http://qemu.org/1.1.1-1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.2.0">
-    <short-id>qemu-1.2.0</short-id>
-    <_name>QEMU 1.2.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.2.0</version>
-    <release-date>2012-09-05</release-date>
-    <upgrades id="http://qemu.org/1.1.1-1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.2.1">
-    <short-id>qemu-1.2.1</short-id>
-    <_name>QEMU 1.2.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.2.1</version>
-    <release-date>2012-11-20</release-date>
-    <upgrades id="http://qemu.org/1.2.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.2.2">
-    <short-id>qemu-1.2.2</short-id>
-    <_name>QEMU 1.2.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.2.2</version>
-    <release-date>2012-12-11</release-date>
-    <upgrades id="http://qemu.org/1.2.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.3.0">
-    <short-id>qemu-1.3.0</short-id>
-    <_name>QEMU 1.3.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.3.0</version>
-    <release-date>2012-12-03</release-date>
-    <upgrades id="http://qemu.org/1.2.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.3.1">
-    <short-id>qemu-1.3.1</short-id>
-    <_name>QEMU 1.3.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.3.1</version>
-    <release-date>2013-01-28</release-date>
-    <upgrades id="http://qemu.org/1.3.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.4.0">
-    <short-id>qemu-1.4.0</short-id>
-    <_name>QEMU 1.4.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.4.0</version>
-    <release-date>2013-02-15</release-date>
-    <upgrades id="http://qemu.org/1.3.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.4.1">
-    <short-id>qemu-1.4.1</short-id>
-    <_name>QEMU 1.4.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.4.1</version>
-    <release-date>2013-04-15</release-date>
-    <upgrades id="http://qemu.org/1.4.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.4.2">
-    <short-id>qemu-1.4.2</short-id>
-    <_name>QEMU 1.4.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.4.2</version>
-    <release-date>2013-05-24</release-date>
-    <upgrades id="http://qemu.org/1.4.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.5.0">
-    <short-id>qemu-1.5.0</short-id>
-    <_name>QEMU 1.5.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.5.0</version>
-    <release-date>2013-05-20</release-date>
-    <upgrades id="http://qemu.org/1.4.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.5.1">
-    <short-id>qemu-1.5.1</short-id>
-    <_name>QEMU 1.5.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.5.1</version>
-    <release-date>2013-06-26</release-date>
-    <upgrades id="http://qemu.org/1.5.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.5.2">
-    <short-id>qemu-1.5.2</short-id>
-    <_name>QEMU 1.5.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.5.2</version>
-    <release-date>2013-07-25</release-date>
-    <upgrades id="http://qemu.org/1.5.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.5.3">
-    <short-id>qemu-1.5.3</short-id>
-    <_name>QEMU 1.5.3</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.5.3</version>
-    <release-date>2013-08-27</release-date>
-    <upgrades id="http://qemu.org/1.5.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.6.0">
-    <short-id>qemu-1.6.0</short-id>
-    <_name>QEMU 1.6.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.6.0</version>
-    <release-date>2013-08-15</release-date>
-    <upgrades id="http://qemu.org/1.5.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.6.0">
-    <short-id>qemu-1.6.0</short-id>
-    <_name>QEMU 1.6.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.6.0</version>
-    <release-date>2013-08-15</release-date>
-    <upgrades id="http://qemu.org/1.5.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.6.1">
-    <short-id>qemu-1.6.1</short-id>
-    <_name>QEMU 1.6.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.6.1</version>
-    <release-date>2013-10-09</release-date>
-    <upgrades id="http://qemu.org/1.6.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.6.2">
-    <short-id>qemu-1.6.2</short-id>
-    <_name>QEMU 1.6.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.6.2</version>
-    <release-date>2013-12-16</release-date>
-    <upgrades id="http://qemu.org/1.6.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.7.0">
-    <short-id>qemu-1.7.0</short-id>
-    <_name>QEMU 1.7.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.7.0</version>
-    <release-date>2013-11-28</release-date>
-    <upgrades id="http://qemu.org/1.6.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.7.1">
-    <short-id>qemu-1.7.1</short-id>
-    <_name>QEMU 1.7.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.7.1</version>
-    <release-date>2014-03-03</release-date>
-    <upgrades id="http://qemu.org/1.7.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/1.7.2">
-    <short-id>qemu-1.7.2</short-id>
-    <_name>QEMU 1.7.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>1.7.2</version>
-    <release-date>2014-07-21</release-date>
-    <upgrades id="http://qemu.org/1.7.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.0.0">
-    <short-id>qemu-2.0.0</short-id>
-    <_name>QEMU 2.0.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.0.0</version>
-    <release-date>2014-04-17</release-date>
-    <upgrades id="http://qemu.org/1.7.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.0.1">
-    <short-id>qemu-2.0.1</short-id>
-    <_name>QEMU 2.0.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.0.1</version>
-    <release-date>2014-08-15</release-date>
-    <upgrades id="http://qemu.org/2.0.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.0.2">
-    <short-id>qemu-2.0.2</short-id>
-    <_name>QEMU 2.0.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.0.2</version>
-    <release-date>2014-08-18</release-date>
-    <upgrades id="http://qemu.org/2.0.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.1.0">
-    <short-id>qemu-2.1.0</short-id>
-    <_name>QEMU 2.1.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.1.0</version>
-    <release-date>2014-08-01</release-date>
-    <upgrades id="http://qemu.org/2.0.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.1.1">
-    <short-id>qemu-2.1.1</short-id>
-    <_name>QEMU 2.1.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.1.1</version>
-    <release-date>2014-09-10</release-date>
-    <upgrades id="http://qemu.org/2.1.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.1.2">
-    <short-id>qemu-2.1.2</short-id>
-    <_name>QEMU 2.1.2</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.1.2</version>
-    <release-date>2014-09-25</release-date>
-    <upgrades id="http://qemu.org/2.1.1"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.1.3">
-    <short-id>qemu-2.1.3</short-id>
-    <_name>QEMU 2.1.3</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.1.3</version>
-    <release-date>2015-01-22</release-date>
-    <upgrades id="http://qemu.org/2.1.2"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.2.0">
-    <short-id>qemu-2.2.0</short-id>
-    <_name>QEMU 2.2.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.2.0</version>
-    <release-date>2014-12-09</release-date>
-    <upgrades id="http://qemu.org/2.1.3"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.2.1">
-    <short-id>qemu-2.2.1</short-id>
-    <_name>QEMU 2.2.1</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.2.1</version>
-    <release-date>2015-03-10</release-date>
-    <upgrades id="http://qemu.org/2.2.0"/>
-  </platform>
-
-  <platform id="http://qemu.org/2.3.0">
-    <short-id>qemu-2.3.0</short-id>
-    <_name>QEMU 2.3.0</_name>
-    <_vendor>qemu.org</_vendor>
-    <version>2.3.0</version>
-    <release-date>2015-04-24</release-date>
-    <upgrades id="http://qemu.org/2.2.1"/>
-  </platform>
-</libosinfo>
diff --git a/data/platforms/qemu/Makefile.am b/data/platforms/qemu/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/platforms/qemu/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/platforms/qemu/qemu-1.0.1.xml.in b/data/platforms/qemu/qemu-1.0.1.xml.in
new file mode 100644
index 0000000..80bf76c
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.0.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.0.1">
+    <short-id>qemu-1.0.1</short-id>
+    <_name>QEMU 1.0.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.0.1</version>
+    <release-date>2012-02-17</release-date>
+    <upgrades id="http://qemu.org/1.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.0.xml.in b/data/platforms/qemu/qemu-1.0.xml.in
new file mode 100644
index 0000000..e195807
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.0.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.0">
+    <short-id>qemu-1.0</short-id>
+    <_name>QEMU 1.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.0</version>
+    <release-date>2011-12-01</release-date>
+
+    <devices>
+      <!-- block: LSI -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012"/>
+      <!-- video: vga -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/>
+      <!-- video: cirrus -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8"/>
+      <!-- video: vmvga -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710"/>
+      <!-- video: qxl -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+      <!-- network: ne2k_pci-->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
+      <!-- network: pcnet -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
+      <!-- network: rtl8139 -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139"/>
+      <!-- network: e1000 -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
+      <!-- audio: es1370 -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000"/>
+      <!-- audio: AC97 -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/>
+      <!-- audio: ICH6 -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/>
+      <!-- watchdog devices -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
+      <device id="http://ibasetechnologies.net/ib700"/>
+      <!-- ps2: keyboard -->
+      <device id="http://ibm.com/ps2/keyboard"/>
+      <!-- ps2: mouse -->
+      <device id="http://ibm.com/ps2/mouse"/>
+      <!-- USB tablet -->
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
+      <!-- virtio-net -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <!-- virtio-block -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      <!-- virtio-balloon -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+      <!-- virtio-console -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+      <!-- virtio-9p -->
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.1.1-1.xml.in b/data/platforms/qemu/qemu-1.1.1-1.xml.in
new file mode 100644
index 0000000..30d52e5
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.1.1-1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.1.1-1">
+    <short-id>qemu-1.1.1-1</short-id>
+    <_name>QEMU 1.1.1-1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.1.1-1</version>
+    <release-date>2012-07-17</release-date>
+    <upgrades id="http://qemu.org/1.1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.1.1.xml.in b/data/platforms/qemu/qemu-1.1.1.xml.in
new file mode 100644
index 0000000..448d54c
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.1.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.1.1">
+    <short-id>qemu-1.1.1</short-id>
+    <_name>QEMU 1.1.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.1.1</version>
+    <release-date>2012-07-12</release-date>
+    <upgrades id="http://qemu.org/1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.1.2.xml.in b/data/platforms/qemu/qemu-1.1.2.xml.in
new file mode 100644
index 0000000..d3d6df4
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.1.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.1.2">
+    <short-id>qemu-1.1.2</short-id>
+    <_name>QEMU 1.1.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.1.2</version>
+    <release-date>2012-09-05</release-date>
+    <upgrades id="http://qemu.org/1.1.1-1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.1.xml.in b/data/platforms/qemu/qemu-1.1.xml.in
new file mode 100644
index 0000000..1b24938
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.1">
+    <short-id>qemu-1.1</short-id>
+    <_name>QEMU 1.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.1</version>
+    <release-date>2012-06-01</release-date>
+    <upgrades id="http://qemu.org/1.0.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.2.0.xml.in b/data/platforms/qemu/qemu-1.2.0.xml.in
new file mode 100644
index 0000000..fbdfa04
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.2.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.2.0">
+    <short-id>qemu-1.2.0</short-id>
+    <_name>QEMU 1.2.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.2.0</version>
+    <release-date>2012-09-05</release-date>
+    <upgrades id="http://qemu.org/1.1.1-1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.2.1.xml.in b/data/platforms/qemu/qemu-1.2.1.xml.in
new file mode 100644
index 0000000..b15b274
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.2.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.2.1">
+    <short-id>qemu-1.2.1</short-id>
+    <_name>QEMU 1.2.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.2.1</version>
+    <release-date>2012-11-20</release-date>
+    <upgrades id="http://qemu.org/1.2.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.2.2.xml.in b/data/platforms/qemu/qemu-1.2.2.xml.in
new file mode 100644
index 0000000..df97590
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.2.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.2.2">
+    <short-id>qemu-1.2.2</short-id>
+    <_name>QEMU 1.2.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.2.2</version>
+    <release-date>2012-12-11</release-date>
+    <upgrades id="http://qemu.org/1.2.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.3.0.xml.in b/data/platforms/qemu/qemu-1.3.0.xml.in
new file mode 100644
index 0000000..a09fca3
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.3.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.3.0">
+    <short-id>qemu-1.3.0</short-id>
+    <_name>QEMU 1.3.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.3.0</version>
+    <release-date>2012-12-03</release-date>
+    <upgrades id="http://qemu.org/1.2.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.3.1.xml.in b/data/platforms/qemu/qemu-1.3.1.xml.in
new file mode 100644
index 0000000..a332d95
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.3.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.3.1">
+    <short-id>qemu-1.3.1</short-id>
+    <_name>QEMU 1.3.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.3.1</version>
+    <release-date>2013-01-28</release-date>
+    <upgrades id="http://qemu.org/1.3.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.4.0.xml.in b/data/platforms/qemu/qemu-1.4.0.xml.in
new file mode 100644
index 0000000..da2c30c
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.4.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.4.0">
+    <short-id>qemu-1.4.0</short-id>
+    <_name>QEMU 1.4.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.4.0</version>
+    <release-date>2013-02-15</release-date>
+    <upgrades id="http://qemu.org/1.3.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.4.1.xml.in b/data/platforms/qemu/qemu-1.4.1.xml.in
new file mode 100644
index 0000000..3a1ab57
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.4.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.4.1">
+    <short-id>qemu-1.4.1</short-id>
+    <_name>QEMU 1.4.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.4.1</version>
+    <release-date>2013-04-15</release-date>
+    <upgrades id="http://qemu.org/1.4.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.4.2.xml.in b/data/platforms/qemu/qemu-1.4.2.xml.in
new file mode 100644
index 0000000..2ca937f
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.4.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.4.2">
+    <short-id>qemu-1.4.2</short-id>
+    <_name>QEMU 1.4.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.4.2</version>
+    <release-date>2013-05-24</release-date>
+    <upgrades id="http://qemu.org/1.4.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.5.0.xml.in b/data/platforms/qemu/qemu-1.5.0.xml.in
new file mode 100644
index 0000000..b0d1543
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.5.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.5.0">
+    <short-id>qemu-1.5.0</short-id>
+    <_name>QEMU 1.5.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.5.0</version>
+    <release-date>2013-05-20</release-date>
+    <upgrades id="http://qemu.org/1.4.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.5.1.xml.in b/data/platforms/qemu/qemu-1.5.1.xml.in
new file mode 100644
index 0000000..d57ba17
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.5.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.5.1">
+    <short-id>qemu-1.5.1</short-id>
+    <_name>QEMU 1.5.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.5.1</version>
+    <release-date>2013-06-26</release-date>
+    <upgrades id="http://qemu.org/1.5.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.5.2.xml.in b/data/platforms/qemu/qemu-1.5.2.xml.in
new file mode 100644
index 0000000..76b79fb
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.5.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.5.2">
+    <short-id>qemu-1.5.2</short-id>
+    <_name>QEMU 1.5.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.5.2</version>
+    <release-date>2013-07-25</release-date>
+    <upgrades id="http://qemu.org/1.5.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.5.3.xml.in b/data/platforms/qemu/qemu-1.5.3.xml.in
new file mode 100644
index 0000000..9fdf5a8
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.5.3.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.5.3">
+    <short-id>qemu-1.5.3</short-id>
+    <_name>QEMU 1.5.3</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.5.3</version>
+    <release-date>2013-08-27</release-date>
+    <upgrades id="http://qemu.org/1.5.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.6.0.xml.in b/data/platforms/qemu/qemu-1.6.0.xml.in
new file mode 100644
index 0000000..c7de449
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.6.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.6.0">
+    <short-id>qemu-1.6.0</short-id>
+    <_name>QEMU 1.6.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.6.0</version>
+    <release-date>2013-08-15</release-date>
+    <upgrades id="http://qemu.org/1.5.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.6.1.xml.in b/data/platforms/qemu/qemu-1.6.1.xml.in
new file mode 100644
index 0000000..c66ab7d
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.6.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.6.1">
+    <short-id>qemu-1.6.1</short-id>
+    <_name>QEMU 1.6.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.6.1</version>
+    <release-date>2013-10-09</release-date>
+    <upgrades id="http://qemu.org/1.6.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.6.2.xml.in b/data/platforms/qemu/qemu-1.6.2.xml.in
new file mode 100644
index 0000000..466a65c
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.6.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.6.2">
+    <short-id>qemu-1.6.2</short-id>
+    <_name>QEMU 1.6.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.6.2</version>
+    <release-date>2013-12-16</release-date>
+    <upgrades id="http://qemu.org/1.6.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.7.0.xml.in b/data/platforms/qemu/qemu-1.7.0.xml.in
new file mode 100644
index 0000000..d791063
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.7.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.7.0">
+    <short-id>qemu-1.7.0</short-id>
+    <_name>QEMU 1.7.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.7.0</version>
+    <release-date>2013-11-28</release-date>
+    <upgrades id="http://qemu.org/1.6.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.7.1.xml.in b/data/platforms/qemu/qemu-1.7.1.xml.in
new file mode 100644
index 0000000..fca7813
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.7.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.7.1">
+    <short-id>qemu-1.7.1</short-id>
+    <_name>QEMU 1.7.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.7.1</version>
+    <release-date>2014-03-03</release-date>
+    <upgrades id="http://qemu.org/1.7.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-1.7.2.xml.in b/data/platforms/qemu/qemu-1.7.2.xml.in
new file mode 100644
index 0000000..7ef49da
--- /dev/null
+++ b/data/platforms/qemu/qemu-1.7.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/1.7.2">
+    <short-id>qemu-1.7.2</short-id>
+    <_name>QEMU 1.7.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>1.7.2</version>
+    <release-date>2014-07-21</release-date>
+    <upgrades id="http://qemu.org/1.7.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.0.0.xml.in b/data/platforms/qemu/qemu-2.0.0.xml.in
new file mode 100644
index 0000000..8edabef
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.0.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.0.0">
+    <short-id>qemu-2.0.0</short-id>
+    <_name>QEMU 2.0.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.0.0</version>
+    <release-date>2014-04-17</release-date>
+    <upgrades id="http://qemu.org/1.7.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.0.1.xml.in b/data/platforms/qemu/qemu-2.0.1.xml.in
new file mode 100644
index 0000000..3d7cd5e
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.0.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.0.1">
+    <short-id>qemu-2.0.1</short-id>
+    <_name>QEMU 2.0.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.0.1</version>
+    <release-date>2014-08-15</release-date>
+    <upgrades id="http://qemu.org/2.0.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.0.2.xml.in b/data/platforms/qemu/qemu-2.0.2.xml.in
new file mode 100644
index 0000000..c2609b3
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.0.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.0.2">
+    <short-id>qemu-2.0.2</short-id>
+    <_name>QEMU 2.0.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.0.2</version>
+    <release-date>2014-08-18</release-date>
+    <upgrades id="http://qemu.org/2.0.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.1.0.xml.in b/data/platforms/qemu/qemu-2.1.0.xml.in
new file mode 100644
index 0000000..04b27c2
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.1.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.1.0">
+    <short-id>qemu-2.1.0</short-id>
+    <_name>QEMU 2.1.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.1.0</version>
+    <release-date>2014-08-01</release-date>
+    <upgrades id="http://qemu.org/2.0.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.1.1.xml.in b/data/platforms/qemu/qemu-2.1.1.xml.in
new file mode 100644
index 0000000..3b69ea2
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.1.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.1.1">
+    <short-id>qemu-2.1.1</short-id>
+    <_name>QEMU 2.1.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.1.1</version>
+    <release-date>2014-09-10</release-date>
+    <upgrades id="http://qemu.org/2.1.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.1.2.xml.in b/data/platforms/qemu/qemu-2.1.2.xml.in
new file mode 100644
index 0000000..afda064
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.1.2.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.1.2">
+    <short-id>qemu-2.1.2</short-id>
+    <_name>QEMU 2.1.2</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.1.2</version>
+    <release-date>2014-09-25</release-date>
+    <upgrades id="http://qemu.org/2.1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.1.3.xml.in b/data/platforms/qemu/qemu-2.1.3.xml.in
new file mode 100644
index 0000000..ea5a50a
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.1.3.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.1.3">
+    <short-id>qemu-2.1.3</short-id>
+    <_name>QEMU 2.1.3</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.1.3</version>
+    <release-date>2015-01-22</release-date>
+    <upgrades id="http://qemu.org/2.1.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.2.0.xml.in b/data/platforms/qemu/qemu-2.2.0.xml.in
new file mode 100644
index 0000000..26c68d1
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.2.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.2.0">
+    <short-id>qemu-2.2.0</short-id>
+    <_name>QEMU 2.2.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.2.0</version>
+    <release-date>2014-12-09</release-date>
+    <upgrades id="http://qemu.org/2.1.3"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.2.1.xml.in b/data/platforms/qemu/qemu-2.2.1.xml.in
new file mode 100644
index 0000000..8a39efd
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.2.1.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.2.1">
+    <short-id>qemu-2.2.1</short-id>
+    <_name>QEMU 2.2.1</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.2.1</version>
+    <release-date>2015-03-10</release-date>
+    <upgrades id="http://qemu.org/2.2.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu/qemu-2.3.0.xml.in b/data/platforms/qemu/qemu-2.3.0.xml.in
new file mode 100644
index 0000000..ef5323e
--- /dev/null
+++ b/data/platforms/qemu/qemu-2.3.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://qemu.org/2.3.0">
+    <short-id>qemu-2.3.0</short-id>
+    <_name>QEMU 2.3.0</_name>
+    <_vendor>qemu.org</_vendor>
+    <version>2.3.0</version>
+    <release-date>2015-04-24</release-date>
+    <upgrades id="http://qemu.org/2.2.1"/>
+  </platform>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 927c2d7..b63e554 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -332,13 +332,46 @@ data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
 data/devices/qemu-usb.xml.in
+data/platforms/qemu/qemu-1.0.1.xml.in
+data/platforms/qemu/qemu-1.0.xml.in
+data/platforms/qemu/qemu-1.1.1-1.xml.in
+data/platforms/qemu/qemu-1.1.1.xml.in
+data/platforms/qemu/qemu-1.1.2.xml.in
+data/platforms/qemu/qemu-1.1.xml.in
+data/platforms/qemu/qemu-1.2.0.xml.in
+data/platforms/qemu/qemu-1.2.1.xml.in
+data/platforms/qemu/qemu-1.2.2.xml.in
+data/platforms/qemu/qemu-1.3.0.xml.in
+data/platforms/qemu/qemu-1.3.1.xml.in
+data/platforms/qemu/qemu-1.4.0.xml.in
+data/platforms/qemu/qemu-1.4.1.xml.in
+data/platforms/qemu/qemu-1.4.2.xml.in
+data/platforms/qemu/qemu-1.5.0.xml.in
+data/platforms/qemu/qemu-1.5.1.xml.in
+data/platforms/qemu/qemu-1.5.2.xml.in
+data/platforms/qemu/qemu-1.5.3.xml.in
+data/platforms/qemu/qemu-1.6.0.xml.in
+data/platforms/qemu/qemu-1.6.1.xml.in
+data/platforms/qemu/qemu-1.6.2.xml.in
+data/platforms/qemu/qemu-1.7.0.xml.in
+data/platforms/qemu/qemu-1.7.1.xml.in
+data/platforms/qemu/qemu-1.7.2.xml.in
+data/platforms/qemu/qemu-2.0.0.xml.in
+data/platforms/qemu/qemu-2.0.1.xml.in
+data/platforms/qemu/qemu-2.0.2.xml.in
+data/platforms/qemu/qemu-2.1.0.xml.in
+data/platforms/qemu/qemu-2.1.1.xml.in
+data/platforms/qemu/qemu-2.1.2.xml.in
+data/platforms/qemu/qemu-2.1.3.xml.in
+data/platforms/qemu/qemu-2.2.0.xml.in
+data/platforms/qemu/qemu-2.2.1.xml.in
+data/platforms/qemu/qemu-2.3.0.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
-data/platforms/qemu.xml.in
 data/platforms/rhel-xen.xml.in
 data/platforms/xen.xml.in
 osinfo/osinfo_avatar_format.c
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:46 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:46 +0100
Subject: [Libosinfo] [PATCH 28/39] data: split rhel-xen into one file per
	platform
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-29-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                      |   1 +
 data/platforms/Makefile.am                        |   3 +-
 data/platforms/rhel-xen.xml.in                    | 131 ----------------------
 data/platforms/rhel-xen/Makefile.am               |   1 +
 data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in |  17 +++
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in |  17 +++
 po/POTFILES.in                                    |   9 +-
 13 files changed, 148 insertions(+), 133 deletions(-)
 delete mode 100644 data/platforms/rhel-xen.xml.in
 create mode 100644 data/platforms/rhel-xen/Makefile.am
 create mode 100644 data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
 create mode 100644 data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in

diff --git a/configure.ac b/configure.ac
index 9d7a4f8..12f30e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,7 @@ AC_CONFIG_FILES([
 	data/platforms/Makefile
 	data/platforms/qemu/Makefile
 	data/platforms/qemu-kvm/Makefile
+	data/platforms/rhel-xen/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am
index 7e88613..f0d9c9d 100644
--- a/data/platforms/Makefile.am
+++ b/data/platforms/Makefile.am
@@ -2,11 +2,12 @@
 SUBDIRS = \
 	qemu-kvm \
 	qemu \
+	rhel-xen \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/hypervisors/
 database_in_files = \
-	rhel-xen.xml.in xen.xml.in
+	xen.xml.in
 
 database_DATA = $(database_in_files:.xml.in=.xml)
 
diff --git a/data/platforms/rhel-xen.xml.in b/data/platforms/rhel-xen.xml.in
deleted file mode 100644
index a67dc4e..0000000
--- a/data/platforms/rhel-xen.xml.in
+++ /dev/null
@@ -1,131 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <platform id="http://redhat.com/rhel/5.0/xen/3.0.3">
-    <short-id>xen-3.0.3-rhel-5.0</short-id>
-    <_name>Xen 3.0.3 (RHEL 5.0)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.0.3</version>
-
-    <derives-from id="http://xen.org/xen/3.0.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.1/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.1</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.1)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.2/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.2</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.2)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.3/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.3</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.3)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.4/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.4</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.4)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.5/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.5</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.5)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.6/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.6</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.6)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://redhat.com/rhel/5.7/xen/3.1.0">
-    <short-id>xen-3.1.0-rhel-5.7</short-id>
-    <_name>Xen 3.1.0 (RHEL 5.7)</_name>
-    <_vendor>Red Hat, Inc.</_vendor>
-    <version>3.1.0</version>
-
-    <derives-from id="http://xen.org/xen/3.1.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-</libosinfo>
diff --git a/data/platforms/rhel-xen/Makefile.am b/data/platforms/rhel-xen/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/platforms/rhel-xen/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in b/data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in
new file mode 100644
index 0000000..4eb66d7
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.0/xen/3.0.3">
+    <short-id>xen-3.0.3-rhel-5.0</short-id>
+    <_name>Xen 3.0.3 (RHEL 5.0)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.0.3</version>
+
+    <derives-from id="http://xen.org/xen/3.0.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in
new file mode 100644
index 0000000..bcde6c6
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.1/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.1</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.1)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in
new file mode 100644
index 0000000..7529a5c
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.2/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.2</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.2)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in
new file mode 100644
index 0000000..8397289
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.3/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.3</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.3)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
new file mode 100644
index 0000000..944da63
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.4/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.4</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.4)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
new file mode 100644
index 0000000..d6ca802
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.5/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.5</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.5)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
new file mode 100644
index 0000000..74df119
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.6/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.6</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.6)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in
new file mode 100644
index 0000000..7e39708
--- /dev/null
+++ b/data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in
@@ -0,0 +1,17 @@
+<libosinfo version="0.0.1">
+  <platform id="http://redhat.com/rhel/5.7/xen/3.1.0">
+    <short-id>xen-3.1.0-rhel-5.7</short-id>
+    <_name>Xen 3.1.0 (RHEL 5.7)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
+    <version>3.1.0</version>
+
+    <derives-from id="http://xen.org/xen/3.1.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b63e554..e6b87dc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -372,7 +372,14 @@ data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
-data/platforms/rhel-xen.xml.in
+data/platforms/rhel-xen/xen-3.0.3-rhel-5.0.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.1.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.2.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.3.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
+data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in
 data/platforms/xen.xml.in
 osinfo/osinfo_avatar_format.c
 osinfo/osinfo_deployment.c
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:47 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:47 +0100
Subject: [Libosinfo] [PATCH 29/39] data: split xen into one file per platform
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-30-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                        |   1 +
 data/platforms/Makefile.am          |  11 +-
 data/platforms/xen.xml.in           | 287 ------------------------------------
 data/platforms/xen/Makefile.am      |   1 +
 data/platforms/xen/xen-3.0.2.xml.in |  14 ++
 data/platforms/xen/xen-3.0.3.xml.in |  15 ++
 data/platforms/xen/xen-3.0.4.xml.in |  16 ++
 data/platforms/xen/xen-3.1.3.xml.in |  16 ++
 data/platforms/xen/xen-3.1.4.xml.in |  16 ++
 data/platforms/xen/xen-3.2.0.xml.in |  16 ++
 data/platforms/xen/xen-3.2.1.xml.in |  16 ++
 data/platforms/xen/xen-3.2.2.xml.in |  16 ++
 data/platforms/xen/xen-3.2.3.xml.in |  16 ++
 data/platforms/xen/xen-3.3.0.xml.in |  16 ++
 data/platforms/xen/xen-3.3.1.xml.in |  16 ++
 data/platforms/xen/xen-3.3.2.xml.in |  16 ++
 data/platforms/xen/xen-3.4.0.xml.in |  16 ++
 data/platforms/xen/xen-3.4.1.xml.in |  16 ++
 data/platforms/xen/xen-3.4.2.xml.in |  16 ++
 data/platforms/xen/xen-3.4.3.xml.in |  16 ++
 data/platforms/xen/xen-4.0.0.xml.in |  16 ++
 data/platforms/xen/xen-4.0.1.xml.in |  16 ++
 data/platforms/xen/xen-4.1.0.xml.in |  16 ++
 po/POTFILES.in                      |  20 ++-
 24 files changed, 323 insertions(+), 298 deletions(-)
 delete mode 100644 data/platforms/xen.xml.in
 create mode 100644 data/platforms/xen/Makefile.am
 create mode 100644 data/platforms/xen/xen-3.0.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.0.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.0.4.xml.in
 create mode 100644 data/platforms/xen/xen-3.1.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.1.4.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.2.3.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.3.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.0.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.1.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.2.xml.in
 create mode 100644 data/platforms/xen/xen-3.4.3.xml.in
 create mode 100644 data/platforms/xen/xen-4.0.0.xml.in
 create mode 100644 data/platforms/xen/xen-4.0.1.xml.in
 create mode 100644 data/platforms/xen/xen-4.1.0.xml.in

diff --git a/configure.ac b/configure.ac
index 12f30e7..8ad150a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,6 +173,7 @@ AC_CONFIG_FILES([
 	data/platforms/qemu/Makefile
 	data/platforms/qemu-kvm/Makefile
 	data/platforms/rhel-xen/Makefile
+	data/platforms/xen/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am
index f0d9c9d..422a827 100644
--- a/data/platforms/Makefile.am
+++ b/data/platforms/Makefile.am
@@ -3,14 +3,5 @@ SUBDIRS = \
 	qemu-kvm \
 	qemu \
 	rhel-xen \
+	xen \
 	$(NULL)
-
-databasedir = $(pkgdatadir)/db/hypervisors/
-database_in_files = \
-	xen.xml.in
-
-database_DATA = $(database_in_files:.xml.in=.xml)
-
- at INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/platforms/xen.xml.in b/data/platforms/xen.xml.in
deleted file mode 100644
index 98efefb..0000000
--- a/data/platforms/xen.xml.in
+++ /dev/null
@@ -1,287 +0,0 @@
-<!-- Official Xen Project releases -->
-<libosinfo version="0.0.1">
-
-  <platform id="http://xen.org/xen/3.0.2">
-    <short-id>xen-3.0.2</short-id>
-    <_name>Xen 3.0.2</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.0.2</version>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.0.3">
-    <short-id>xen-3.0.3</short-id>
-    <_name>Xen 3.0.3</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.0.3</version>
-    <upgrades id="http://xen.org/xen/3.0.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.0.4">
-    <short-id>xen-3.0.4</short-id>
-    <_name>Xen 3.0.4</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.0.4</version>
-    <upgrades id="http://xen.org/xen/3.0.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.1.3">
-    <short-id>xen-3.1.3</short-id>
-    <_name>Xen 3.1.3</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.1.3</version>
-    <upgrades id="http://xen.org/xen/3.0.4"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.1.4">
-    <short-id>xen-3.1.4</short-id>
-    <_name>Xen 3.1.4</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.1.4</version>
-    <upgrades id="http://xen.org/xen/3.1.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.0">
-    <short-id>xen-3.2.0</short-id>
-    <_name>Xen 3.2.0</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.2.0</version>
-    <upgrades id="http://xen.org/xen/3.1.4"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.1">
-    <short-id>xen-3.2.1</short-id>
-    <_name>Xen 3.2.1</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.2.1</version>
-    <upgrades id="http://xen.org/xen/3.2.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.2">
-    <short-id>xen-3.2.2</short-id>
-    <_name>Xen 3.2.2</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.2.2</version>
-    <upgrades id="http://xen.org/xen/3.2.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.2.3">
-    <short-id>xen-3.2.3</short-id>
-    <_name>Xen 3.2.3</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.2.3</version>
-    <upgrades id="http://xen.org/xen/3.2.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.0">
-    <short-id>xen-3.3.0</short-id>
-    <_name>Xen 3.3.0</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.3.0</version>
-    <upgrades id="http://xen.org/xen/3.2.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.1">
-    <short-id>xen-3.3.1</short-id>
-    <_name>Xen 3.3.1</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.3.1</version>
-    <upgrades id="http://xen.org/xen/3.3.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.3.2">
-    <short-id>xen-3.3.2</short-id>
-    <_name>Xen 3.3.2</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.3.2</version>
-    <upgrades id="http://xen.org/xen/3.3.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.0">
-    <short-id>xen-3.4.0</short-id>
-    <_name>Xen 3.4.0</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.4.0</version>
-    <upgrades id="http://xen.org/xen/3.3.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.1">
-    <short-id>xen-3.4.1</short-id>
-    <_name>Xen 3.4.1</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.4.1</version>
-    <upgrades id="http://xen.org/xen/3.4.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.2">
-    <short-id>xen-3.4.2</short-id>
-    <_name>Xen 3.4.2</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.4.2</version>
-    <upgrades id="http://xen.org/xen/3.4.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/3.4.3">
-    <short-id>xen-3.4.3</short-id>
-    <_name>Xen 3.4.3</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>3.4.3</version>
-    <upgrades id="http://xen.org/xen/3.4.2"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.0.0">
-    <short-id>xen-4.0.0</short-id>
-    <_name>Xen 4.0.0</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>4.0.0</version>
-    <upgrades id="http://xen.org/xen/3.4.3"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.0.1">
-    <short-id>xen-4.0.1</short-id>
-    <_name>Xen 4.0.1</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>4.0.1</version>
-    <upgrades id="http://xen.org/xen/4.0.0"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-  <platform id="http://xen.org/xen/4.1.0">
-    <short-id>xen-4.1.0</short-id>
-    <_name>Xen 4.1.0</_name>
-    <_vendor>Citrix Systems, Inc.</_vendor>
-    <version>4.1.0</version>
-    <upgrades id="http://xen.org/xen/4.0.1"/>
-
-    <devices>
-      <device id="http://xen.org/devices/block"/>
-      <device id="http://xen.org/devices/net"/>
-      <device id="http://xen.org/devices/console"/>
-      <device id="http://xen.org/devices/framebuffer"/>
-    </devices>
-  </platform>
-
-
-</libosinfo>
diff --git a/data/platforms/xen/Makefile.am b/data/platforms/xen/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/platforms/xen/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/platforms/xen/xen-3.0.2.xml.in b/data/platforms/xen/xen-3.0.2.xml.in
new file mode 100644
index 0000000..7d0a1d3
--- /dev/null
+++ b/data/platforms/xen/xen-3.0.2.xml.in
@@ -0,0 +1,14 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.0.2">
+    <short-id>xen-3.0.2</short-id>
+    <_name>Xen 3.0.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.0.2</version>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.0.3.xml.in b/data/platforms/xen/xen-3.0.3.xml.in
new file mode 100644
index 0000000..6eedf5f
--- /dev/null
+++ b/data/platforms/xen/xen-3.0.3.xml.in
@@ -0,0 +1,15 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.0.3">
+    <short-id>xen-3.0.3</short-id>
+    <_name>Xen 3.0.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.0.3</version>
+    <upgrades id="http://xen.org/xen/3.0.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.0.4.xml.in b/data/platforms/xen/xen-3.0.4.xml.in
new file mode 100644
index 0000000..6458561
--- /dev/null
+++ b/data/platforms/xen/xen-3.0.4.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.0.4">
+    <short-id>xen-3.0.4</short-id>
+    <_name>Xen 3.0.4</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.0.4</version>
+    <upgrades id="http://xen.org/xen/3.0.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.1.3.xml.in b/data/platforms/xen/xen-3.1.3.xml.in
new file mode 100644
index 0000000..bb58a11
--- /dev/null
+++ b/data/platforms/xen/xen-3.1.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.1.3">
+    <short-id>xen-3.1.3</short-id>
+    <_name>Xen 3.1.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.1.3</version>
+    <upgrades id="http://xen.org/xen/3.0.4"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.1.4.xml.in b/data/platforms/xen/xen-3.1.4.xml.in
new file mode 100644
index 0000000..9c1ab0c
--- /dev/null
+++ b/data/platforms/xen/xen-3.1.4.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.1.4">
+    <short-id>xen-3.1.4</short-id>
+    <_name>Xen 3.1.4</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.1.4</version>
+    <upgrades id="http://xen.org/xen/3.1.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.2.0.xml.in b/data/platforms/xen/xen-3.2.0.xml.in
new file mode 100644
index 0000000..21ad945
--- /dev/null
+++ b/data/platforms/xen/xen-3.2.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.2.0">
+    <short-id>xen-3.2.0</short-id>
+    <_name>Xen 3.2.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.2.0</version>
+    <upgrades id="http://xen.org/xen/3.1.4"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.2.1.xml.in b/data/platforms/xen/xen-3.2.1.xml.in
new file mode 100644
index 0000000..1d700cb
--- /dev/null
+++ b/data/platforms/xen/xen-3.2.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.2.1">
+    <short-id>xen-3.2.1</short-id>
+    <_name>Xen 3.2.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.2.1</version>
+    <upgrades id="http://xen.org/xen/3.2.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.2.2.xml.in b/data/platforms/xen/xen-3.2.2.xml.in
new file mode 100644
index 0000000..fcb836a
--- /dev/null
+++ b/data/platforms/xen/xen-3.2.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.2.2">
+    <short-id>xen-3.2.2</short-id>
+    <_name>Xen 3.2.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.2.2</version>
+    <upgrades id="http://xen.org/xen/3.2.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.2.3.xml.in b/data/platforms/xen/xen-3.2.3.xml.in
new file mode 100644
index 0000000..fdd506a
--- /dev/null
+++ b/data/platforms/xen/xen-3.2.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.2.3">
+    <short-id>xen-3.2.3</short-id>
+    <_name>Xen 3.2.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.2.3</version>
+    <upgrades id="http://xen.org/xen/3.2.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.3.0.xml.in b/data/platforms/xen/xen-3.3.0.xml.in
new file mode 100644
index 0000000..b94590b
--- /dev/null
+++ b/data/platforms/xen/xen-3.3.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.3.0">
+    <short-id>xen-3.3.0</short-id>
+    <_name>Xen 3.3.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.3.0</version>
+    <upgrades id="http://xen.org/xen/3.2.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.3.1.xml.in b/data/platforms/xen/xen-3.3.1.xml.in
new file mode 100644
index 0000000..69a7037
--- /dev/null
+++ b/data/platforms/xen/xen-3.3.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.3.1">
+    <short-id>xen-3.3.1</short-id>
+    <_name>Xen 3.3.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.3.1</version>
+    <upgrades id="http://xen.org/xen/3.3.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.3.2.xml.in b/data/platforms/xen/xen-3.3.2.xml.in
new file mode 100644
index 0000000..193e1ab
--- /dev/null
+++ b/data/platforms/xen/xen-3.3.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.3.2">
+    <short-id>xen-3.3.2</short-id>
+    <_name>Xen 3.3.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.3.2</version>
+    <upgrades id="http://xen.org/xen/3.3.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.4.0.xml.in b/data/platforms/xen/xen-3.4.0.xml.in
new file mode 100644
index 0000000..1960d26
--- /dev/null
+++ b/data/platforms/xen/xen-3.4.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.4.0">
+    <short-id>xen-3.4.0</short-id>
+    <_name>Xen 3.4.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.4.0</version>
+    <upgrades id="http://xen.org/xen/3.3.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.4.1.xml.in b/data/platforms/xen/xen-3.4.1.xml.in
new file mode 100644
index 0000000..f393ed5
--- /dev/null
+++ b/data/platforms/xen/xen-3.4.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.4.1">
+    <short-id>xen-3.4.1</short-id>
+    <_name>Xen 3.4.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.4.1</version>
+    <upgrades id="http://xen.org/xen/3.4.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.4.2.xml.in b/data/platforms/xen/xen-3.4.2.xml.in
new file mode 100644
index 0000000..7d213a5
--- /dev/null
+++ b/data/platforms/xen/xen-3.4.2.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.4.2">
+    <short-id>xen-3.4.2</short-id>
+    <_name>Xen 3.4.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.4.2</version>
+    <upgrades id="http://xen.org/xen/3.4.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-3.4.3.xml.in b/data/platforms/xen/xen-3.4.3.xml.in
new file mode 100644
index 0000000..65b7058
--- /dev/null
+++ b/data/platforms/xen/xen-3.4.3.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/3.4.3">
+    <short-id>xen-3.4.3</short-id>
+    <_name>Xen 3.4.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>3.4.3</version>
+    <upgrades id="http://xen.org/xen/3.4.2"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-4.0.0.xml.in b/data/platforms/xen/xen-4.0.0.xml.in
new file mode 100644
index 0000000..3fc79e0
--- /dev/null
+++ b/data/platforms/xen/xen-4.0.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/4.0.0">
+    <short-id>xen-4.0.0</short-id>
+    <_name>Xen 4.0.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>4.0.0</version>
+    <upgrades id="http://xen.org/xen/3.4.3"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-4.0.1.xml.in b/data/platforms/xen/xen-4.0.1.xml.in
new file mode 100644
index 0000000..1acfc56
--- /dev/null
+++ b/data/platforms/xen/xen-4.0.1.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/4.0.1">
+    <short-id>xen-4.0.1</short-id>
+    <_name>Xen 4.0.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>4.0.1</version>
+    <upgrades id="http://xen.org/xen/4.0.0"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/xen/xen-4.1.0.xml.in b/data/platforms/xen/xen-4.1.0.xml.in
new file mode 100644
index 0000000..08d997e
--- /dev/null
+++ b/data/platforms/xen/xen-4.1.0.xml.in
@@ -0,0 +1,16 @@
+<libosinfo version="0.0.1">
+  <platform id="http://xen.org/xen/4.1.0">
+    <short-id>xen-4.1.0</short-id>
+    <_name>Xen 4.1.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
+    <version>4.1.0</version>
+    <upgrades id="http://xen.org/xen/4.0.1"/>
+
+    <devices>
+      <device id="http://xen.org/devices/block"/>
+      <device id="http://xen.org/devices/net"/>
+      <device id="http://xen.org/devices/console"/>
+      <device id="http://xen.org/devices/framebuffer"/>
+    </devices>
+  </platform>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e6b87dc..ab9d863 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -380,7 +380,25 @@ data/platforms/rhel-xen/xen-3.1.0-rhel-5.4.xml.in
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.5.xml.in
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.6.xml.in
 data/platforms/rhel-xen/xen-3.1.0-rhel-5.7.xml.in
-data/platforms/xen.xml.in
+data/platforms/xen/xen-3.0.2.xml.in
+data/platforms/xen/xen-3.0.3.xml.in
+data/platforms/xen/xen-3.0.4.xml.in
+data/platforms/xen/xen-3.1.3.xml.in
+data/platforms/xen/xen-3.1.4.xml.in
+data/platforms/xen/xen-3.2.0.xml.in
+data/platforms/xen/xen-3.2.1.xml.in
+data/platforms/xen/xen-3.2.2.xml.in
+data/platforms/xen/xen-3.2.3.xml.in
+data/platforms/xen/xen-3.3.0.xml.in
+data/platforms/xen/xen-3.3.1.xml.in
+data/platforms/xen/xen-3.3.2.xml.in
+data/platforms/xen/xen-3.4.0.xml.in
+data/platforms/xen/xen-3.4.1.xml.in
+data/platforms/xen/xen-3.4.2.xml.in
+data/platforms/xen/xen-3.4.3.xml.in
+data/platforms/xen/xen-4.0.0.xml.in
+data/platforms/xen/xen-4.0.1.xml.in
+data/platforms/xen/xen-4.1.0.xml.in
 osinfo/osinfo_avatar_format.c
 osinfo/osinfo_deployment.c
 osinfo/osinfo_devicelink.c
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:48 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:48 +0100
Subject: [Libosinfo] [PATCH 30/39] data: split windows-lang into one file
	per datamap
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-31-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/datamaps/Makefile.am                          |   5 +-
 data/datamaps/windows-lang.xml                     | 131 ---------------------
 data/datamaps/windows/Makefile.am                  |   1 +
 data/datamaps/windows/win-7-l10n-language.xml.in   |  40 +++++++
 .../windows/win-8-l10n-language-reverse.xml.in     |  41 +++++++
 data/datamaps/windows/win-8-l10n-language.xml.in   |  41 +++++++
 7 files changed, 128 insertions(+), 132 deletions(-)
 delete mode 100644 data/datamaps/windows-lang.xml
 create mode 100644 data/datamaps/windows/Makefile.am
 create mode 100644 data/datamaps/windows/win-7-l10n-language.xml.in
 create mode 100644 data/datamaps/windows/win-8-l10n-language-reverse.xml.in
 create mode 100644 data/datamaps/windows/win-8-l10n-language.xml.in

diff --git a/configure.ac b/configure.ac
index 8ad150a..12c04ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,7 @@ AC_CONFIG_FILES([
 	osinfo/osinfo_version.h
 	data/Makefile
 	data/datamaps/Makefile
+	data/datamaps/windows/Makefile
 	data/devices/Makefile
 	data/platforms/Makefile
 	data/platforms/qemu/Makefile
diff --git a/data/datamaps/Makefile.am b/data/datamaps/Makefile.am
index 5572005..7f04dc8 100644
--- a/data/datamaps/Makefile.am
+++ b/data/datamaps/Makefile.am
@@ -1,7 +1,10 @@
 
+SUBDIRS = \
+	windows \
+	$(NULL)
+
 datamapdir = $(pkgdatadir)/db/datamaps/
 datamap_DATA =     \
-  windows-lang.xml   \
   x11-keyboard.xml   \
   $(NULL)
 
diff --git a/data/datamaps/windows-lang.xml b/data/datamaps/windows-lang.xml
deleted file mode 100644
index 6b3efe1..0000000
--- a/data/datamaps/windows-lang.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- The datamaps in this file will be used to map the language
-     tag that can be extracted from Windows ISO volume IDs to
-     a generic language ID in the format libosinfo expects
--->
-
-<libosinfo version="0.0.1">
-  <!-- Volume ID strings up to Windows 7 -->
-  <datamap id="http://microsoft.com/win/7/l10n-language">
-    <entry inval="EN" outval="en_US"/>
-    <entry inval="AR" outval="ar_SA"/>
-    <entry inval="BG" outval="bg_BG"/>
-    <entry inval="HK" outval="zh_HK"/>
-    <entry inval="CN" outval="zh_CN"/>
-    <entry inval="TW" outval="zh_TW"/>
-    <entry inval="HR" outval="hr_HR"/>
-    <entry inval="CS" outval="cs_CZ"/>
-    <entry inval="DA" outval="da_DK"/>
-    <entry inval="NL" outval="nl_NL"/>
-    <entry inval="ET" outval="et_EE"/>
-    <entry inval="FI" outval="fi_FI"/>
-    <entry inval="FR" outval="fr_FR"/>
-    <entry inval="DE" outval="de_DE"/>
-    <entry inval="EL" outval="el_GR"/>
-    <entry inval="HE" outval="he_IL"/>
-    <entry inval="HU" outval="hu_HU"/>
-    <entry inval="IT" outval="it_IT"/>
-    <entry inval="JA" outval="ja_JP"/>
-    <entry inval="KO" outval="ko_KR"/>
-    <entry inval="LV" outval="lv_LV"/>
-    <entry inval="LT" outval="lt_LT"/>
-    <entry inval="NO" outval="nb_NO"/>
-    <entry inval="PL" outval="pl_PL"/>
-    <entry inval="BR" outval="pt_BR"/>
-    <entry inval="PT" outval="pt_PT"/>
-    <entry inval="RO" outval="ro_RO"/>
-    <entry inval="RU" outval="ru_RU"/>
-    <entry inval="SRL" outval="sr_RS at latin"/>
-    <entry inval="SK" outval="sk_SK"/>
-    <entry inval="SL" outval="sl_SI"/>
-    <entry inval="ES" outval="es_ES"/>
-    <entry inval="SV" outval="sv_SE"/>
-    <entry inval="TH" outval="th_TH"/>
-    <entry inval="TR" outval="tr_TR"/>
-    <entry inval="UK" outval="uk_UA"/>
-  </datamap>
-
-  <!-- Volume ID strings starting from Windows 8 -->
-  <datamap id="http://microsoft.com/win/8/l10n-language">
-    <entry inval="EN-US" outval="en_US"/>
-    <entry inval="EN-GB" outval="en_GB"/>
-    <entry inval="AR-SA" outval="ar_SA"/>
-    <entry inval="BG-BG" outval="bg_BG"/>
-    <entry inval="ZH-HK" outval="zh_HK"/>
-    <entry inval="ZH-CN" outval="zh_CN"/>
-    <entry inval="ZH-TW" outval="zh_TW"/>
-    <entry inval="HR-HR" outval="hr_HR"/>
-    <entry inval="CS-CZ" outval="cs_CZ"/>
-    <entry inval="DA-DK" outval="da_DK"/>
-    <entry inval="NL-NL" outval="nl_NL"/>
-    <entry inval="ET-EE" outval="et_EE"/>
-    <entry inval="FI-FI" outval="fi_FI"/>
-    <entry inval="FR-FR" outval="fr_FR"/>
-    <entry inval="DE-DE" outval="de_DE"/>
-    <entry inval="EL-GR" outval="el_GR"/>
-    <entry inval="HE-IL" outval="he_IL"/>
-    <entry inval="HU-HU" outval="hu_HU"/>
-    <entry inval="IT-IT" outval="it_IT"/>
-    <entry inval="JA-JP" outval="ja_JP"/>
-    <entry inval="KO-KR" outval="ko_KR"/>
-    <entry inval="LV-LV" outval="lv_LV"/>
-    <entry inval="LT-LT" outval="lt_LT"/>
-    <entry inval="NB-NO" outval="nb_NO"/>
-    <entry inval="PL-PL" outval="pl_PL"/>
-    <entry inval="PT-BR" outval="pt_BR"/>
-    <entry inval="PT-PT" outval="pt_PT"/>
-    <entry inval="RO-RO" outval="ro_RO"/>
-    <entry inval="RU-RU" outval="ru_RU"/>
-    <entry inval="SR-LATN-CS" outval="sr_RS at latin"/>
-    <entry inval="SK-SK" outval="sk_SK"/>
-    <entry inval="SL-SI" outval="sl_SI"/>
-    <entry inval="ES-ES" outval="es_ES"/>
-    <entry inval="SV-SE" outval="sv_SE"/>
-    <entry inval="TH-TH" outval="th_TH"/>
-    <entry inval="TR-TR" outval="tr_TR"/>
-    <entry inval="UK-UA" outval="uk_UA"/>
-  </datamap>
-
-  <!-- Reverse map of above, for mapping GETTEXT language codes to ISO standard
-       language codes used by Windows. -->
-  <datamap id="http://microsoft.com/win/8/l10n-language-reverse">
-    <entry inval="en_US" outval="EN-US"/>
-    <entry inval="en_GB" outval="EN-GB"/>
-    <entry inval="ar_SA" outval="AR-SA"/>
-    <entry inval="bg_BG" outval="BG-BG"/>
-    <entry inval="zh_HK" outval="ZH-HK"/>
-    <entry inval="zh_CN" outval="ZH-CN"/>
-    <entry inval="zh_TW" outval="ZH-TW"/>
-    <entry inval="hr_HR" outval="HR-HR"/>
-    <entry inval="cs_CZ" outval="CS-CZ"/>
-    <entry inval="da_DK" outval="DA-DK"/>
-    <entry inval="nl_NL" outval="NL-NL"/>
-    <entry inval="et_EE" outval="ET-EE"/>
-    <entry inval="fi_FI" outval="FI-FI"/>
-    <entry inval="fr_FR" outval="FR-FR"/>
-    <entry inval="de_DE" outval="DE-DE"/>
-    <entry inval="el_GR" outval="EL-GR"/>
-    <entry inval="he_IL" outval="HE-IL"/>
-    <entry inval="hu_HU" outval="HU-HU"/>
-    <entry inval="it_IT" outval="IT-IT"/>
-    <entry inval="ja_JP" outval="JA-JP"/>
-    <entry inval="ko_KR" outval="KO-KR"/>
-    <entry inval="lv_LV" outval="LV-LV"/>
-    <entry inval="lt_LT" outval="LT-LT"/>
-    <entry inval="nb_NO" outval="NB-NO"/>
-    <entry inval="pl_PL" outval="PL-PL"/>
-    <entry inval="pt_BR" outval="PT-BR"/>
-    <entry inval="pt_PT" outval="PT-PT"/>
-    <entry inval="ro_RO" outval="RO-RO"/>
-    <entry inval="ru_RU" outval="RU-RU"/>
-    <entry inval="sr_RS at latin" outval="SR-LATN-CS"/>
-    <entry inval="sk_SK" outval="SK-SK"/>
-    <entry inval="sl_SI" outval="SL-SI"/>
-    <entry inval="es_ES" outval="ES-ES"/>
-    <entry inval="sv_SE" outval="SV-SE"/>
-    <entry inval="th_TH" outval="TH-TH"/>
-    <entry inval="tr_TR" outval="TR-TR"/>
-    <entry inval="uk_UA" outval="UK-UA"/>
-  </datamap>
-</libosinfo>
diff --git a/data/datamaps/windows/Makefile.am b/data/datamaps/windows/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/datamaps/windows/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/datamaps/windows/win-7-l10n-language.xml.in b/data/datamaps/windows/win-7-l10n-language.xml.in
new file mode 100644
index 0000000..65d36f6
--- /dev/null
+++ b/data/datamaps/windows/win-7-l10n-language.xml.in
@@ -0,0 +1,40 @@
+<libosinfo version="0.0.1">
+  <datamap id="http://microsoft.com/win/7/l10n-language">
+    <entry inval="EN" outval="en_US"/>
+    <entry inval="AR" outval="ar_SA"/>
+    <entry inval="BG" outval="bg_BG"/>
+    <entry inval="HK" outval="zh_HK"/>
+    <entry inval="CN" outval="zh_CN"/>
+    <entry inval="TW" outval="zh_TW"/>
+    <entry inval="HR" outval="hr_HR"/>
+    <entry inval="CS" outval="cs_CZ"/>
+    <entry inval="DA" outval="da_DK"/>
+    <entry inval="NL" outval="nl_NL"/>
+    <entry inval="ET" outval="et_EE"/>
+    <entry inval="FI" outval="fi_FI"/>
+    <entry inval="FR" outval="fr_FR"/>
+    <entry inval="DE" outval="de_DE"/>
+    <entry inval="EL" outval="el_GR"/>
+    <entry inval="HE" outval="he_IL"/>
+    <entry inval="HU" outval="hu_HU"/>
+    <entry inval="IT" outval="it_IT"/>
+    <entry inval="JA" outval="ja_JP"/>
+    <entry inval="KO" outval="ko_KR"/>
+    <entry inval="LV" outval="lv_LV"/>
+    <entry inval="LT" outval="lt_LT"/>
+    <entry inval="NO" outval="nb_NO"/>
+    <entry inval="PL" outval="pl_PL"/>
+    <entry inval="BR" outval="pt_BR"/>
+    <entry inval="PT" outval="pt_PT"/>
+    <entry inval="RO" outval="ro_RO"/>
+    <entry inval="RU" outval="ru_RU"/>
+    <entry inval="SRL" outval="sr_RS at latin"/>
+    <entry inval="SK" outval="sk_SK"/>
+    <entry inval="SL" outval="sl_SI"/>
+    <entry inval="ES" outval="es_ES"/>
+    <entry inval="SV" outval="sv_SE"/>
+    <entry inval="TH" outval="th_TH"/>
+    <entry inval="TR" outval="tr_TR"/>
+    <entry inval="UK" outval="uk_UA"/>
+  </datamap>
+</libosinfo>
diff --git a/data/datamaps/windows/win-8-l10n-language-reverse.xml.in b/data/datamaps/windows/win-8-l10n-language-reverse.xml.in
new file mode 100644
index 0000000..bad940f
--- /dev/null
+++ b/data/datamaps/windows/win-8-l10n-language-reverse.xml.in
@@ -0,0 +1,41 @@
+<libosinfo version="0.0.1">
+  <datamap id="http://microsoft.com/win/8/l10n-language-reverse">
+    <entry inval="en_US" outval="EN-US"/>
+    <entry inval="en_GB" outval="EN-GB"/>
+    <entry inval="ar_SA" outval="AR-SA"/>
+    <entry inval="bg_BG" outval="BG-BG"/>
+    <entry inval="zh_HK" outval="ZH-HK"/>
+    <entry inval="zh_CN" outval="ZH-CN"/>
+    <entry inval="zh_TW" outval="ZH-TW"/>
+    <entry inval="hr_HR" outval="HR-HR"/>
+    <entry inval="cs_CZ" outval="CS-CZ"/>
+    <entry inval="da_DK" outval="DA-DK"/>
+    <entry inval="nl_NL" outval="NL-NL"/>
+    <entry inval="et_EE" outval="ET-EE"/>
+    <entry inval="fi_FI" outval="FI-FI"/>
+    <entry inval="fr_FR" outval="FR-FR"/>
+    <entry inval="de_DE" outval="DE-DE"/>
+    <entry inval="el_GR" outval="EL-GR"/>
+    <entry inval="he_IL" outval="HE-IL"/>
+    <entry inval="hu_HU" outval="HU-HU"/>
+    <entry inval="it_IT" outval="IT-IT"/>
+    <entry inval="ja_JP" outval="JA-JP"/>
+    <entry inval="ko_KR" outval="KO-KR"/>
+    <entry inval="lv_LV" outval="LV-LV"/>
+    <entry inval="lt_LT" outval="LT-LT"/>
+    <entry inval="nb_NO" outval="NB-NO"/>
+    <entry inval="pl_PL" outval="PL-PL"/>
+    <entry inval="pt_BR" outval="PT-BR"/>
+    <entry inval="pt_PT" outval="PT-PT"/>
+    <entry inval="ro_RO" outval="RO-RO"/>
+    <entry inval="ru_RU" outval="RU-RU"/>
+    <entry inval="sr_RS at latin" outval="SR-LATN-CS"/>
+    <entry inval="sk_SK" outval="SK-SK"/>
+    <entry inval="sl_SI" outval="SL-SI"/>
+    <entry inval="es_ES" outval="ES-ES"/>
+    <entry inval="sv_SE" outval="SV-SE"/>
+    <entry inval="th_TH" outval="TH-TH"/>
+    <entry inval="tr_TR" outval="TR-TR"/>
+    <entry inval="uk_UA" outval="UK-UA"/>
+  </datamap>
+</libosinfo>
diff --git a/data/datamaps/windows/win-8-l10n-language.xml.in b/data/datamaps/windows/win-8-l10n-language.xml.in
new file mode 100644
index 0000000..a847b38
--- /dev/null
+++ b/data/datamaps/windows/win-8-l10n-language.xml.in
@@ -0,0 +1,41 @@
+<libosinfo version="0.0.1">
+  <datamap id="http://microsoft.com/win/8/l10n-language">
+    <entry inval="EN-US" outval="en_US"/>
+    <entry inval="EN-GB" outval="en_GB"/>
+    <entry inval="AR-SA" outval="ar_SA"/>
+    <entry inval="BG-BG" outval="bg_BG"/>
+    <entry inval="ZH-HK" outval="zh_HK"/>
+    <entry inval="ZH-CN" outval="zh_CN"/>
+    <entry inval="ZH-TW" outval="zh_TW"/>
+    <entry inval="HR-HR" outval="hr_HR"/>
+    <entry inval="CS-CZ" outval="cs_CZ"/>
+    <entry inval="DA-DK" outval="da_DK"/>
+    <entry inval="NL-NL" outval="nl_NL"/>
+    <entry inval="ET-EE" outval="et_EE"/>
+    <entry inval="FI-FI" outval="fi_FI"/>
+    <entry inval="FR-FR" outval="fr_FR"/>
+    <entry inval="DE-DE" outval="de_DE"/>
+    <entry inval="EL-GR" outval="el_GR"/>
+    <entry inval="HE-IL" outval="he_IL"/>
+    <entry inval="HU-HU" outval="hu_HU"/>
+    <entry inval="IT-IT" outval="it_IT"/>
+    <entry inval="JA-JP" outval="ja_JP"/>
+    <entry inval="KO-KR" outval="ko_KR"/>
+    <entry inval="LV-LV" outval="lv_LV"/>
+    <entry inval="LT-LT" outval="lt_LT"/>
+    <entry inval="NB-NO" outval="nb_NO"/>
+    <entry inval="PL-PL" outval="pl_PL"/>
+    <entry inval="PT-BR" outval="pt_BR"/>
+    <entry inval="PT-PT" outval="pt_PT"/>
+    <entry inval="RO-RO" outval="ro_RO"/>
+    <entry inval="RU-RU" outval="ru_RU"/>
+    <entry inval="SR-LATN-CS" outval="sr_RS at latin"/>
+    <entry inval="SK-SK" outval="sk_SK"/>
+    <entry inval="SL-SI" outval="sl_SI"/>
+    <entry inval="ES-ES" outval="es_ES"/>
+    <entry inval="SV-SE" outval="sv_SE"/>
+    <entry inval="TH-TH" outval="th_TH"/>
+    <entry inval="TR-TR" outval="tr_TR"/>
+    <entry inval="UK-UA" outval="uk_UA"/>
+  </datamap>
+</libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:49 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:49 +0100
Subject: [Libosinfo] [PATCH 31/39] data: split x11-keyboard into one file
	per datamap
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-32-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                                | 1 +
 data/datamaps/Makefile.am                                   | 8 +-------
 data/datamaps/x11/Makefile.am                               | 1 +
 data/datamaps/{x11-keyboard.xml => x11/x11-keyboard.xml.in} | 7 -------
 4 files changed, 3 insertions(+), 14 deletions(-)
 create mode 100644 data/datamaps/x11/Makefile.am
 rename data/datamaps/{x11-keyboard.xml => x11/x11-keyboard.xml.in} (96%)

diff --git a/configure.ac b/configure.ac
index 12c04ff..3c4a781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,7 @@ AC_CONFIG_FILES([
 	data/Makefile
 	data/datamaps/Makefile
 	data/datamaps/windows/Makefile
+	data/datamaps/x11/Makefile
 	data/devices/Makefile
 	data/platforms/Makefile
 	data/platforms/qemu/Makefile
diff --git a/data/datamaps/Makefile.am b/data/datamaps/Makefile.am
index 7f04dc8..017912b 100644
--- a/data/datamaps/Makefile.am
+++ b/data/datamaps/Makefile.am
@@ -1,11 +1,5 @@
 
 SUBDIRS = \
 	windows \
+	x11 \
 	$(NULL)
-
-datamapdir = $(pkgdatadir)/db/datamaps/
-datamap_DATA =     \
-  x11-keyboard.xml   \
-  $(NULL)
-
-EXTRA_DIST = $(datamap_DATA)
diff --git a/data/datamaps/x11/Makefile.am b/data/datamaps/x11/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/datamaps/x11/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/datamaps/x11-keyboard.xml b/data/datamaps/x11/x11-keyboard.xml.in
similarity index 96%
rename from data/datamaps/x11-keyboard.xml
rename to data/datamaps/x11/x11-keyboard.xml.in
index 15a7cd5..0057259 100644
--- a/data/datamaps/x11-keyboard.xml
+++ b/data/datamaps/x11/x11-keyboard.xml.in
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- The datamaps in this file will be used to map the GETTEXT locale
-     codes to X11 keyboard layouts.
--->
-
 <libosinfo version="0.0.1">
-  <!-- GETTEXT locale to X11 keyboard layout mapping -->
   <datamap id="http://libosinfo.fedorahosted.org/x11-keyboard">
     <entry inval="af_ZA" outval="za"/>
     <entry inval="ar_AE" outval="ae"/>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:50 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:50 +0100
Subject: [Libosinfo] [PATCH 32/39] data: split debian into one file per
	install script
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-33-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/install-scripts/Makefile.am                   |   5 +-
 data/install-scripts/debian/Makefile.am            |   1 +
 .../{debian.xml => debian/debian-desktop.xml.in}   | 128 ---------------------
 data/install-scripts/debian/debian-jeos.xml.in     | 127 ++++++++++++++++++++
 5 files changed, 133 insertions(+), 129 deletions(-)
 create mode 100644 data/install-scripts/debian/Makefile.am
 rename data/install-scripts/{debian.xml => debian/debian-desktop.xml.in} (59%)
 create mode 100644 data/install-scripts/debian/debian-jeos.xml.in

diff --git a/configure.ac b/configure.ac
index 3c4a781..cd40122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_CONFIG_FILES([
 	data/platforms/rhel-xen/Makefile
 	data/platforms/xen/Makefile
 	data/install-scripts/Makefile
+	data/install-scripts/debian/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 78decc2..a58da97 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -1,7 +1,10 @@
 
+SUBDIRS = \
+	debian \
+	$(NULL)
+
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
-  debian.xml        \
   fedora.xml        \
   rhel.xml          \
   ubuntu.xml        \
diff --git a/data/install-scripts/debian/Makefile.am b/data/install-scripts/debian/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/debian/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian/debian-desktop.xml.in
similarity index 59%
rename from data/install-scripts/debian.xml
rename to data/install-scripts/debian/debian-desktop.xml.in
index b164b01..898a23a 100644
--- a/data/install-scripts/debian.xml
+++ b/data/install-scripts/debian/debian-desktop.xml.in
@@ -1,132 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
-  <install-script id='http://debian.org/scripts/debian/jeos'>
-    <profile>jeos</profile>
-    <expected-filename>preseed.cfg</expected-filename>
-    <can-pre-install-drivers>true</can-pre-install-drivers>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
-      <param name="l10n-timezone" policy="optional"/>
-      <param name="l10n-language" policy="optional"/>
-      <param name="target-disk" policy="optional"/>
-    </config>
-    <injection-method>initrd</injection-method>
-    <!-- FIXME: The need of an internet connection may be avoidable. It is
-         necessary for now since in this version the debian installer will
-         error out with a "bad archive mirror" message and refuse to continue
-         without user input. -->
-    <needs-internet>true</needs-internet>
-    <template>
-      <xsl:stylesheet
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        version="1.0">
-
-        <xsl:output method="text"/>
-
-        <xsl:template name="target-disk">
-          <xsl:choose>
-            <xsl:when test="config/target-disk != ''">
-              <xsl:value-of select="config/target-disk"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>/dev/vda</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="l10n-language">
-          <xsl:choose>
-            <xsl:when test="config/l10n-language != '' and config/l10n-language != 'C'">
-              <xsl:value-of select="config/l10n-language"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>en_US</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="l10n-keyboard">
-          <xsl:choose>
-            <xsl:when test="config/l10n-keyboard != '' and config/l10n-keyboard != 'C'">
-              <xsl:value-of select="config/l10n-keyboard"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>us</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template match="/command-line">
-            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
-            <xsl:call-template name="l10n-keyboard"/>
-            <xsl:text> debconf/priority=critical</xsl:text>
-        </xsl:template>
-
-<xsl:template match="/install-script-config">
-d-i debian-installer/locale select <xsl:call-template name="l10n-language"/>
-d-i console-setup/ask_detect boolean false
-d-i console-setup/layoutcode string <xsl:call-template name="l10n-keyboard"/>
-
-d-i netcfg/choose_interface select auto
-d-i netcfg/get_hostname string localhost
-d-i netcfg/get_domain string localdomain
-d-i netcfg/disable_dhcp     boolean false
-d-i mirror/http/proxy string
-d-i netcfg/wireless_wep string
-
-d-i clock-setup/utc boolean true
-d-i time/zone select <xsl:value-of select="config/l10n-timezone"/>
-
-d-i partman-auto/disk string <xsl:call-template name="target-disk"/>
-d-i partman-auto/method string regular
-d-i partman-auto/choose_recipe select home
-
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-d-i passwd/root-login boolean true
-d-i passwd/make-user boolean false
-<xsl:choose>
-  <xsl:when test="config/admin-password = ''">
-# Real password will be set later
-d-i passwd/root-password password dummyPa55w0rd
-d-i passwd/root-password-again password dummyPa55w0rd
-  </xsl:when>
-  <xsl:otherwise>
-d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
-d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
-  </xsl:otherwise>
-</xsl:choose>
-
-tasksel tasksel/first multiselect standard
-
-# Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666974
-d-i grub-installer/only_debian boolean false
-d-i grub-installer/bootdev string <xsl:call-template name="target-disk"/>
-
-d-i apt-setup/security_host string
-d-i apt-setup/services-select multiselect
-d-i apt-setup/volatile_host string
-d-i apt-setup/security_host string
-
-d-i finish-install/reboot_in_progress note
-
-<xsl:choose>
-  <xsl:when test="config/admin-password = ''">
-# Delete password
-d-i preseed/late_command string in-target passwd -d root
-  </xsl:when>
-</xsl:choose>
-
-</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://debian.org/scripts/debian/desktop'>
     <profile>desktop</profile>
     <expected-filename>preseed.cfg</expected-filename>
diff --git a/data/install-scripts/debian/debian-jeos.xml.in b/data/install-scripts/debian/debian-jeos.xml.in
new file mode 100644
index 0000000..97c355f
--- /dev/null
+++ b/data/install-scripts/debian/debian-jeos.xml.in
@@ -0,0 +1,127 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://debian.org/scripts/debian/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>preseed.cfg</expected-filename>
+    <can-pre-install-drivers>true</can-pre-install-drivers>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+    </config>
+    <injection-method>initrd</injection-method>
+    <!-- FIXME: The need of an internet connection may be avoidable. It is
+         necessary for now since in this version the debian installer will
+         error out with a "bad archive mirror" message and refuse to continue
+         without user input. -->
+    <needs-internet>true</needs-internet>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>/dev/vda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="l10n-language">
+          <xsl:choose>
+            <xsl:when test="config/l10n-language != '' and config/l10n-language != 'C'">
+              <xsl:value-of select="config/l10n-language"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>en_US</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="l10n-keyboard">
+          <xsl:choose>
+            <xsl:when test="config/l10n-keyboard != '' and config/l10n-keyboard != 'C'">
+              <xsl:value-of select="config/l10n-keyboard"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>us</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template match="/command-line">
+            <xsl:text> keyboard-configuration/xkb-keymap=</xsl:text>
+            <xsl:call-template name="l10n-keyboard"/>
+            <xsl:text> debconf/priority=critical</xsl:text>
+        </xsl:template>
+
+<xsl:template match="/install-script-config">
+d-i debian-installer/locale select <xsl:call-template name="l10n-language"/>
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layoutcode string <xsl:call-template name="l10n-keyboard"/>
+
+d-i netcfg/choose_interface select auto
+d-i netcfg/get_hostname string localhost
+d-i netcfg/get_domain string localdomain
+d-i netcfg/disable_dhcp     boolean false
+d-i mirror/http/proxy string
+d-i netcfg/wireless_wep string
+
+d-i clock-setup/utc boolean true
+d-i time/zone select <xsl:value-of select="config/l10n-timezone"/>
+
+d-i partman-auto/disk string <xsl:call-template name="target-disk"/>
+d-i partman-auto/method string regular
+d-i partman-auto/choose_recipe select home
+
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i passwd/root-login boolean true
+d-i passwd/make-user boolean false
+<xsl:choose>
+  <xsl:when test="config/admin-password = ''">
+# Real password will be set later
+d-i passwd/root-password password dummyPa55w0rd
+d-i passwd/root-password-again password dummyPa55w0rd
+  </xsl:when>
+  <xsl:otherwise>
+d-i passwd/root-password password <xsl:value-of select="config/admin-password"/>
+d-i passwd/root-password-again password <xsl:value-of select="config/admin-password"/>
+  </xsl:otherwise>
+</xsl:choose>
+
+tasksel tasksel/first multiselect standard
+
+# Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666974
+d-i grub-installer/only_debian boolean false
+d-i grub-installer/bootdev string <xsl:call-template name="target-disk"/>
+
+d-i apt-setup/security_host string
+d-i apt-setup/services-select multiselect
+d-i apt-setup/volatile_host string
+d-i apt-setup/security_host string
+
+d-i finish-install/reboot_in_progress note
+
+<xsl:choose>
+  <xsl:when test="config/admin-password = ''">
+# Delete password
+d-i preseed/late_command string in-target passwd -d root
+  </xsl:when>
+</xsl:choose>
+
+</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:51 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:51 +0100
Subject: [Libosinfo] [PATCH 33/39] data: split fedora into one file per
	install script
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-34-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/install-scripts/Makefile.am                   |   2 +-
 data/install-scripts/fedora/Makefile.am            |   1 +
 .../{fedora.xml => fedora/fedora-desktop.xml.in}   | 158 ---------------------
 data/install-scripts/fedora/fedora-jeos.xml.in     | 156 ++++++++++++++++++++
 5 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 data/install-scripts/fedora/Makefile.am
 rename data/install-scripts/{fedora.xml => fedora/fedora-desktop.xml.in} (56%)
 create mode 100644 data/install-scripts/fedora/fedora-jeos.xml.in

diff --git a/configure.ac b/configure.ac
index cd40122..7e6758f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AC_CONFIG_FILES([
 	data/platforms/xen/Makefile
 	data/install-scripts/Makefile
 	data/install-scripts/debian/Makefile
+	data/install-scripts/fedora/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index a58da97..69cbed1 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -1,11 +1,11 @@
 
 SUBDIRS = \
 	debian \
+	fedora \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
-  fedora.xml        \
   rhel.xml          \
   ubuntu.xml        \
   windows-sif.xml   \
diff --git a/data/install-scripts/fedora/Makefile.am b/data/install-scripts/fedora/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/fedora/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora/fedora-desktop.xml.in
similarity index 56%
rename from data/install-scripts/fedora.xml
rename to data/install-scripts/fedora/fedora-desktop.xml.in
index 09233ed..6a02da0 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedora/fedora-desktop.xml.in
@@ -1,161 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
-  <install-script id='http://fedoraproject.org/scripts/fedora/jeos'>
-    <profile>jeos</profile>
-    <expected-filename>fedora.ks</expected-filename>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
-      <param name="l10n-language" policy="optional"/>
-      <param name="l10n-timezone" policy="optional"/>
-      <param name="target-disk" policy="optional"/>
-      <param name="script-disk" policy="required"/>
-    </config>
-    <injection-method>cdrom</injection-method>
-    <injection-method>disk</injection-method>
-    <injection-method>floppy</injection-method>
-    <template>
-      <xsl:stylesheet
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        version="1.0">
-
-        <xsl:output method="text"/>
-
-        <xsl:template name="target-disk">
-          <xsl:choose>
-            <xsl:when test="config/target-disk != ''">
-              <xsl:value-of select="config/target-disk"/>
-            </xsl:when>
-            <xsl:when test="os/version &gt; 9">
-              <!-- virtio -->
-              <xsl:text>/dev/vda</xsl:text>
-            </xsl:when>
-            <xsl:when test="os/version &gt; 6">
-              <!-- libata IDE -->
-              <xsl:text>/dev/sda</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- IDE -->
-              <xsl:text>/dev/hda</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="script-disk">
-          <xsl:variable name="script-disk">
-            <xsl:value-of select="config/script-disk"/>
-          </xsl:variable>
-          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
-        </xsl:template>
-
-	<xsl:template name="rootfs">
-	  <xsl:choose>
-	    <xsl:when test="os/version &gt; 10">
-	      <xsl:text>ext4</xsl:text>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>ext3</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="bootfs">
-	  <xsl:choose>
-	    <xsl:when test="os/version &gt; 11">
-	      <xsl:text>ext4</xsl:text>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>ext3</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="keyboard">
-	  <xsl:choose>
-	    <xsl:when test="os/version &gt; 17">
-              <xsl:value-of select="config/l10n-keyboard"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-              <!-- FIXME: F17 and older required keyboard layout to be a console
-                   layout so we'll need a different datamap for those but
-                   currently we only support one datamap per config param per
-                   script. -->
-	      <xsl:text>us</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-        <xsl:template match="/command-line">
-            <xsl:text>ks=hd:</xsl:text>
-            <xsl:call-template name="script-disk"/>
-            <xsl:text>:/</xsl:text>
-            <xsl:value-of select="script/expected-filename"/>
-        </xsl:template>
-
-        <xsl:template match="/install-script-config">
-# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
-<xsl:if test="count(media/variant) = 0 or not(contains(media/variant, 'netinst'))">
-install
-cdrom
-</xsl:if>
-text
-keyboard '<xsl:call-template name="keyboard"/>'
-lang <xsl:value-of select="config/l10n-language"/>
-<xsl:if test="os/version &lt; 7">
-langsupport --default <xsl:value-of select="config/l10n-language"/> <xsl:value-of select="config/l10n-language"/>
-mouse generic3ps/2 --device psaux
-</xsl:if>
-skipx
-network --bootproto dhcp
-rootpw <xsl:value-of select="config/admin-password"/>
-firewall --disabled
-authconfig --enableshadow --enablemd5
-<xsl:if test="os/version &gt; 1">
-selinux --enforcing
-</xsl:if>
-timezone --utc <xsl:value-of select="config/l10n-timezone"/>
-bootloader --location=mbr
-zerombr <xsl:if test="os/version &lt; 14">yes</xsl:if>
-
-clearpart --all --drives=<xsl:call-template name="target-disk"/>
-
-<xsl:if test="os/version &gt; 15">
-part biosboot --fstype=biosboot --size=1
-</xsl:if>
-part /boot --fstype <xsl:call-template name="bootfs"/> --recommended --ondisk=<xsl:call-template name="target-disk"/>
-part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype <xsl:call-template name="rootfs"/> --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-reboot
-
-<xsl:if test="contains(media/variant, 'netinst')">
-repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
-repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
-</xsl:if>
-
-%packages
-<xsl:choose>
-  <xsl:when test="os/version &lt; 18">
- at base
-  </xsl:when>
-  <xsl:otherwise>
- at standard
-  </xsl:otherwise>
-</xsl:choose>
- at core
-<xsl:if test="os/version &gt; 6">
- at hardware-support
-</xsl:if>
-
-%end
-	</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://fedoraproject.org/scripts/fedora/desktop'>
     <profile>desktop</profile>
     <expected-filename>fedora.ks</expected-filename>
@@ -366,5 +209,4 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
       </xsl:stylesheet>
     </template>
   </install-script>
-
 </libosinfo>
diff --git a/data/install-scripts/fedora/fedora-jeos.xml.in b/data/install-scripts/fedora/fedora-jeos.xml.in
new file mode 100644
index 0000000..2320a54
--- /dev/null
+++ b/data/install-scripts/fedora/fedora-jeos.xml.in
@@ -0,0 +1,156 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://fedoraproject.org/scripts/fedora/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>fedora.ks</expected-filename>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://libosinfo.fedorahosted.org/x11-keyboard"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="script-disk" policy="required"/>
+    </config>
+    <injection-method>cdrom</injection-method>
+    <injection-method>disk</injection-method>
+    <injection-method>floppy</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:when test="os/version &gt; 9">
+              <!-- virtio -->
+              <xsl:text>/dev/vda</xsl:text>
+            </xsl:when>
+            <xsl:when test="os/version &gt; 6">
+              <!-- libata IDE -->
+              <xsl:text>/dev/sda</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- IDE -->
+              <xsl:text>/dev/hda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="script-disk">
+          <xsl:variable name="script-disk">
+            <xsl:value-of select="config/script-disk"/>
+          </xsl:variable>
+          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
+        </xsl:template>
+
+	<xsl:template name="rootfs">
+	  <xsl:choose>
+	    <xsl:when test="os/version &gt; 10">
+	      <xsl:text>ext4</xsl:text>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ext3</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="bootfs">
+	  <xsl:choose>
+	    <xsl:when test="os/version &gt; 11">
+	      <xsl:text>ext4</xsl:text>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ext3</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="keyboard">
+	  <xsl:choose>
+	    <xsl:when test="os/version &gt; 17">
+              <xsl:value-of select="config/l10n-keyboard"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+              <!-- FIXME: F17 and older required keyboard layout to be a console
+                   layout so we'll need a different datamap for those but
+                   currently we only support one datamap per config param per
+                   script. -->
+	      <xsl:text>us</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+        <xsl:template match="/command-line">
+            <xsl:text>ks=hd:</xsl:text>
+            <xsl:call-template name="script-disk"/>
+            <xsl:text>:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+        </xsl:template>
+
+        <xsl:template match="/install-script-config">
+# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+<xsl:if test="count(media/variant) = 0 or not(contains(media/variant, 'netinst'))">
+install
+cdrom
+</xsl:if>
+text
+keyboard '<xsl:call-template name="keyboard"/>'
+lang <xsl:value-of select="config/l10n-language"/>
+<xsl:if test="os/version &lt; 7">
+langsupport --default <xsl:value-of select="config/l10n-language"/> <xsl:value-of select="config/l10n-language"/>
+mouse generic3ps/2 --device psaux
+</xsl:if>
+skipx
+network --bootproto dhcp
+rootpw <xsl:value-of select="config/admin-password"/>
+firewall --disabled
+authconfig --enableshadow --enablemd5
+<xsl:if test="os/version &gt; 1">
+selinux --enforcing
+</xsl:if>
+timezone --utc <xsl:value-of select="config/l10n-timezone"/>
+bootloader --location=mbr
+zerombr <xsl:if test="os/version &lt; 14">yes</xsl:if>
+
+clearpart --all --drives=<xsl:call-template name="target-disk"/>
+
+<xsl:if test="os/version &gt; 15">
+part biosboot --fstype=biosboot --size=1
+</xsl:if>
+part /boot --fstype <xsl:call-template name="bootfs"/> --recommended --ondisk=<xsl:call-template name="target-disk"/>
+part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
+volgroup VolGroup00 --pesize=32768 pv.2
+logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
+logvol / --fstype <xsl:call-template name="rootfs"/> --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+reboot
+
+<xsl:if test="contains(media/variant, 'netinst')">
+repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch
+repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&amp;arch=$basearch
+</xsl:if>
+
+%packages
+<xsl:choose>
+  <xsl:when test="os/version &lt; 18">
+ at base
+  </xsl:when>
+  <xsl:otherwise>
+ at standard
+  </xsl:otherwise>
+</xsl:choose>
+ at core
+<xsl:if test="os/version &gt; 6">
+ at hardware-support
+</xsl:if>
+
+%end
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:52 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:52 +0100
Subject: [Libosinfo] [PATCH 34/39] data: split rhel into one file per
	install script
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-35-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/install-scripts/Makefile.am                   |   2 +-
 data/install-scripts/rhel/Makefile.am              |   1 +
 .../{rhel.xml => rhel/rhel-desktop.xml.in}         | 107 ---------------------
 data/install-scripts/rhel/rhel-jeos.xml.in         | 105 ++++++++++++++++++++
 5 files changed, 108 insertions(+), 108 deletions(-)
 create mode 100644 data/install-scripts/rhel/Makefile.am
 rename data/install-scripts/{rhel.xml => rhel/rhel-desktop.xml.in} (58%)
 create mode 100644 data/install-scripts/rhel/rhel-jeos.xml.in

diff --git a/configure.ac b/configure.ac
index 7e6758f..ebf0fd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,7 @@ AC_CONFIG_FILES([
 	data/install-scripts/Makefile
 	data/install-scripts/debian/Makefile
 	data/install-scripts/fedora/Makefile
+	data/install-scripts/rhel/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 69cbed1..1800762 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -2,11 +2,11 @@
 SUBDIRS = \
 	debian \
 	fedora \
+	rhel \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
-  rhel.xml          \
   ubuntu.xml        \
   windows-sif.xml   \
   windows-cmd.xml   \
diff --git a/data/install-scripts/rhel/Makefile.am b/data/install-scripts/rhel/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/rhel/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel/rhel-desktop.xml.in
similarity index 58%
rename from data/install-scripts/rhel.xml
rename to data/install-scripts/rhel/rhel-desktop.xml.in
index ddad117..913a7be 100644
--- a/data/install-scripts/rhel.xml
+++ b/data/install-scripts/rhel/rhel-desktop.xml.in
@@ -1,110 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
-  <install-script id='http://redhat.com/scripts/rhel/jeos'>
-    <profile>jeos</profile>
-    <expected-filename>rhel.ks</expected-filename>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="l10n-keyboard" policy="optional"/>
-      <param name="l10n-language" policy="optional"/>
-      <param name="l10n-timezone" policy="optional"/>
-      <param name="target-disk" policy="optional"/>
-      <param name="script-disk" policy="required"/>
-    </config>
-    <injection-method>cdrom</injection-method>
-    <injection-method>disk</injection-method>
-    <injection-method>floppy</injection-method>
-    <template>
-      <xsl:stylesheet
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        version="1.0">
-
-        <xsl:output method="text"/>
-
-        <xsl:template name="target-disk">
-          <xsl:choose>
-            <xsl:when test="config/target-disk != ''">
-              <xsl:value-of select="config/target-disk"/>
-            </xsl:when>
-            <xsl:when test="os/version &gt; 4">
-              <!-- virtio -->
-              <xsl:text>/dev/vda</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- IDE -->
-              <xsl:text>/dev/sda</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="script-disk">
-          <xsl:variable name="script-disk">
-            <xsl:value-of select="config/script-disk"/>
-          </xsl:variable>
-          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
-        </xsl:template>
-
-        <xsl:template match="/command-line">
-            <xsl:text>ks=hd:</xsl:text>
-            <xsl:call-template name="script-disk"/>
-            <xsl:text>:/</xsl:text>
-            <xsl:value-of select="script/expected-filename"/>
-        </xsl:template>
-
-        <xsl:template match="/install-script-config">
-# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
-install
-cdrom
-text
-<!-- FIXME: RHEL requires keyboard layout to be a console layout so to do this right, we'll need
-            mapping from language to console layout. -->
-keyboard us
-lang <xsl:value-of select="config/l10n-language"/>
-skipx
-network --bootproto dhcp
-rootpw <xsl:value-of select="config/admin-password"/>
-firewall --disabled
-authconfig --enableshadow --enablemd5
-selinux --enforcing
-timezone --utc <xsl:value-of select="config/l10n-timezone"/>
-bootloader --location=mbr
-zerombr
-
-clearpart --all --drives=<xsl:call-template name="target-disk"/>
-
-
-<xsl:choose>
-  <xsl:when test="os/version &lt; 7">
-part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:when>
-  <xsl:otherwise>
-part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:otherwise>
-</xsl:choose>
-part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-reboot
-
-%packages
-<xsl:choose>
-  <xsl:when test="os/version &lt; 7">
- at base
-  </xsl:when>
-  <xsl:otherwise>
- at standard
-  </xsl:otherwise>
-</xsl:choose>
- at core
-
-%end
-	</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://redhat.com/scripts/rhel/desktop'>
     <profile>desktop</profile>
     <expected-filename>rhel.ks</expected-filename>
@@ -259,5 +153,4 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
       </xsl:stylesheet>
     </template>
   </install-script>
-
 </libosinfo>
diff --git a/data/install-scripts/rhel/rhel-jeos.xml.in b/data/install-scripts/rhel/rhel-jeos.xml.in
new file mode 100644
index 0000000..874a7d7
--- /dev/null
+++ b/data/install-scripts/rhel/rhel-jeos.xml.in
@@ -0,0 +1,105 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://redhat.com/scripts/rhel/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>rhel.ks</expected-filename>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="script-disk" policy="required"/>
+    </config>
+    <injection-method>cdrom</injection-method>
+    <injection-method>disk</injection-method>
+    <injection-method>floppy</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:when test="os/version &gt; 4">
+              <!-- virtio -->
+              <xsl:text>/dev/vda</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- IDE -->
+              <xsl:text>/dev/sda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="script-disk">
+          <xsl:variable name="script-disk">
+            <xsl:value-of select="config/script-disk"/>
+          </xsl:variable>
+          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
+        </xsl:template>
+
+        <xsl:template match="/command-line">
+            <xsl:text>ks=hd:</xsl:text>
+            <xsl:call-template name="script-disk"/>
+            <xsl:text>:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+        </xsl:template>
+
+        <xsl:template match="/install-script-config">
+# Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
+install
+cdrom
+text
+<!-- FIXME: RHEL requires keyboard layout to be a console layout so to do this right, we'll need
+            mapping from language to console layout. -->
+keyboard us
+lang <xsl:value-of select="config/l10n-language"/>
+skipx
+network --bootproto dhcp
+rootpw <xsl:value-of select="config/admin-password"/>
+firewall --disabled
+authconfig --enableshadow --enablemd5
+selinux --enforcing
+timezone --utc <xsl:value-of select="config/l10n-timezone"/>
+bootloader --location=mbr
+zerombr
+
+clearpart --all --drives=<xsl:call-template name="target-disk"/>
+
+
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7">
+part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
+  </xsl:when>
+  <xsl:otherwise>
+part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
+  </xsl:otherwise>
+</xsl:choose>
+part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
+volgroup VolGroup00 --pesize=32768 pv.2
+logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
+logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+reboot
+
+%packages
+<xsl:choose>
+  <xsl:when test="os/version &lt; 7">
+ at base
+  </xsl:when>
+  <xsl:otherwise>
+ at standard
+  </xsl:otherwise>
+</xsl:choose>
+ at core
+
+%end
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:53 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:53 +0100
Subject: [Libosinfo] [PATCH 35/39] data: split ubuntu into one file per
	install script
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-36-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                                   | 1 +
 data/install-scripts/Makefile.am                               | 3 +--
 data/install-scripts/ubuntu/Makefile.am                        | 1 +
 data/install-scripts/{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in} | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 data/install-scripts/ubuntu/Makefile.am
 rename data/install-scripts/{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in} (99%)

diff --git a/configure.ac b/configure.ac
index ebf0fd0..2f588ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,7 @@ AC_CONFIG_FILES([
 	data/install-scripts/debian/Makefile
 	data/install-scripts/fedora/Makefile
 	data/install-scripts/rhel/Makefile
+	data/install-scripts/ubuntu/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 1800762..8b18cd8 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -3,11 +3,10 @@ SUBDIRS = \
 	debian \
 	fedora \
 	rhel \
+	ubuntu \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/install-scripts/
-database_DATA =     \
-  ubuntu.xml        \
   windows-sif.xml   \
   windows-cmd.xml   \
   windows-reg.xml   \
diff --git a/data/install-scripts/ubuntu/Makefile.am b/data/install-scripts/ubuntu/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/ubuntu/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu/ubuntu-jeos.xml.in
similarity index 99%
rename from data/install-scripts/ubuntu.xml
rename to data/install-scripts/ubuntu/ubuntu-jeos.xml.in
index 86987b8..3c4868d 100644
--- a/data/install-scripts/ubuntu.xml
+++ b/data/install-scripts/ubuntu/ubuntu-jeos.xml.in
@@ -1,5 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
   <install-script id='http://ubuntu.com/scripts/ubuntu/jeos'>
     <profile>jeos</profile>
     <expected-filename>preseed.cfg</expected-filename>
@@ -154,5 +153,4 @@ ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/&amp; [ "$promp
       </xsl:stylesheet>
     </template>
   </install-script>
-
 </libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:54 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:54 +0100
Subject: [Libosinfo] [PATCH 36/39] data: split windows-* into one file per
	install script
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-37-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/install-scripts/Makefile.am                   |  10 +-
 data/install-scripts/windows/Makefile.am           |   1 +
 .../windows-cmd-desktop.xml.in}                    |   1 -
 .../windows-reg-desktop.xml.in}                    |   1 -
 .../windows-sif-desktop.xml.in}                    |  73 -------
 .../windows/windows-sif-jeos.xml.in                |  71 +++++++
 .../windows-unattend-desktop.xml.in}               | 224 ---------------------
 .../windows/windows-unattend-jeos.xml.in           | 224 +++++++++++++++++++++
 9 files changed, 298 insertions(+), 308 deletions(-)
 create mode 100644 data/install-scripts/windows/Makefile.am
 rename data/install-scripts/{windows-cmd.xml => windows/windows-cmd-desktop.xml.in} (99%)
 rename data/install-scripts/{windows-reg.xml => windows/windows-reg-desktop.xml.in} (97%)
 rename data/install-scripts/{windows-sif.xml => windows/windows-sif-desktop.xml.in} (68%)
 create mode 100644 data/install-scripts/windows/windows-sif-jeos.xml.in
 rename data/install-scripts/{windows-unattend.xml => windows/windows-unattend-desktop.xml.in} (55%)
 create mode 100644 data/install-scripts/windows/windows-unattend-jeos.xml.in

diff --git a/configure.ac b/configure.ac
index 2f588ab..a26a5be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,7 @@ AC_CONFIG_FILES([
 	data/install-scripts/fedora/Makefile
 	data/install-scripts/rhel/Makefile
 	data/install-scripts/ubuntu/Makefile
+	data/install-scripts/windows/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 8b18cd8..0c995b2 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -4,13 +4,5 @@ SUBDIRS = \
 	fedora \
 	rhel \
 	ubuntu \
+	windows \
 	$(NULL)
-
-databasedir = $(pkgdatadir)/db/install-scripts/
-  windows-sif.xml   \
-  windows-cmd.xml   \
-  windows-reg.xml   \
-  windows-unattend.xml \
-  $(NULL)
-
-EXTRA_DIST = $(database_DATA)
diff --git a/data/install-scripts/windows/Makefile.am b/data/install-scripts/windows/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/windows/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows/windows-cmd-desktop.xml.in
similarity index 99%
rename from data/install-scripts/windows-cmd.xml
rename to data/install-scripts/windows/windows-cmd-desktop.xml.in
index 6059a98..475870e 100644
--- a/data/install-scripts/windows-cmd.xml
+++ b/data/install-scripts/windows/windows-cmd-desktop.xml.in
@@ -1,5 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://microsoft.com/windows/cmd/desktop'>
     <profile>desktop</profile>
     <path-format>dos</path-format>
diff --git a/data/install-scripts/windows-reg.xml b/data/install-scripts/windows/windows-reg-desktop.xml.in
similarity index 97%
rename from data/install-scripts/windows-reg.xml
rename to data/install-scripts/windows/windows-reg-desktop.xml.in
index c7bfa27..af5951e 100644
--- a/data/install-scripts/windows-reg.xml
+++ b/data/install-scripts/windows/windows-reg-desktop.xml.in
@@ -1,5 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://microsoft.com/windows/reg/desktop'>
     <profile>desktop</profile>
     <path-format>dos</path-format>
diff --git a/data/install-scripts/windows-sif.xml b/data/install-scripts/windows/windows-sif-desktop.xml.in
similarity index 68%
rename from data/install-scripts/windows-sif.xml
rename to data/install-scripts/windows/windows-sif-desktop.xml.in
index dc28533..9114c35 100644
--- a/data/install-scripts/windows-sif.xml
+++ b/data/install-scripts/windows/windows-sif-desktop.xml.in
@@ -1,76 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
-  <install-script id='http://microsoft.com/windows/sif/jeos'>
-    <profile>jeos</profile>
-    <path-format>dos</path-format>
-    <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format>
-    <expected-filename>winnt.sif</expected-filename>
-    <can-pre-install-drivers/>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="reg-product-key" policy="required"/>
-      <param name="user-realname" policy="required"/>
-      <param name="driver-signing" policy="optional"/>
-    </config>
-    <injection-method>floppy</injection-method>
-    <template>
-      <xsl:stylesheet
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        version="1.0">
-
-        <xsl:output method="text"/>
-
-	<xsl:template match="/install-script-config">
-;SetupMgrTag
-[Data]
-    AutoPartition=1
-    MsDosInitiated=No
-    UnattendedInstall=Yes
-
-[Unattended]
-    UnattendMode=FullUnattended
-    OemSkipEula=Yes
-    OemPreinstall=No
-    TargetPath=\WINDOWS
-<xsl:if test="config/driver-signing = 'false'">
-    DriverSigningPolicy=Ignore
-</xsl:if>
-    Repartition=Yes
-    WaitForReboot=No
-    UnattendSwitch=Yes
-
-[GuiUnattended]
-    AdminPassword=<xsl:value-of select="config/admin-password"/>
-    EncryptedAdminPassword=NO
-    OEMSkipRegional=1
-    TimeZone=35
-    OemSkipWelcome=1
-
-[UserData]
-    ProductKey=<xsl:value-of select="config/reg-product-key"/>
-    FullName="<xsl:value-of select="config/user-realname"/>"
-    ComputerName=
-
-[Display]
-    BitsPerPel=16
-    Xresolution=640
-    YResolution=480
-    Vrefresh=60
-
-[RegionalSettings]
-    LanguageGroup=1
-
-[Identification]
-    JoinWorkgroup=WORKGROUP
-
-[Networking]
-    InstallDefaultComponents=Yes
-	</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://microsoft.com/windows/sif/desktop'>
     <profile>desktop</profile>
     <path-format>dos</path-format>
@@ -216,5 +144,4 @@
       </xsl:stylesheet>
     </template>
   </install-script>
-
 </libosinfo>
diff --git a/data/install-scripts/windows/windows-sif-jeos.xml.in b/data/install-scripts/windows/windows-sif-jeos.xml.in
new file mode 100644
index 0000000..02faca6
--- /dev/null
+++ b/data/install-scripts/windows/windows-sif-jeos.xml.in
@@ -0,0 +1,71 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://microsoft.com/windows/sif/jeos'>
+    <profile>jeos</profile>
+    <path-format>dos</path-format>
+    <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format>
+    <expected-filename>winnt.sif</expected-filename>
+    <can-pre-install-drivers/>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="reg-product-key" policy="required"/>
+      <param name="user-realname" policy="required"/>
+      <param name="driver-signing" policy="optional"/>
+    </config>
+    <injection-method>floppy</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="text"/>
+
+	<xsl:template match="/install-script-config">
+;SetupMgrTag
+[Data]
+    AutoPartition=1
+    MsDosInitiated=No
+    UnattendedInstall=Yes
+
+[Unattended]
+    UnattendMode=FullUnattended
+    OemSkipEula=Yes
+    OemPreinstall=No
+    TargetPath=\WINDOWS
+<xsl:if test="config/driver-signing = 'false'">
+    DriverSigningPolicy=Ignore
+</xsl:if>
+    Repartition=Yes
+    WaitForReboot=No
+    UnattendSwitch=Yes
+
+[GuiUnattended]
+    AdminPassword=<xsl:value-of select="config/admin-password"/>
+    EncryptedAdminPassword=NO
+    OEMSkipRegional=1
+    TimeZone=35
+    OemSkipWelcome=1
+
+[UserData]
+    ProductKey=<xsl:value-of select="config/reg-product-key"/>
+    FullName="<xsl:value-of select="config/user-realname"/>"
+    ComputerName=
+
+[Display]
+    BitsPerPel=16
+    Xresolution=640
+    YResolution=480
+    Vrefresh=60
+
+[RegionalSettings]
+    LanguageGroup=1
+
+[Identification]
+    JoinWorkgroup=WORKGROUP
+
+[Networking]
+    InstallDefaultComponents=Yes
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
diff --git a/data/install-scripts/windows-unattend.xml b/data/install-scripts/windows/windows-unattend-desktop.xml.in
similarity index 55%
rename from data/install-scripts/windows-unattend.xml
rename to data/install-scripts/windows/windows-unattend-desktop.xml.in
index d514ee5..e31df1f 100644
--- a/data/install-scripts/windows-unattend.xml
+++ b/data/install-scripts/windows/windows-unattend-desktop.xml.in
@@ -1,228 +1,4 @@
 <libosinfo version="0.0.1">
-  <install-script id='http://microsoft.com/windows/unattend/jeos'>
-    <profile>jeos</profile>
-    <path-format>dos</path-format>
-    <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format>
-   <expected-filename>autounattend.xml</expected-filename>
-   <can-pre-install-drivers/>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="hardware-arch" policy="optional"/>
-      <param name="l10n-language" policy="optional" value-map="http://microsoft.com/win/8/l10n-language-reverse"/>
-      <param name="user-login" policy="optional"/>
-      <param name="user-password" policy="optional"/>
-      <param name="user-realname" policy="optional"/>
-      <param name="reg-product-key" policy="required"/>
-      <param name="target-disk" policy="optional"/>
-      <param name="pre-install-drivers-disk" policy="optional"/>
-      <param name="pre-install-drivers-location" policy="optional"/>
-    </config>
-    <injection-method>floppy</injection-method>
-    <template>
-      <xsl:stylesheet
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-        version="1.0">
-
-        <xsl:output method="xml" indent="yes"/>
-
-        <xsl:template name="target-disk">
-          <xsl:choose>
-            <xsl:when test="config/target-disk != ''">
-              <xsl:value-of select="config/target-disk"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>C</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-	<xsl:template name="arch">
-	  <xsl:choose>
-	    <xsl:when test="count(config/hardware-arch) &gt; 0">
-	      <xsl:value-of select="config/hardware-arch"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>x86</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-        <xsl:template name="pre-install-drivers-disk">
-          <xsl:choose>
-            <xsl:when test="config/pre-install-drivers-disk != ''">
-              <xsl:value-of select="config/pre-install-drivers-disk"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>A</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="pre-install-drivers-location">
-          <xsl:choose>
-            <xsl:when test="config/pre-install-drivers-location != ''">
-              <xsl:value-of select="config/pre-install-drivers-location"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>\</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="ui-language">
-          <xsl:choose>
-            <xsl:when test="config/l10n-language = 'EN-GB'">
-              <xsl:text>EN-US</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="config/l10n-language"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-	<xsl:template match="/install-script-config">
-	  <unattend xmlns="urn:schemas-microsoft-com:unattend">
-	    <settings pass="windowsPE">
-              <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                <xsl:attribute name="processorArchitecture">
-                  <xsl:call-template name="arch"/>
-                </xsl:attribute>
-                <DriverPaths>
-                  <PathAndCredentials wcm:keyValue="1" wcm:action="add">
-                    <Path><xsl:call-template name="pre-install-drivers-disk"/>:<xsl:call-template name="pre-install-drivers-location"/></Path>
-                  </PathAndCredentials>
-                </DriverPaths>
-              </component>
-	      <component name="Microsoft-Windows-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<xsl:attribute name="processorArchitecture">
-		  <xsl:call-template name="arch"/>
-		</xsl:attribute>
-		<DiskConfiguration>
-		  <WillShowUI>OnError</WillShowUI>
-		  <Disk>
-		    <CreatePartitions>
-		      <CreatePartition>
-			<Order>1</Order>
-			<Size>1</Size>
-			<Type>Primary</Type>
-		      </CreatePartition>
-		    </CreatePartitions>
-		    <DiskID>0</DiskID>
-		    <WillWipeDisk>true</WillWipeDisk>
-		    <ModifyPartitions>
-		      <ModifyPartition>
-			<Active>true</Active>
-			<Extend>true</Extend>
-			<Format>NTFS</Format>
-                        <Label><xsl:call-template name="target-disk"/> drive</Label>
-                        <Letter><xsl:call-template name="target-disk"/></Letter>
-			<Order>1</Order>
-			<PartitionID>1</PartitionID>
-		      </ModifyPartition>
-		    </ModifyPartitions>
-		  </Disk>
-		</DiskConfiguration>
-		<ImageInstall>
-		  <OSImage>
-		    <InstallTo>
-		      <DiskID>0</DiskID>
-		      <PartitionID>1</PartitionID>
-		    </InstallTo>
-		    <WillShowUI>OnError</WillShowUI>
-		  </OSImage>
-		</ImageInstall>
-		<UserData>
-		  <AcceptEula>true</AcceptEula>
-                    <ProductKey>
-                      <Key><xsl:value-of select="config/reg-product-key"/></Key>
-                    </ProductKey>
-		</UserData>
-	      </component>
-	      <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<xsl:attribute name="processorArchitecture">
-		  <xsl:call-template name="arch"/>
-		</xsl:attribute>
-		<SetupUILanguage>
-		  <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
-		</SetupUILanguage>
-		<SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
-		<UILanguage><xsl:call-template name="ui-language"/></UILanguage>
-		<UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
-	      </component>
-	    </settings>
-	    <settings pass="oobeSystem">
-	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<xsl:attribute name="processorArchitecture">
-		  <xsl:call-template name="arch"/>
-		</xsl:attribute>
-		<UserAccounts>
-		  <AdministratorPassword>
-		    <Value><xsl:value-of select="config/admin-password"/></Value>
-		    <PlainText>true</PlainText>
-		  </AdministratorPassword>
-
-		  <xsl:if test="count(config/user-login) &gt; 0">
-		    <LocalAccounts>
-		      <LocalAccount wcm:action="add">
-			<Password>
-			  <Value><xsl:value-of select="config/user-password"/></Value>
-			  <PlainText>false</PlainText>
-			</Password>
-			<Name><xsl:value-of select="config/user-login"/></Name>
-			<DisplayName><xsl:value-of select="config/user-realname"/></DisplayName>
-			<Group>users</Group>
-		      </LocalAccount>
-		    </LocalAccounts>
-		  </xsl:if>
-		</UserAccounts>
-		<xsl:if test="count(config/user-login) &gt; 0">
-		  <AutoLogon>
-		    <Password>
-		      <Value><xsl:value-of select="config/user-password"/></Value>
-		      <PlainText>true</PlainText>
-		    </Password>
-		    <Enabled>true</Enabled>
-		    <LogonCount>5</LogonCount>
-		    <Username><xsl:value-of select="config/user-login"/></Username>
-		  </AutoLogon>
-		</xsl:if>
-		<OOBE>
-		  <NetworkLocation>Work</NetworkLocation>
-		  <HideEULAPage>true</HideEULAPage>
-		  <ProtectYourPC>3</ProtectYourPC>
-		  <SkipMachineOOBE>true</SkipMachineOOBE>
-		  <SkipUserOOBE>true</SkipUserOOBE>
-		</OOBE>
-		<FirstLogonCommands>
-		  <SynchronousCommand wcm:action="add">
-		    <Order>1</Order>
-		    <Description>Turn Off Network Selection pop-up</Description>
-		    <CommandLine>cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"</CommandLine>
-		  </SynchronousCommand>
-		  <SynchronousCommand wcm:action="add">
-		    <Order>2</Order>
-		    <Description>Shutting down Windows</Description>
-		    <CommandLine>cmd /C shutdown /s /t 0</CommandLine>
-		  </SynchronousCommand>
-		</FirstLogonCommands>
-	      </component>
-	    </settings>
-	    <settings pass="specialize">
-	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<xsl:attribute name="processorArchitecture">
-		  <xsl:call-template name="arch"/>
-		</xsl:attribute>
-
-		<ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
-	      </component>
-	    </settings>
-	  </unattend>
-	</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://microsoft.com/windows/unattend/desktop'>
    <profile>desktop</profile>
    <path-format>dos</path-format>
diff --git a/data/install-scripts/windows/windows-unattend-jeos.xml.in b/data/install-scripts/windows/windows-unattend-jeos.xml.in
new file mode 100644
index 0000000..749f553
--- /dev/null
+++ b/data/install-scripts/windows/windows-unattend-jeos.xml.in
@@ -0,0 +1,224 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://microsoft.com/windows/unattend/jeos'>
+    <profile>jeos</profile>
+    <path-format>dos</path-format>
+    <product-key-format>$$$$$-$$$$$-$$$$$-$$$$$-$$$$$</product-key-format>
+   <expected-filename>autounattend.xml</expected-filename>
+   <can-pre-install-drivers/>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="hardware-arch" policy="optional"/>
+      <param name="l10n-language" policy="optional" value-map="http://microsoft.com/win/8/l10n-language-reverse"/>
+      <param name="user-login" policy="optional"/>
+      <param name="user-password" policy="optional"/>
+      <param name="user-realname" policy="optional"/>
+      <param name="reg-product-key" policy="required"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="pre-install-drivers-disk" policy="optional"/>
+      <param name="pre-install-drivers-location" policy="optional"/>
+    </config>
+    <injection-method>floppy</injection-method>
+    <template>
+      <xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        version="1.0">
+
+        <xsl:output method="xml" indent="yes"/>
+
+        <xsl:template name="target-disk">
+          <xsl:choose>
+            <xsl:when test="config/target-disk != ''">
+              <xsl:value-of select="config/target-disk"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>C</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+	<xsl:template name="arch">
+	  <xsl:choose>
+	    <xsl:when test="count(config/hardware-arch) &gt; 0">
+	      <xsl:value-of select="config/hardware-arch"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>x86</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+        <xsl:template name="pre-install-drivers-disk">
+          <xsl:choose>
+            <xsl:when test="config/pre-install-drivers-disk != ''">
+              <xsl:value-of select="config/pre-install-drivers-disk"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>A</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="pre-install-drivers-location">
+          <xsl:choose>
+            <xsl:when test="config/pre-install-drivers-location != ''">
+              <xsl:value-of select="config/pre-install-drivers-location"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:text>\</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="ui-language">
+          <xsl:choose>
+            <xsl:when test="config/l10n-language = 'EN-GB'">
+              <xsl:text>EN-US</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="config/l10n-language"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+	<xsl:template match="/install-script-config">
+	  <unattend xmlns="urn:schemas-microsoft-com:unattend">
+	    <settings pass="windowsPE">
+              <component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <xsl:attribute name="processorArchitecture">
+                  <xsl:call-template name="arch"/>
+                </xsl:attribute>
+                <DriverPaths>
+                  <PathAndCredentials wcm:keyValue="1" wcm:action="add">
+                    <Path><xsl:call-template name="pre-install-drivers-disk"/>:<xsl:call-template name="pre-install-drivers-location"/></Path>
+                  </PathAndCredentials>
+                </DriverPaths>
+              </component>
+	      <component name="Microsoft-Windows-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<xsl:attribute name="processorArchitecture">
+		  <xsl:call-template name="arch"/>
+		</xsl:attribute>
+		<DiskConfiguration>
+		  <WillShowUI>OnError</WillShowUI>
+		  <Disk>
+		    <CreatePartitions>
+		      <CreatePartition>
+			<Order>1</Order>
+			<Size>1</Size>
+			<Type>Primary</Type>
+		      </CreatePartition>
+		    </CreatePartitions>
+		    <DiskID>0</DiskID>
+		    <WillWipeDisk>true</WillWipeDisk>
+		    <ModifyPartitions>
+		      <ModifyPartition>
+			<Active>true</Active>
+			<Extend>true</Extend>
+			<Format>NTFS</Format>
+                        <Label><xsl:call-template name="target-disk"/> drive</Label>
+                        <Letter><xsl:call-template name="target-disk"/></Letter>
+			<Order>1</Order>
+			<PartitionID>1</PartitionID>
+		      </ModifyPartition>
+		    </ModifyPartitions>
+		  </Disk>
+		</DiskConfiguration>
+		<ImageInstall>
+		  <OSImage>
+		    <InstallTo>
+		      <DiskID>0</DiskID>
+		      <PartitionID>1</PartitionID>
+		    </InstallTo>
+		    <WillShowUI>OnError</WillShowUI>
+		  </OSImage>
+		</ImageInstall>
+		<UserData>
+		  <AcceptEula>true</AcceptEula>
+                    <ProductKey>
+                      <Key><xsl:value-of select="config/reg-product-key"/></Key>
+                    </ProductKey>
+		</UserData>
+	      </component>
+	      <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<xsl:attribute name="processorArchitecture">
+		  <xsl:call-template name="arch"/>
+		</xsl:attribute>
+		<SetupUILanguage>
+		  <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+		</SetupUILanguage>
+		<SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
+		<UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+		<UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
+	      </component>
+	    </settings>
+	    <settings pass="oobeSystem">
+	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<xsl:attribute name="processorArchitecture">
+		  <xsl:call-template name="arch"/>
+		</xsl:attribute>
+		<UserAccounts>
+		  <AdministratorPassword>
+		    <Value><xsl:value-of select="config/admin-password"/></Value>
+		    <PlainText>true</PlainText>
+		  </AdministratorPassword>
+
+		  <xsl:if test="count(config/user-login) &gt; 0">
+		    <LocalAccounts>
+		      <LocalAccount wcm:action="add">
+			<Password>
+			  <Value><xsl:value-of select="config/user-password"/></Value>
+			  <PlainText>false</PlainText>
+			</Password>
+			<Name><xsl:value-of select="config/user-login"/></Name>
+			<DisplayName><xsl:value-of select="config/user-realname"/></DisplayName>
+			<Group>users</Group>
+		      </LocalAccount>
+		    </LocalAccounts>
+		  </xsl:if>
+		</UserAccounts>
+		<xsl:if test="count(config/user-login) &gt; 0">
+		  <AutoLogon>
+		    <Password>
+		      <Value><xsl:value-of select="config/user-password"/></Value>
+		      <PlainText>true</PlainText>
+		    </Password>
+		    <Enabled>true</Enabled>
+		    <LogonCount>5</LogonCount>
+		    <Username><xsl:value-of select="config/user-login"/></Username>
+		  </AutoLogon>
+		</xsl:if>
+		<OOBE>
+		  <NetworkLocation>Work</NetworkLocation>
+		  <HideEULAPage>true</HideEULAPage>
+		  <ProtectYourPC>3</ProtectYourPC>
+		  <SkipMachineOOBE>true</SkipMachineOOBE>
+		  <SkipUserOOBE>true</SkipUserOOBE>
+		</OOBE>
+		<FirstLogonCommands>
+		  <SynchronousCommand wcm:action="add">
+		    <Order>1</Order>
+		    <Description>Turn Off Network Selection pop-up</Description>
+		    <CommandLine>cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"</CommandLine>
+		  </SynchronousCommand>
+		  <SynchronousCommand wcm:action="add">
+		    <Order>2</Order>
+		    <Description>Shutting down Windows</Description>
+		    <CommandLine>cmd /C shutdown /s /t 0</CommandLine>
+		  </SynchronousCommand>
+		</FirstLogonCommands>
+	      </component>
+	    </settings>
+	    <settings pass="specialize">
+	      <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		<xsl:attribute name="processorArchitecture">
+		  <xsl:call-template name="arch"/>
+		</xsl:attribute>
+
+		<ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
+	      </component>
+	    </settings>
+	  </unattend>
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:55 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:55 +0100
Subject: [Libosinfo] [PATCH 37/39] data: split devices into one file per
	device
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-38-git-send-email-berrange@redhat.com>

---
 configure.ac                                       |  4 +
 data/devices/Makefile.am                           | 18 ++---
 data/devices/isa/Makefile.am                       |  1 +
 data/devices/isa/isa-ib700.xml.in                  |  8 ++
 data/devices/pci/Makefile.am                       |  1 +
 data/devices/pci/pci-1000-0012.xml.in              |  6 ++
 data/devices/pci/pci-1013-00b8.xml.in              |  6 ++
 data/devices/pci/pci-1022-2000.xml.in              |  6 ++
 data/devices/pci/pci-10ec-8029.xml.in              |  6 ++
 data/devices/pci/pci-10ec-8139.xml.in              |  6 ++
 data/devices/pci/pci-1234-1111.xml.in              | 11 +++
 data/devices/pci/pci-1274-5000.xml.in              |  6 ++
 data/devices/pci/pci-15ad-0710.xml.in              |  6 ++
 data/devices/pci/pci-1af4-1000.xml.in              |  6 ++
 data/devices/pci/pci-1af4-1001.xml.in              |  6 ++
 data/devices/pci/pci-1af4-1002.xml.in              |  6 ++
 data/devices/pci/pci-1af4-1003.xml.in              |  6 ++
 data/devices/pci/pci-1af4-1009.xml.in              |  6 ++
 data/devices/pci/pci-1b36-0100.xml.in              |  6 ++
 data/devices/pci/pci-8086-100e.xml.in              |  6 ++
 data/devices/pci/pci-8086-2415.xml.in              |  6 ++
 data/devices/pci/pci-8086-25ab.xml.in              |  6 ++
 data/devices/pci/pci-8086-2668.xml.in              |  6 ++
 data/devices/qemu-pci.xml.in                       | 93 ----------------------
 data/devices/qemu-ps2.xml.in                       | 20 -----
 data/devices/usb/Makefile.am                       |  1 +
 .../{qemu-usb.xml.in => usb/usb-80ee-0021.xml.in}  |  1 -
 data/devices/virtio-pci.xml.in                     | 29 -------
 data/devices/xen.xml.in                            | 28 -------
 data/devices/xen/Makefile.am                       |  1 +
 data/devices/xen/xen-block.xml.in                  |  7 ++
 data/devices/xen/xen-console.xml.in                |  7 ++
 data/devices/xen/xen-framebuffer.xml.in            |  7 ++
 data/devices/xen/xen-net.xml.in                    |  7 ++
 po/POTFILES.in                                     |  5 +-
 35 files changed, 163 insertions(+), 188 deletions(-)
 create mode 100644 data/devices/isa/Makefile.am
 create mode 100644 data/devices/isa/isa-ib700.xml.in
 create mode 100644 data/devices/pci/Makefile.am
 create mode 100644 data/devices/pci/pci-1000-0012.xml.in
 create mode 100644 data/devices/pci/pci-1013-00b8.xml.in
 create mode 100644 data/devices/pci/pci-1022-2000.xml.in
 create mode 100644 data/devices/pci/pci-10ec-8029.xml.in
 create mode 100644 data/devices/pci/pci-10ec-8139.xml.in
 create mode 100644 data/devices/pci/pci-1234-1111.xml.in
 create mode 100644 data/devices/pci/pci-1274-5000.xml.in
 create mode 100644 data/devices/pci/pci-15ad-0710.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1000.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1001.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1002.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1003.xml.in
 create mode 100644 data/devices/pci/pci-1af4-1009.xml.in
 create mode 100644 data/devices/pci/pci-1b36-0100.xml.in
 create mode 100644 data/devices/pci/pci-8086-100e.xml.in
 create mode 100644 data/devices/pci/pci-8086-2415.xml.in
 create mode 100644 data/devices/pci/pci-8086-25ab.xml.in
 create mode 100644 data/devices/pci/pci-8086-2668.xml.in
 delete mode 100644 data/devices/qemu-pci.xml.in
 delete mode 100644 data/devices/qemu-ps2.xml.in
 create mode 100644 data/devices/usb/Makefile.am
 rename data/devices/{qemu-usb.xml.in => usb/usb-80ee-0021.xml.in} (77%)
 delete mode 100644 data/devices/virtio-pci.xml.in
 delete mode 100644 data/devices/xen.xml.in
 create mode 100644 data/devices/xen/Makefile.am
 create mode 100644 data/devices/xen/xen-block.xml.in
 create mode 100644 data/devices/xen/xen-console.xml.in
 create mode 100644 data/devices/xen/xen-framebuffer.xml.in
 create mode 100644 data/devices/xen/xen-net.xml.in

diff --git a/configure.ac b/configure.ac
index a26a5be..4cd30cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,10 @@ AC_CONFIG_FILES([
 	data/datamaps/windows/Makefile
 	data/datamaps/x11/Makefile
 	data/devices/Makefile
+	data/devices/isa/Makefile
+	data/devices/pci/Makefile
+	data/devices/usb/Makefile
+	data/devices/xen/Makefile
 	data/platforms/Makefile
 	data/platforms/qemu/Makefile
 	data/platforms/qemu-kvm/Makefile
diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am
index 35aa20c..588ade6 100644
--- a/data/devices/Makefile.am
+++ b/data/devices/Makefile.am
@@ -1,15 +1,7 @@
 
-databasedir = $(pkgdatadir)/db/devices/
-database_in_files =	\
-	xen.xml.in	\
-	qemu-pci.xml.in	\
-	qemu-usb.xml.in	\
-	qemu-ps2.xml.in	\
-	virtio-pci.xml.in
+SUBDIRS = \
+	isa \
+	pci \
+	usb \
+	xen \
 	$(NULL)
-
-database_DATA = $(database_in_files:.xml.in=.xml)
-
- at INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/devices/isa/Makefile.am b/data/devices/isa/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/isa/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/isa/isa-ib700.xml.in b/data/devices/isa/isa-ib700.xml.in
new file mode 100644
index 0000000..58729bf
--- /dev/null
+++ b/data/devices/isa/isa-ib700.xml.in
@@ -0,0 +1,8 @@
+<libosinfo version="0.0.1">
+  <device id="http://ibasetechnologies.net/ib700">
+    <name>ib700</name>
+    <bus-type>isa</bus-type>
+    <class>watchdog</class>
+    <product>iBASE 700</product>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/Makefile.am b/data/devices/pci/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/pci/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/pci/pci-1000-0012.xml.in b/data/devices/pci/pci-1000-0012.xml.in
new file mode 100644
index 0000000..2e2d45f
--- /dev/null
+++ b/data/devices/pci/pci-1000-0012.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012">
+    <name>lsi</name>
+    <class>block</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1013-00b8.xml.in b/data/devices/pci/pci-1013-00b8.xml.in
new file mode 100644
index 0000000..8720dbc
--- /dev/null
+++ b/data/devices/pci/pci-1013-00b8.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8">
+    <name>cirrus</name>
+    <class>video</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1022-2000.xml.in b/data/devices/pci/pci-1022-2000.xml.in
new file mode 100644
index 0000000..6210dc8
--- /dev/null
+++ b/data/devices/pci/pci-1022-2000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000">
+    <name>pcnet</name>
+    <class>net</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-10ec-8029.xml.in b/data/devices/pci/pci-10ec-8029.xml.in
new file mode 100644
index 0000000..9ede95b
--- /dev/null
+++ b/data/devices/pci/pci-10ec-8029.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029">
+    <name>ne2k_pci</name>
+    <class>net</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-10ec-8139.xml.in b/data/devices/pci/pci-10ec-8139.xml.in
new file mode 100644
index 0000000..806fac5
--- /dev/null
+++ b/data/devices/pci/pci-10ec-8139.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139">
+    <name>rtl8139</name>
+    <class>net</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1234-1111.xml.in b/data/devices/pci/pci-1234-1111.xml.in
new file mode 100644
index 0000000..905752f
--- /dev/null
+++ b/data/devices/pci/pci-1234-1111.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111">
+    <name>vga</name>
+    <bus-type>pci</bus-type>
+    <class>video</class>
+    <_vendor>QEMU</_vendor>
+    <vendor-id>1234</vendor-id>
+    <product>VGA</product>
+    <product-id>1111</product-id>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1274-5000.xml.in b/data/devices/pci/pci-1274-5000.xml.in
new file mode 100644
index 0000000..f65ede6
--- /dev/null
+++ b/data/devices/pci/pci-1274-5000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000">
+    <name>es1370</name>
+    <class>audio</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-15ad-0710.xml.in b/data/devices/pci/pci-15ad-0710.xml.in
new file mode 100644
index 0000000..026d1e7
--- /dev/null
+++ b/data/devices/pci/pci-15ad-0710.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710">
+    <name>vmvga</name>
+    <class>video</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1af4-1000.xml.in b/data/devices/pci/pci-1af4-1000.xml.in
new file mode 100644
index 0000000..299b022
--- /dev/null
+++ b/data/devices/pci/pci-1af4-1000.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000">
+    <name>virtio-net</name>
+    <class>net</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1af4-1001.xml.in b/data/devices/pci/pci-1af4-1001.xml.in
new file mode 100644
index 0000000..46ea3e3
--- /dev/null
+++ b/data/devices/pci/pci-1af4-1001.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001">
+    <name>virtio-block</name>
+    <class>block</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1af4-1002.xml.in b/data/devices/pci/pci-1af4-1002.xml.in
new file mode 100644
index 0000000..6bee565
--- /dev/null
+++ b/data/devices/pci/pci-1af4-1002.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002">
+    <name>virtio-balloon</name>
+    <class>memory.balloon</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1af4-1003.xml.in b/data/devices/pci/pci-1af4-1003.xml.in
new file mode 100644
index 0000000..ff477ee
--- /dev/null
+++ b/data/devices/pci/pci-1af4-1003.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003">
+    <name>virtio-console</name>
+    <class>console</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1af4-1009.xml.in b/data/devices/pci/pci-1af4-1009.xml.in
new file mode 100644
index 0000000..9f444e2
--- /dev/null
+++ b/data/devices/pci/pci-1af4-1009.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009">
+    <name>virtio-9p</name>
+    <class>filesystem</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-1b36-0100.xml.in b/data/devices/pci/pci-1b36-0100.xml.in
new file mode 100644
index 0000000..e7f9a51
--- /dev/null
+++ b/data/devices/pci/pci-1b36-0100.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100">
+    <name>qxl</name>
+    <class>video</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-8086-100e.xml.in b/data/devices/pci/pci-8086-100e.xml.in
new file mode 100644
index 0000000..d7c8e70
--- /dev/null
+++ b/data/devices/pci/pci-8086-100e.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e">
+    <name>e1000</name>
+    <class>net</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-8086-2415.xml.in b/data/devices/pci/pci-8086-2415.xml.in
new file mode 100644
index 0000000..44a4eed
--- /dev/null
+++ b/data/devices/pci/pci-8086-2415.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415">
+    <name>ac97</name>
+    <class>audio</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-8086-25ab.xml.in b/data/devices/pci/pci-8086-25ab.xml.in
new file mode 100644
index 0000000..a0c362f
--- /dev/null
+++ b/data/devices/pci/pci-8086-25ab.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab">
+    <name>6300esb</name>
+    <class>watchdog</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/pci/pci-8086-2668.xml.in b/data/devices/pci/pci-8086-2668.xml.in
new file mode 100644
index 0000000..607fbe5
--- /dev/null
+++ b/data/devices/pci/pci-8086-2668.xml.in
@@ -0,0 +1,6 @@
+<libosinfo version="0.0.1">
+  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668">
+    <name>ich6</name>
+    <class>audio</class>
+  </device>
+</libosinfo>
diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in
deleted file mode 100644
index 480a784..0000000
--- a/data/devices/qemu-pci.xml.in
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- PCI devices from various QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
-  <!-- Block devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012">
-    <name>lsi</name>
-    <class>block</class>
-  </device>
-
-  <!-- Video devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111">
-    <name>vga</name>
-    <bus-type>pci</bus-type>
-    <class>video</class>
-    <_vendor>QEMU</_vendor>
-    <vendor-id>1234</vendor-id>
-    <product>VGA</product>
-    <product-id>1111</product-id>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8">
-    <name>cirrus</name>
-    <class>video</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710">
-    <name>vmvga</name>
-    <class>video</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100">
-    <name>qxl</name>
-    <class>video</class>
-  </device>
-
-
-  <!-- Network devices -->
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029">
-    <name>ne2k_pci</name>
-    <class>net</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000">
-    <name>pcnet</name>
-    <class>net</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139">
-    <name>rtl8139</name>
-    <class>net</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e">
-    <name>e1000</name>
-    <class>net</class>
-  </device>
-
-
-  <!-- Audio devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000">
-    <name>es1370</name>
-    <class>audio</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415">
-    <name>ac97</name>
-    <class>audio</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668">
-    <name>ich6</name>
-    <class>audio</class>
-  </device>
-
-
-  <!-- Watchdog devices -->
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab">
-    <name>6300esb</name>
-    <class>watchdog</class>
-  </device>
-
-  <device id="http://ibasetechnologies.net/ib700">
-    <name>ib700</name>
-    <bus-type>isa</bus-type>
-    <class>watchdog</class>
-    <product>iBASE 700</product>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/qemu-ps2.xml.in
deleted file mode 100644
index cef68e2..0000000
--- a/data/devices/qemu-ps2.xml.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- PS2 devices for QEMU/KVM(s) -->
-<libosinfo version="0.0.1">
-
-  <device id="http://ibm.com/ps2/keyboard">
-    <name>keyboard</name>
-    <bus-type>ps2</bus-type>
-    <class>input</class>
-    <_vendor>Qemu/KVM</_vendor>
-    <product>Keyboard</product>
-  </device>
-
-  <device id="http://ibm.com/ps2/mouse">
-    <name>mouse</name>
-    <bus-type>ps2</bus-type>
-    <class>input</class>
-    <_vendor>Qemu/KVM</_vendor>
-    <product>Mouse</product>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/usb/Makefile.am b/data/devices/usb/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/usb/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/qemu-usb.xml.in b/data/devices/usb/usb-80ee-0021.xml.in
similarity index 77%
rename from data/devices/qemu-usb.xml.in
rename to data/devices/usb/usb-80ee-0021.xml.in
index 9719661..0d2baa9 100644
--- a/data/devices/qemu-usb.xml.in
+++ b/data/devices/usb/usb-80ee-0021.xml.in
@@ -1,4 +1,3 @@
-<!-- USB devices from various QEMU/KVM(s) -->
 <libosinfo version="0.0.1">
 
   <device id="http://www.linux-usb.org/usb.ids/80ee/0021">
diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in
deleted file mode 100644
index ccc32da..0000000
--- a/data/devices/virtio-pci.xml.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- VirtIO PCI devices -->
-<libosinfo version="0.0.1">
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000">
-    <name>virtio-net</name>
-    <class>net</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001">
-    <name>virtio-block</name>
-    <class>block</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002">
-    <name>virtio-balloon</name>
-    <class>memory.balloon</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003">
-    <name>virtio-console</name>
-    <class>console</class>
-  </device>
-
-  <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009">
-    <name>virtio-9p</name>
-    <class>filesystem</class>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/xen.xml.in b/data/devices/xen.xml.in
deleted file mode 100644
index 8065fec..0000000
--- a/data/devices/xen.xml.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Xen 3.x / 4.x paravirt devices -->
-<libosinfo version="0.0.1">
-
-  <device id="http://xen.org/devices/block">
-    <class>block</class>
-    <bus-type>xen</bus-type>
-    <name>xen-block</name>
-  </device>
-
-  <device id="http://xen.org/devices/net">
-    <class>net</class>
-    <bus-type>xen</bus-type>
-    <name>xen-net</name>
-  </device>
-
-  <device id="http://xen.org/devices/console">
-    <class>console</class>
-    <bus-type>xen</bus-type>
-    <name>xen-console</name>
-  </device>
-
-  <device id="http://xen.org/devices/framebuffer">
-    <class>video</class>
-    <bus-type>xen</bus-type>
-    <name>xen-pvfb</name>
-  </device>
-
-</libosinfo>
diff --git a/data/devices/xen/Makefile.am b/data/devices/xen/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/devices/xen/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/devices/xen/xen-block.xml.in b/data/devices/xen/xen-block.xml.in
new file mode 100644
index 0000000..277446b
--- /dev/null
+++ b/data/devices/xen/xen-block.xml.in
@@ -0,0 +1,7 @@
+<libosinfo version="0.0.1">
+  <device id="http://xen.org/devices/block">
+    <class>block</class>
+    <bus-type>xen</bus-type>
+    <name>xen-block</name>
+  </device>
+</libosinfo>
diff --git a/data/devices/xen/xen-console.xml.in b/data/devices/xen/xen-console.xml.in
new file mode 100644
index 0000000..a9e51be
--- /dev/null
+++ b/data/devices/xen/xen-console.xml.in
@@ -0,0 +1,7 @@
+<libosinfo version="0.0.1">
+  <device id="http://xen.org/devices/console">
+    <class>console</class>
+    <bus-type>xen</bus-type>
+    <name>xen-console</name>
+  </device>
+</libosinfo>
diff --git a/data/devices/xen/xen-framebuffer.xml.in b/data/devices/xen/xen-framebuffer.xml.in
new file mode 100644
index 0000000..9d44c2a
--- /dev/null
+++ b/data/devices/xen/xen-framebuffer.xml.in
@@ -0,0 +1,7 @@
+<libosinfo version="0.0.1">
+  <device id="http://xen.org/devices/framebuffer">
+    <class>video</class>
+    <bus-type>xen</bus-type>
+    <name>xen-pvfb</name>
+  </device>
+</libosinfo>
diff --git a/data/devices/xen/xen-net.xml.in b/data/devices/xen/xen-net.xml.in
new file mode 100644
index 0000000..fa0ccfb
--- /dev/null
+++ b/data/devices/xen/xen-net.xml.in
@@ -0,0 +1,7 @@
+<libosinfo version="0.0.1">
+  <device id="http://xen.org/devices/net">
+    <class>net</class>
+    <bus-type>xen</bus-type>
+    <name>xen-net</name>
+  </device>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ab9d863..4583ba3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -328,10 +328,7 @@ data/oses/windows/winnt3.5.xml.in
 data/oses/windows/winnt4.0.xml.in
 data/oses/windows/winvista.xml.in
 data/oses/windows/winxp.xml.in
-data/devices/qemu-ps2.xml.in
-data/devices/qemu-pci.xml.in
-data/devices/virtio-pci.xml.in
-data/devices/qemu-usb.xml.in
+data/devices/pci/pci-1234-1111.xml.in
 data/platforms/qemu/qemu-1.0.1.xml.in
 data/platforms/qemu/qemu-1.0.xml.in
 data/platforms/qemu/qemu-1.1.1-1.xml.in
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:56 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:56 +0100
Subject: [Libosinfo] [PATCH 38/39] Update ignore files for new database
	layout
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-39-git-send-email-berrange@redhat.com>

---
 .gitignore | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 252b7ed..b663072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,17 +69,8 @@ test/*.trs
 build/
 gtk-doc.make
 data/95-osinfo.rules
-data/devices/qemu-pci.xml
-data/devices/qemu-ps2.xml
-data/devices/qemu-usb.xml
-data/devices/virtio-pci.xml
-data/devices/xen.xml
-data/hypervisors/kvm.xml
-data/hypervisors/qemu.xml
-data/hypervisors/rhel-xen.xml
-data/hypervisors/xen.xml
+data/*/*/*.xml
 data/pci.ids
-data/oses/*.xml
 data/usb.ids
 tools/osinfo-detect
 tools/osinfo-detect.1
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:57 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:57 +0100
Subject: [Libosinfo] [PATCH 39/39] tests: switch to use XML from builddir
	only
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-40-git-send-email-berrange@redhat.com>

---
 test/test-isodetect.c  | 6 +-----
 test/test-xml-validate | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index e223d1a..c378246 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -319,12 +319,8 @@ static void test_one(const gchar *vendor)
     fail_unless(OSINFO_IS_LOADER(loader), "Loader is not a LOADER");
     fail_unless(OSINFO_IS_DB(db), "Db is not a DB");
 
-    osinfo_loader_process_path(loader, SRCDIR "/data", &error);
+    osinfo_loader_process_path(loader, BUILDDIR "/data", &error);
     fail_unless(error == NULL, error ? error->message : "none");
-    if (!g_str_equal(SRCDIR, BUILDDIR)) {
-        osinfo_loader_process_path(loader, BUILDDIR "/data", &error);
-        fail_unless(error == NULL, error ? error->message : "none");
-    }
 
     isos = load_isos(vendor, &error);
 
diff --git a/test/test-xml-validate b/test/test-xml-validate
index e3cb1a0..4b646bc 100755
--- a/test/test-xml-validate
+++ b/test/test-xml-validate
@@ -11,7 +11,7 @@ n=0
 f=0
 for dir in $DIRS
 do
-  XML=`find $abs_srcdir/../data/$dir -name '*.xml'` || exit 1
+  XML=`find $abs_builddir/../data/$dir -name '*.xml'` || exit 1
 
   for xml in `echo "$XML" | sort`
   do
-- 
2.4.3



From berrange at redhat.com  Mon Sep 28 15:51:27 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Mon, 28 Sep 2015 16:51:27 +0100
Subject: [Libosinfo] [PATCH 09/39] data: split fedora into one file per OS
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <1443455517-17894-10-git-send-email-berrange@redhat.com>

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                           |    1 +
 data/oses/Makefile.am                  |    2 +-
 data/oses/fedora.xml.in                | 4320 --------------------------------
 data/oses/fedora/Makefile.am           |    1 +
 data/oses/fedora/fedora-unknown.xml.in |   55 +
 data/oses/fedora/fedora1.xml.in        |   91 +
 data/oses/fedora/fedora10.xml.in       |  353 +++
 data/oses/fedora/fedora11.xml.in       |  353 +++
 data/oses/fedora/fedora12.xml.in       |  313 +++
 data/oses/fedora/fedora13.xml.in       |  229 ++
 data/oses/fedora/fedora14.xml.in       |  243 ++
 data/oses/fedora/fedora15.xml.in       |  120 +
 data/oses/fedora/fedora16.xml.in       |  120 +
 data/oses/fedora/fedora17.xml.in       |  118 +
 data/oses/fedora/fedora18.xml.in       |  118 +
 data/oses/fedora/fedora19.xml.in       |  151 ++
 data/oses/fedora/fedora2.xml.in        |  139 +
 data/oses/fedora/fedora20.xml.in       |  141 ++
 data/oses/fedora/fedora21.xml.in       |  193 ++
 data/oses/fedora/fedora22.xml.in       |  167 ++
 data/oses/fedora/fedora3.xml.in        |  139 +
 data/oses/fedora/fedora4.xml.in        |  213 ++
 data/oses/fedora/fedora5.xml.in        |  223 ++
 data/oses/fedora/fedora6.xml.in        |  243 ++
 data/oses/fedora/fedora7.xml.in        |  116 +
 data/oses/fedora/fedora8.xml.in        |  128 +
 data/oses/fedora/fedora9.xml.in        |  367 +++
 po/POTFILES.in                         |   24 +-
 28 files changed, 4359 insertions(+), 4322 deletions(-)
 delete mode 100644 data/oses/fedora.xml.in
 create mode 100644 data/oses/fedora/Makefile.am
 create mode 100644 data/oses/fedora/fedora-unknown.xml.in
 create mode 100644 data/oses/fedora/fedora1.xml.in
 create mode 100644 data/oses/fedora/fedora10.xml.in
 create mode 100644 data/oses/fedora/fedora11.xml.in
 create mode 100644 data/oses/fedora/fedora12.xml.in
 create mode 100644 data/oses/fedora/fedora13.xml.in
 create mode 100644 data/oses/fedora/fedora14.xml.in
 create mode 100644 data/oses/fedora/fedora15.xml.in
 create mode 100644 data/oses/fedora/fedora16.xml.in
 create mode 100644 data/oses/fedora/fedora17.xml.in
 create mode 100644 data/oses/fedora/fedora18.xml.in
 create mode 100644 data/oses/fedora/fedora19.xml.in
 create mode 100644 data/oses/fedora/fedora2.xml.in
 create mode 100644 data/oses/fedora/fedora20.xml.in
 create mode 100644 data/oses/fedora/fedora21.xml.in
 create mode 100644 data/oses/fedora/fedora22.xml.in
 create mode 100644 data/oses/fedora/fedora3.xml.in
 create mode 100644 data/oses/fedora/fedora4.xml.in
 create mode 100644 data/oses/fedora/fedora5.xml.in
 create mode 100644 data/oses/fedora/fedora6.xml.in
 create mode 100644 data/oses/fedora/fedora7.xml.in
 create mode 100644 data/oses/fedora/fedora8.xml.in
 create mode 100644 data/oses/fedora/fedora9.xml.in

diff --git a/configure.ac b/configure.ac
index 97d7a7b..2db3ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ AC_CONFIG_FILES([
 	data/oses/altlinux/Makefile
 	data/oses/centos/Makefile
 	data/oses/debian/Makefile
+	data/oses/fedora/Makefile
 	data/oses/msdos/Makefile
 	data/schemas/Makefile
 	tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 325b5aa..7a1e7c2 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS = \
 	altlinux \
 	centos \
 	debian \
+	fedora \
 	msdos \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	fedora.xml.in   \
 	freebsd.xml.in  \
 	gnome.xml.in	\
 	mageia.xml.in \
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
deleted file mode 100644
index cddb969..0000000
--- a/data/oses/fedora.xml.in
+++ /dev/null
@@ -1,4320 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://fedoraproject.org/fedora/1">
-    <short-id>fedora1</short-id>
-    <_name>Fedora Core 1</_name>
-    <version>1</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Yarrow</codename>
-    <upgrades id="http://redhat.com/rhl/9"/>
-    <derives-from id="http://redhat.com/rhl/9"/>
-
-    <release-date>2003-11-05</release-date>
-    <eol-date>2004-09-20</eol-date>
-
-    <!-- XXX upgrades/derives RHL -->
-
-    <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 -->
-    </devices>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>660340736</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC/1 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>667516928</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC/1 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>645464064</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <iso>
-        <application-id>FC/1 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3963158528</volume-size>
-      </iso>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/iso/yarrow-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/1 x86_64</application-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/2">
-    <short-id>fedora2</short-id>
-    <_name>Fedora Core 2</_name>
-    <version>2</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Tettnang</codename>
-    <upgrades id="http://fedoraproject.org/fedora/1"/>
-    <derives-from id="http://fedoraproject.org/fedora/1"/>
-
-    <release-date>2004-05-18</release-date>
-    <eol-date>2005-04-11</eol-date>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>667529216</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC/2 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>665802752</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC/2 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>669016064</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc4.iso</url>
-      <iso>
-        <application-id>FC/2 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>203737088</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-DVD.iso</url>
-      <iso>
-        <application-id>FC/2 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4370640896</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668203008</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc2.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>666394624</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc3.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>656420864</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc4.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>240547840</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-DVD.iso</url>
-      <iso>
-        <application-id>FC/2 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4273096704</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/3">
-    <short-id>fedora3</short-id>
-    <_name>Fedora Core 3</_name>
-    <version>3</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Heidelberg</codename>
-    <upgrades id="http://fedoraproject.org/fedora/2"/>
-    <derives-from id="http://fedoraproject.org/fedora/2"/>
-
-    <release-date>2004-11-08</release-date>
-    <eol-date>2006-01-16</eol-date>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>646987776</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC/3 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668520448</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC/3 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>667498496</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc4.iso</url>
-      <iso>
-        <application-id>FC/3 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>404764672</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-DVD.iso</url>
-      <iso>
-        <application-id>FC/3 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2466410496</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668137472</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc2.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>669126656</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc3.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668422144</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc4.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>634851328</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-DVD.iso</url>
-      <iso>
-        <application-id>FC/3 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2639267840</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/4">
-    <short-id>fedora4</short-id>
-    <_name>Fedora Core 4</_name>
-    <version>4</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Stentz</codename>
-    <upgrades id="http://fedoraproject.org/fedora/3"/>
-    <derives-from id="http://fedoraproject.org/fedora/3"/>
-
-    <release-date>2005-06-13</release-date>
-    <eol-date>2006-08-07</eol-date>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>665434112</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC/4 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668708864</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC/4 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668954624</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc4.iso</url>
-      <iso>
-        <application-id>FC/4 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>660512768</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-DVD.iso</url>
-      <iso>
-        <application-id>FC/4 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2750582784</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668174336</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc2.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>666898432</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc3.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>669458432</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc4.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>667107328</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc5.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>173809664</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-DVD.iso</url>
-      <iso>
-        <application-id>FC/4 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2932850688</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>661739520</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc2.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>642336768</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc3.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>614821888</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc4.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>662865920</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc5.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>462649344</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-DVD.iso</url>
-      <iso>
-        <application-id>FC/4 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>3090690048</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/5">
-    <short-id>fedora5</short-id>
-    <_name>Fedora Core 5</_name>
-    <version>5</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Bordeaux</codename>
-    <upgrades id="http://fedoraproject.org/fedora/4"/>
-    <derives-from id="http://fedoraproject.org/fedora/4"/>
-
-    <release-date>2006-03-20</release-date>
-    <eol-date>2007-07-02</eol-date>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>687235072</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>700618752</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721016832</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc4.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>720910336</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc5.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>387753984</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-DVD.iso</url>
-      <iso>
-        <application-id>FC/5 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3253669888</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668962816</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc2.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>718063616</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc3.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>718374912</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc4.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>717789184</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc5.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>613832704</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-DVD.iso</url>
-      <iso>
-        <application-id>FC/5 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3462629376</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>695058432</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc2.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719341568</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc3.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719454208</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc4.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>720560128</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc5.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>686794752</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-DVD.iso</url>
-      <iso>
-        <application-id>FC/5 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>3631042560</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/6">
-    <short-id>fedora6</short-id>
-    <_name>Fedora Core 6</_name>
-    <version>6</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Zod</codename>
-    <upgrades id="http://fedoraproject.org/fedora/5"/>
-    <derives-from id="http://fedoraproject.org/fedora/5"/>
-
-    <release-date>2006-10-24</release-date>
-    <eol-date>2007-12-07</eol-date>
-
-    <!-- Disk 1 -->
-    <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>
-        <system-id>LINUX</system-id>
-        <volume-size>708780032</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc2.iso</url>
-      <iso>
-        <application-id>FC-6 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>714240000</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc3.iso</url>
-      <iso>
-        <application-id>FC-6 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>711491584</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc4.iso</url>
-      <iso>
-        <application-id>FC-6 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>715229184</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc5.iso</url>
-      <iso>
-        <application-id>FC-6 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>677183488</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-DVD.iso</url>
-      <iso>
-        <application-id>FC/6 i386</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3525195776</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc1.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>704204800</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc2.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>709750784</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc3.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>706191360</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc4.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>707473408</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc5.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>715692032</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc6.iso</url>
-      <iso>
-        <application-id>FC-6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>546852864</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-DVD.iso</url>
-      <iso>
-        <application-id>FC/6 x86_64</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4088006656</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc1.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>730435584</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc2.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>713457664</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc3.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>708587520</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc4.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>704706560</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc5.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>714592256</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc6.iso</url>
-      <iso>
-        <application-id>FC-6 ppc</application-id>
-        <system-id>LINUX</system-id>
-        <volume-size>604110848</volume-size>
-      </iso>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-DVD.iso</url>
-      <iso>
-        <application-id>FC/6 ppc</application-id>
-        <system-id>PPC</system-id>
-        <volume-size>4285673472</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/os/</url>
-      <kernel>images/pxeboot/vmlinuz</kernel>
-      <initrd>images/pxeboot/initrd.img</initrd>
-      <boot-iso>images/boot.iso</boot-iso>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/7">
-    <short-id>fedora7</short-id>
-    <_name>Fedora 7</_name>
-    <version>7</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Moonshine</codename>
-    <upgrades id="http://fedoraproject.org/fedora/6"/>
-    <derives-from id="http://fedoraproject.org/fedora/6"/>
-
-    <release-date>2007-05-31</release-date>
-    <eol-date>2008-06-13</eol-date>
-
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2900602880</volume-size>
-      </iso>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/iso/F-7-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 7 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3447975936</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/ppc/iso/F-7-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 7 ppc</volume-id>
-        <system-id>PPC</system-id>
-        <volume-size>3620605952</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-Live-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-7-Live-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>733427712</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-KDE-Live-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-7-KDE-Live-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719859712</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-7-Live-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>817156096</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-KDE-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-7-KDE-Live-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>871643136</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>7</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>7</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/8">
-    <short-id>fedora8</short-id>
-    <_name>Fedora 8</_name>
-    <version>8</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Werewolf</codename>
-    <upgrades id="http://fedoraproject.org/fedora/7"/>
-    <derives-from id="http://fedoraproject.org/fedora/7"/>
-
-    <release-date>2007-11-08</release-date>
-    <eol-date>2009-01-07</eol-date>
-
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3424749568</volume-size>
-      </iso>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/iso/Fedora-8-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 8 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3876407296</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/ppc/iso/Fedora-8-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 8 ppc</volume-id>
-        <system-id>PPC</system-id>
-        <volume-size>4118646784</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-i686</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>731086848</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-KDE-i686.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-KDE-i686</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>732188672</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>803870720</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-KDE-x86_64.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-KDE-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>844269568</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="ppc" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/ppc/Fedora-8-Live-ppc.iso</url>
-      <iso>
-        <volume-id>Fedora-8-Live-ppc</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>732942336</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>8</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>8</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/9">
-    <short-id>fedora9</short-id>
-    <_name>Fedora 9</_name>
-    <version>9</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Sulphur</codename>
-    <upgrades id="http://fedoraproject.org/fedora/8"/>
-    <derives-from id="http://fedoraproject.org/fedora/8"/>
-
-    <release-date>2008-05-13</release-date>
-    <eol-date>2009-07-10</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
-      <!-- Apparently F9 has selinux errors when installing with virtio:
-           https://bugzilla.redhat.com/show_bug.cgi?id=470386
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-      -->
-    </devices>
-
-    <!-- DVD -->
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3580680192</volume-size>
-      </iso>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>638533632</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668082176</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>652095488</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668047360</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>664877056</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 9 i386 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>290463744</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4163696640</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>637575168</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>667353088</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668954624</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>668628992</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>663744512</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>660492288</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 7 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc7.iso</url>
-      <iso>
-        <volume-id>Fedora 9 x86_64 Disc 7</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>197728256</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc</volume-id>
-        <system-id>PPC</system-id>
-        <volume-size>4417064960</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 1</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>649594880</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 2</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>663785472</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 3</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>665425920</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 4</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>661508096</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 5</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>667478016</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 6</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>655919104</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 7 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc7.iso</url>
-      <iso>
-        <volume-id>Fedora 9 ppc Disc 7</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>319293440</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-i686</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724121600</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-KDE-i686</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724975616</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727169024</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-9-Live-KDE-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>729272320</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>9</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>9</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/10">
-    <short-id>fedora10</short-id>
-    <_name>Fedora 10</_name>
-    <version>10</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Cambridge</codename>
-    <upgrades id="http://fedoraproject.org/fedora/9"/>
-    <derives-from id="http://fedoraproject.org/fedora/9"/>
-
-    <release-date>2008-11-25</release-date>
-    <eol-date>2009-12-18</eol-date>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-
-    <!-- DVD -->
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3662573568</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>720508928</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>706545664</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>708554752</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724043776</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>720308224</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 10 i386 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>83990528</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4172283904</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721672192</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>723263488</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721778688</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721303552</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724482048</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 10 x86_64 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>560422912</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc DVD</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>4497768448</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 1</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>729636864</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 2</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>708579328</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 3</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>714471424</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 4</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>687958016</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 5</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>716013568</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 6</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>716664832</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 7 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc7.iso</url>
-      <iso>
-        <volume-id>Fedora 10 ppc Disc 7</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>94961664</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live.iso</url>
-      <iso>
-        <volume-id>F10-i686-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>714407936</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>F10-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>711905280</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>F10-x86_64-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>717281280</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>F10-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>717221888</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>10</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>10</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/11">
-    <short-id>fedora11</short-id>
-    <_name>Fedora 11</_name>
-    <version>11</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Leonidas</codename>
-    <upgrades id="http://fedoraproject.org/fedora/10"/>
-    <derives-from id="http://fedoraproject.org/fedora/10"/>
-
-    <release-date>2009-06-09</release-date>
-    <eol-date>2010-06-25</eol-date>
-
-    <devices>
-      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
-    </devices>
-
-    <!-- DVD -->
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3683829760</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727830528</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724916224</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721659904</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728756224</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>717754368</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 11 i386 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>64604160</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4268124160</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726374400</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>725426176</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727185408</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724492288</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724090880</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 11 x86_64 Disc 6</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>641380352</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc DVD</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>4606894080</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 1</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>725729280</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 2</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>719245312</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 3</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>726794240</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 4</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>722802688</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 5</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>708642816</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 6</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>719030272</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 7 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc7.iso</url>
-      <iso>
-        <volume-id>Fedora 11 ppc Disc 7</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>182509568</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-11-i686-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721569792</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-11-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719276032</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-11-x86_64-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724097024</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-11-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727095296</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>11</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>11</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/12">
-    <short-id>fedora12</short-id>
-    <_name>Fedora 12</_name>
-    <version>12</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Constantine</codename>
-    <upgrades id="http://fedoraproject.org/fedora/11"/>
-    <derives-from id="http://fedoraproject.org/fedora/11"/>
-
-    <release-date>2009-11-17</release-date>
-    <eol-date>2010-12-02</eol-date>
-
-    <!-- DVD -->
-    <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</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3204427776</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724697088</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728029184</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726962176</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>722438144</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 12 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>303261696</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3537600512</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727363584</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719775744</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726503424</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>727928832</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 12 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>636233728</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc DVD</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>3738935296</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 1</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>729341952</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 2</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>728432640</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 3</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>726351872</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 4</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>726714368</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 5</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>726775808</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 6 -->
-    <media arch="ppc">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc6.iso</url>
-      <iso>
-        <volume-id>Fedora 12 ppc Disc 6</volume-id>
-        <system-id>PPC|LINUX</system-id>
-        <volume-size>16394240</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-12-i686-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>685336576</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-12-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>713181184</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-12-x86_64-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>687138816</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-12-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>717940736</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>12</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>12</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/13">
-    <short-id>fedora13</short-id>
-    <_name>Fedora 13</_name>
-    <version>13</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Goddard</codename>
-    <upgrades id="http://fedoraproject.org/fedora/12"/>
-    <derives-from id="http://fedoraproject.org/fedora/12"/>
-
-    <release-date>2010-05-25</release-date>
-    <eol-date>2011-06-04</eol-date>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3277086720</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726675456</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724484096</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>722425856</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>718925824</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 13 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>386164736</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3630045184</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728256512</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728606720</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726992896</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>723963904</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 13 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>723660800</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-13-i686-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>707715072</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-13-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>731193344</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live.iso</url>
-      <iso>
-        <volume-id>Fedora-13-x86_64-Live</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>709580800</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-13-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>733466624</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>13</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>13</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/14">
-    <short-id>fedora14</short-id>
-    <_name>Fedora 14</_name>
-    <version>14</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Laughlin</codename>
-    <upgrades id="http://fedoraproject.org/fedora/13"/>
-    <derives-from id="http://fedoraproject.org/fedora/13"/>
-
-    <release-date>2010-11-02</release-date>
-    <eol-date>2011-12-08</eol-date>
-
-    <!-- DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3561752576</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>705503232</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728064000</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728426496</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728170496</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 14 i386 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>672913408</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- DVD -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3520802816</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 1 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc1.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 Disc 1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>726687744</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 2 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc2.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 Disc 2</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728717312</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 3 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc3.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 Disc 3</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>723972096</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 4 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc4.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 Disc 4</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>721358848</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Disk 5 -->
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc5.iso</url>
-      <iso>
-        <volume-id>Fedora 14 x86_64 Disc 5</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>621590528</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-14-i686-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>718903296</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-14-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>718798848</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-14-x86_64-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719706112</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-14-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>719327232</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>14</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>14</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>402653184</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>536870912</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/15">
-    <short-id>fedora15</short-id>
-    <_name>Fedora 15</_name>
-    <version>15</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Lovelock</codename>
-    <upgrades id="http://fedoraproject.org/fedora/14"/>
-    <derives-from id="http://fedoraproject.org/fedora/14"/>
-
-    <release-date>2011-05-24</release-date>
-
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 15 i386 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3650455552</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/x86_64/iso/Fedora-15-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 15 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3596310528</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-15-i686-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>592189440</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-15-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>725118976</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-15-x86_64-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>593618944</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-15-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>725055488</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>15</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>15</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>671088640</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/16">
-    <short-id>fedora16</short-id>
-    <_name>Fedora 16</_name>
-    <version>16</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Verne</codename>
-    <upgrades id="http://fedoraproject.org/fedora/15"/>
-    <derives-from id="http://fedoraproject.org/fedora/15"/>
-
-    <release-date>2011-11-08</release-date>
-
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 16 i386 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3806375936</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/iso/Fedora-16-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 16 x86_64 DVD</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3756955648</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-16-i686-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>633985024</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-16-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>730486784</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-16-x86_64-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>633040896</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-16-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728915968</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>16</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>16</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/17">
-    <short-id>fedora17</short-id>
-    <_name>Fedora 17</_name>
-    <version>17</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Beefy Miracle</codename>
-    <upgrades id="http://fedoraproject.org/fedora/16"/>
-    <derives-from id="http://fedoraproject.org/fedora/16"/>
-
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/i386/iso/Fedora-17-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 17 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3911847936</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/iso/Fedora-17-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 17 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>3834099712</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-17-i686-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>677355520</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-17-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>728510464</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-17-x86_64-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>676110336</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-17-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724793344</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>17</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>17</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/18">
-    <short-id>fedora18</short-id>
-    <_name>Fedora 18</_name>
-    <version>18</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>The Spherical Cow</codename>
-    <upgrades id="http://fedoraproject.org/fedora/17"/>
-    <derives-from id="http://fedoraproject.org/fedora/17"/>
-
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 18 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4687384576</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 18 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4573151232</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-18-i686-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>931713024</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-18-i686-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>843427840</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso</url>
-      <iso>
-        <volume-id>Fedora-18-x86_64-Live-Desktop</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>959879168</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-KDE.iso</url>
-      <iso>
-        <volume-id>Fedora-18-x86_64-Live-KDE</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>870789120</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>18</version>
-	<arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/</url>
-      <treeinfo>
-	<family>Fedora</family>
-	<version>18</version>
-	<arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>805306368</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1207959552</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/19">
-    <short-id>fedora19</short-id>
-    <_name>Fedora 19</_name>
-    <version>19</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Schr?dinger's Cat</codename>
-    <upgrades id="http://fedoraproject.org/fedora/18"/>
-    <derives-from id="http://fedoraproject.org/fedora/18"/>
-
-    <!-- Full installer DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 19 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4518858752</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Network installer DVD -->
-    <media arch="i686">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/iso/Fedora-19-i386-netinst.iso</url>
-      <iso>
-        <volume-id>Fedora 19 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>370006016</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="x86_64">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 19 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4444481536</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/i386/Fedora-Live-Desktop-i686-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-Desktop-i686-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>962682880</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="i686" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/i386/Fedora-Live-KDE-i686-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-KDE-i686-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>883580928</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/x86_64/Fedora-Live-Desktop-x86_64-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-Desktop-x86_64-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>997115904</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE-->
-    <media arch="x86_64" live="true">
-      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/x86_64/Fedora-Live-KDE-x86_64-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-KDE-x86_64-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>920012800</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- LXDE-->
-    <media arch="x86_64" live="true">
-      <url>https://archive.fedoraproject.org/pub/alt/releases/19/Spins/x86_64/Fedora-Live-LXDE-x86_64-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-LXDE-x86_64-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>724379648</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- XFCE -->
-    <media arch="x86_64" live="true">
-      <url>https://archive.fedoraproject.org/pub/alt/releases/19/Spins/x86_64/Fedora-Live-XFCE-x86_64-19-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-XFCE-x86_64-19-1</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>650180608</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/i386/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>19</version>
-        <arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/x86_64/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>19</version>
-        <arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/20">
-    <short-id>fedora20</short-id>
-    <_name>Fedora 20</_name>
-    <version>20</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <codename>Heisenbug</codename>
-    <upgrades id="http://fedoraproject.org/fedora/19"/>
-    <derives-from id="http://fedoraproject.org/fedora/19"/>
-
-    <!-- Installer DVD -->
-    <media arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 20 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4679280640</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url>
-      <iso>
-        <volume-id>Fedora 20 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>4602331136</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Network Installer -->
-    <media arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-netinst.iso</url>
-      <iso>
-        <volume-id>Fedora 20 i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>374159360</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-netinst.iso</url>
-      <iso>
-        <volume-id>Fedora 20 x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>336367616</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="ppc64">
-      <url>http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso</url>
-
-      <iso>
-        <volume-id>Fedora_20_ppc64</volume-id>
-        <system-id>PPC</system-id>
-        <volume-size>356321280</volume-size>
-      </iso>
-    </media>
-
-    <!-- GNOME -->
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-Desktop-i686-20</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>966383616</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-Desktop-x86_64-20</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>998473728</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- KDE -->
-    <media arch="i686" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-KDE-i686-20-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-KDE-i686-20</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>939143168</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-KDE-x86_64-20-1.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-KDE-x86_64-20</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>972208128</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>20</version>
-        <arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>20</version>
-        <arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/21">
-    <short-id>fedora21</short-id>
-    <_name>Fedora 21</_name>
-    <version>21</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <upgrades id="http://fedoraproject.org/fedora/20"/>
-    <derives-from id="http://fedoraproject.org/fedora/20"/>
-
-    <release-date>2014-12-03</release-date>
-
-    <variant id="workstation">
-      <_name>Fedora 21 Workstation</_name>
-    </variant>
-    <variant id="server">
-      <_name>Fedora 21 Server</_name>
-    </variant>
-    <variant id="netinst">
-      <_name>Fedora 21</_name>
-    </variant>
-    <variant id="cloud">
-      <_name>Fedora 21 Cloud</_name>
-    </variant>
-
-    <!-- Workstation -->
-
-    <!-- NOTE: There is no installer media for Workstation and even though Server
-               netiso is actually generic enough to let user install
-               Workstation as well, both netiso and full installer ISO have the
-               exact same volume-id so we can't simply assign netiso a (fake)
-               generic variant and be done with it. :( For more details:
-
-              https://bugzilla.redhat.com/show_bug.cgi?id=1178787
-    !-->
-
-    <media arch="i686" live="true">
-      <variant id="workstation"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-WS-i686-21.*</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>1335937024</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <variant id="workstation"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-WS-x86_64-21.*</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>1471502336</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- Server -->
-
-    <!-- DVD -->
-    <media arch="i686">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso</url>
-      <iso>
-        <volume-id>Fedora-S.*21.*-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2153469952</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso</url>
-      <iso>
-        <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2047315968</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Network Installer
-
-         Although these ISOs are branded as 'Server', they are pretty generic. For details:
-
-         https://bugzilla.redhat.com/show_bug.cgi?id=1178787
-     !-->
-    <media arch="i686">
-      <variant id="netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso</url>
-      <iso>
-        <volume-id>Fedora-S.*21.*-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>505403392</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso</url>
-      <iso>
-        <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>444067840</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>21</version>
-        <arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/</url>
-      <variant id="server"/>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>21</version>
-        <arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <!-- Cloud -->
-
-    <media arch="i686">
-      <variant id="cloud"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso</url>
-      <iso>
-        <volume-id>Fedora-C.*21.*-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>505688064</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="cloud"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso</url>
-      <iso>
-        <volume-id>Fedora-C.*-21.*-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>444221440</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/</url>
-      <variant id="cloud"/>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>21</version>
-        <arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/</url>
-      <variant id="cloud"/>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>21</version>
-        <arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://fedoraproject.org/fedora/22">
-    <short-id>fedora22</short-id>
-    <_name>Fedora 22</_name>
-    <version>22</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <upgrades id="http://fedoraproject.org/fedora/21"/>
-    <derives-from id="http://fedoraproject.org/fedora/21"/>
-
-    <release-date>2015-05-26</release-date>
-
-    <variant id="workstation">
-      <_name>Fedora 22 Workstation</_name>
-    </variant>
-    <variant id="workstation-netinst">
-      <_name>Fedora 22 Workstation</_name>
-    </variant>
-    <variant id="server">
-      <_name>Fedora 22 Server</_name>
-    </variant>
-    <variant id="server-netinst">
-      <_name>Fedora 22 Server</_name>
-    </variant>
-
-    <!-- Workstation -->
-
-    <!-- Live -->
-    <media arch="i686" live="true">
-      <variant id="workstation"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Live-Workstation-i686-22-3.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-WS-i686-22.*</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>1398321152</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <variant id="workstation"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-22-3.iso</url>
-      <iso>
-        <volume-id>Fedora-Live-WS-x86_64-22.*</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>1430704128</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz0</kernel>
-      <initrd>isolinux/initrd0.img</initrd>
-    </media>
-
-    <!-- Network Installer !-->
-    <media arch="i686">
-      <variant id="workstation-netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Workstation-netinst-i386-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>534521856</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="workstation-netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>468690944</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Server -->
-
-    <!-- DVD -->
-    <media arch="i686">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2334973952</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>2216890368</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <!-- Network Installer !-->
-    <media arch="i686">
-      <variant id="server-netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-netinst-i386-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-i386</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>534495232</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <variant id="server-netinst"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22.iso</url>
-      <iso>
-        <volume-id>Fedora-22-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-        <volume-size>468740096</volume-size>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <tree arch="i686">
-      <variant id="server"/>
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/</url>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>22</version>
-        <arch>i386</arch>
-      </treeinfo>
-    </tree>
-    <tree arch="x86_64">
-      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/</url>
-      <variant id="server"/>
-      <treeinfo>
-        <family>Fedora</family>
-        <version>22</version>
-        <arch>x86_64</arch>
-      </treeinfo>
-    </tree>
-
-    <!-- No install media or tree is provided for Fedora 22 Cloud variant -->
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-    </installer>
-  </os>
-
-  <!-- Generic entry for future Fedora releases. Please update the 'upgrades',
-       'derives-from', 'volume-id' and 'resources' nodes accordingly each time
-       you add a new (specific) entry for a new release. -->
-  <os id="http://fedoraproject.org/fedora/unknown">
-    <short-id>fedora-unknown</short-id>
-    <_name>Fedora</_name>
-    <version>unknown</version>
-    <_vendor>Fedora Project</_vendor>
-    <family>linux</family>
-    <distro>fedora</distro>
-    <upgrades id="http://fedoraproject.org/fedora/22"/>
-    <derives-from id="http://fedoraproject.org/fedora/22"/>
-    <release-status>prerelease</release-status>
-
-    <media arch="i686">
-      <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <media arch="i686" live="true">
-      <iso>
-        <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
-    <media arch="x86_64" live="true">
-      <iso>
-        <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <ram>2147483648</ram>
-        <storage>21474836480</storage>
-      </recommended>
-    </resources>
-  </os>
-
-  <!-- Do not add entry here, the last entry should always be fedora-unknown.
-       And if adding a new entry, make sure to update fedora-unknown as
-       mentioned in the comment above. -->
-
-</libosinfo>
diff --git a/data/oses/fedora/Makefile.am b/data/oses/fedora/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/fedora/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/fedora/fedora-unknown.xml.in b/data/oses/fedora/fedora-unknown.xml.in
new file mode 100644
index 0000000..3d2b9c5
--- /dev/null
+++ b/data/oses/fedora/fedora-unknown.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/unknown">
+    <short-id>fedora-unknown</short-id>
+    <_name>Fedora</_name>
+    <version>unknown</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <upgrades id="http://fedoraproject.org/fedora/22"/>
+    <derives-from id="http://fedoraproject.org/fedora/22"/>
+    <release-status>prerelease</release-status>
+
+    <media arch="i686">
+      <iso>
+        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-i386</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>Fedora.*-([2-9][3-9]|[0-9]{3,}).*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="i686" live="true">
+      <iso>
+        <volume-id>Fedora-Live-.*-i686-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+    </media>
+    <media arch="x86_64" live="true">
+      <iso>
+        <volume-id>Fedora-Live-.*-x86_64-([2-9][3-9]|[0-9]{3,})</volume-id>
+        <system-id>LINUX</system-id>
+      </iso>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora1.xml.in b/data/oses/fedora/fedora1.xml.in
new file mode 100644
index 0000000..204ce30
--- /dev/null
+++ b/data/oses/fedora/fedora1.xml.in
@@ -0,0 +1,91 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/1">
+    <short-id>fedora1</short-id>
+    <_name>Fedora Core 1</_name>
+    <version>1</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Yarrow</codename>
+    <upgrades id="http://redhat.com/rhl/9"/>
+    <derives-from id="http://redhat.com/rhl/9"/>
+
+    <release-date>2003-11-05</release-date>
+    <eol-date>2004-09-20</eol-date>
+
+    <!-- XXX upgrades/derives RHL -->
+
+    <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 -->
+    </devices>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>660340736</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC/1 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>667516928</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/iso/yarrow-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC/1 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>645464064</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <iso>
+        <application-id>FC/1 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3963158528</volume-size>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/iso/yarrow-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/1 x86_64</application-id>
+        <system-id>LINUX</system-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/1/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora10.xml.in b/data/oses/fedora/fedora10.xml.in
new file mode 100644
index 0000000..2e50dcc
--- /dev/null
+++ b/data/oses/fedora/fedora10.xml.in
@@ -0,0 +1,353 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/10">
+    <short-id>fedora10</short-id>
+    <_name>Fedora 10</_name>
+    <version>10</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Cambridge</codename>
+    <upgrades id="http://fedoraproject.org/fedora/9"/>
+    <derives-from id="http://fedoraproject.org/fedora/9"/>
+
+    <release-date>2008-11-25</release-date>
+    <eol-date>2009-12-18</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+
+    <!-- DVD -->
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3662573568</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>720508928</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>706545664</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>708554752</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724043776</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>720308224</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/iso/Fedora-10-i386-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 10 i386 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>83990528</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4172283904</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721672192</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>723263488</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721778688</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721303552</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724482048</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/iso/Fedora-10-x86_64-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 10 x86_64 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>560422912</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc DVD</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>4497768448</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 1</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>729636864</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 2</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>708579328</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 3</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>714471424</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 4</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>687958016</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 5</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>716013568</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 6</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>716664832</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 7 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/ppc/iso/Fedora-10-ppc-disc7.iso</url>
+      <iso>
+        <volume-id>Fedora 10 ppc Disc 7</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>94961664</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live.iso</url>
+      <iso>
+        <volume-id>F10-i686-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>714407936</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/i686/F10-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>F10-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>711905280</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>F10-x86_64-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>717281280</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Live/x86_64/F10-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>F10-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>717221888</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>10</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>10</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora11.xml.in b/data/oses/fedora/fedora11.xml.in
new file mode 100644
index 0000000..130c074
--- /dev/null
+++ b/data/oses/fedora/fedora11.xml.in
@@ -0,0 +1,353 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/11">
+    <short-id>fedora11</short-id>
+    <_name>Fedora 11</_name>
+    <version>11</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Leonidas</codename>
+    <upgrades id="http://fedoraproject.org/fedora/10"/>
+    <derives-from id="http://fedoraproject.org/fedora/10"/>
+
+    <release-date>2009-06-09</release-date>
+    <eol-date>2010-06-25</eol-date>
+
+    <devices>
+      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> <!-- USB tablet -->
+    </devices>
+
+    <!-- DVD -->
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3683829760</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727830528</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724916224</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721659904</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728756224</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>717754368</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/iso/Fedora-11-i386-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 11 i386 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>64604160</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4268124160</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726374400</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>725426176</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727185408</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724492288</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724090880</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/iso/Fedora-11-x86_64-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 11 x86_64 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>641380352</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc DVD</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>4606894080</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 1</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>725729280</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 2</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>719245312</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 3</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>726794240</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 4</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>722802688</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 5</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>708642816</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 6</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>719030272</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 7 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/ppc/iso/Fedora-11-ppc-disc7.iso</url>
+      <iso>
+        <volume-id>Fedora 11 ppc Disc 7</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>182509568</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-11-i686-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721569792</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/i686/Fedora-11-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-11-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719276032</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-11-x86_64-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724097024</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Live/x86_64/Fedora-11-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-11-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727095296</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>11</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>11</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora12.xml.in b/data/oses/fedora/fedora12.xml.in
new file mode 100644
index 0000000..da91765
--- /dev/null
+++ b/data/oses/fedora/fedora12.xml.in
@@ -0,0 +1,313 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/12">
+    <short-id>fedora12</short-id>
+    <_name>Fedora 12</_name>
+    <version>12</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Constantine</codename>
+    <upgrades id="http://fedoraproject.org/fedora/11"/>
+    <derives-from id="http://fedoraproject.org/fedora/11"/>
+
+    <release-date>2009-11-17</release-date>
+    <eol-date>2010-12-02</eol-date>
+
+    <!-- DVD -->
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3204427776</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724697088</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728029184</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726962176</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>722438144</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/iso/Fedora-12-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 12 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>303261696</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3537600512</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727363584</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719775744</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726503424</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727928832</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/iso/Fedora-12-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 12 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>636233728</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc DVD</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>3738935296</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 1</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>729341952</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 2</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>728432640</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 3</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>726351872</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 4</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>726714368</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 5</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>726775808</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/ppc/iso/Fedora-12-ppc-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 12 ppc Disc 6</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>16394240</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-12-i686-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>685336576</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/i686/Fedora-12-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-12-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>713181184</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-12-x86_64-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>687138816</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Live/x86_64/Fedora-12-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-12-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>717940736</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>12</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>12</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora13.xml.in b/data/oses/fedora/fedora13.xml.in
new file mode 100644
index 0000000..2f32ab6
--- /dev/null
+++ b/data/oses/fedora/fedora13.xml.in
@@ -0,0 +1,229 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/13">
+    <short-id>fedora13</short-id>
+    <_name>Fedora 13</_name>
+    <version>13</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Goddard</codename>
+    <upgrades id="http://fedoraproject.org/fedora/12"/>
+    <derives-from id="http://fedoraproject.org/fedora/12"/>
+
+    <release-date>2010-05-25</release-date>
+    <eol-date>2011-06-04</eol-date>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3277086720</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726675456</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724484096</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>722425856</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>718925824</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/iso/Fedora-13-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 13 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>386164736</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3630045184</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728256512</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728606720</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726992896</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>723963904</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/iso/Fedora-13-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 13 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>723660800</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-13-i686-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>707715072</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/i686/Fedora-13-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-13-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>731193344</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-13-x86_64-Live</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>709580800</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Live/x86_64/Fedora-13-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-13-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>733466624</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>13</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>13</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora14.xml.in b/data/oses/fedora/fedora14.xml.in
new file mode 100644
index 0000000..5a17121
--- /dev/null
+++ b/data/oses/fedora/fedora14.xml.in
@@ -0,0 +1,243 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/14">
+    <short-id>fedora14</short-id>
+    <_name>Fedora 14</_name>
+    <version>14</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Laughlin</codename>
+    <upgrades id="http://fedoraproject.org/fedora/13"/>
+    <derives-from id="http://fedoraproject.org/fedora/13"/>
+
+    <release-date>2010-11-02</release-date>
+    <eol-date>2011-12-08</eol-date>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3561752576</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>705503232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728064000</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728426496</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728170496</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 14 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>672913408</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3520802816</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>726687744</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728717312</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>723972096</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721358848</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 14 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>621590528</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-14-i686-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>718903296</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/i686/Fedora-14-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-14-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>718798848</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-14-x86_64-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719706112</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Live/x86_64/Fedora-14-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-14-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719327232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>14</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>14</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>402653184</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>536870912</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora15.xml.in b/data/oses/fedora/fedora15.xml.in
new file mode 100644
index 0000000..62a5672
--- /dev/null
+++ b/data/oses/fedora/fedora15.xml.in
@@ -0,0 +1,120 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/15">
+    <short-id>fedora15</short-id>
+    <_name>Fedora 15</_name>
+    <version>15</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Lovelock</codename>
+    <upgrades id="http://fedoraproject.org/fedora/14"/>
+    <derives-from id="http://fedoraproject.org/fedora/14"/>
+
+    <release-date>2011-05-24</release-date>
+
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/iso/Fedora-15-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 15 i386 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3650455552</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/x86_64/iso/Fedora-15-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 15 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3596310528</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-15-i686-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>592189440</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/i686/Fedora-15-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-15-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>725118976</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-15-x86_64-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>593618944</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Live/x86_64/Fedora-15-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-15-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>725055488</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>15</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>15</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>671088640</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora16.xml.in b/data/oses/fedora/fedora16.xml.in
new file mode 100644
index 0000000..e5d6591
--- /dev/null
+++ b/data/oses/fedora/fedora16.xml.in
@@ -0,0 +1,120 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/16">
+    <short-id>fedora16</short-id>
+    <_name>Fedora 16</_name>
+    <version>16</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Verne</codename>
+    <upgrades id="http://fedoraproject.org/fedora/15"/>
+    <derives-from id="http://fedoraproject.org/fedora/15"/>
+
+    <release-date>2011-11-08</release-date>
+
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/iso/Fedora-16-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 16 i386 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3806375936</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/iso/Fedora-16-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 16 x86_64 DVD</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3756955648</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-16-i686-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>633985024</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/i686/Fedora-16-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-16-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>730486784</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-16-x86_64-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>633040896</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Live/x86_64/Fedora-16-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-16-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728915968</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>16</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>16</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora17.xml.in b/data/oses/fedora/fedora17.xml.in
new file mode 100644
index 0000000..0defa4d
--- /dev/null
+++ b/data/oses/fedora/fedora17.xml.in
@@ -0,0 +1,118 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/17">
+    <short-id>fedora17</short-id>
+    <_name>Fedora 17</_name>
+    <version>17</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Beefy Miracle</codename>
+    <upgrades id="http://fedoraproject.org/fedora/16"/>
+    <derives-from id="http://fedoraproject.org/fedora/16"/>
+
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/i386/iso/Fedora-17-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 17 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3911847936</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/iso/Fedora-17-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 17 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3834099712</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-17-i686-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>677355520</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/i686/Fedora-17-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-17-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>728510464</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-17-x86_64-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>676110336</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Live/x86_64/Fedora-17-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-17-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724793344</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>17</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>17</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora18.xml.in b/data/oses/fedora/fedora18.xml.in
new file mode 100644
index 0000000..4062d9f
--- /dev/null
+++ b/data/oses/fedora/fedora18.xml.in
@@ -0,0 +1,118 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/18">
+    <short-id>fedora18</short-id>
+    <_name>Fedora 18</_name>
+    <version>18</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>The Spherical Cow</codename>
+    <upgrades id="http://fedoraproject.org/fedora/17"/>
+    <derives-from id="http://fedoraproject.org/fedora/17"/>
+
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/iso/Fedora-18-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 18 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4687384576</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/x86_64/iso/Fedora-18-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 18 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4573151232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-18-i686-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>931713024</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/i686/Fedora-18-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-18-i686-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>843427840</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso</url>
+      <iso>
+        <volume-id>Fedora-18-x86_64-Live-Desktop</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>959879168</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-18-x86_64-Live-KDE</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>870789120</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>18</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>18</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>805306368</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1207959552</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora19.xml.in b/data/oses/fedora/fedora19.xml.in
new file mode 100644
index 0000000..6617ff4
--- /dev/null
+++ b/data/oses/fedora/fedora19.xml.in
@@ -0,0 +1,151 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/19">
+    <short-id>fedora19</short-id>
+    <_name>Fedora 19</_name>
+    <version>19</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Schr?dinger's Cat</codename>
+    <upgrades id="http://fedoraproject.org/fedora/18"/>
+    <derives-from id="http://fedoraproject.org/fedora/18"/>
+
+    <!-- Full installer DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/iso/Fedora-19-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 19 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4518858752</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network installer DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/i386/iso/Fedora-19-i386-netinst.iso</url>
+      <iso>
+        <volume-id>Fedora 19 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>370006016</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 19 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4444481536</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/i386/Fedora-Live-Desktop-i686-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-Desktop-i686-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>962682880</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/i386/Fedora-Live-KDE-i686-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-KDE-i686-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>883580928</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/x86_64/Fedora-Live-Desktop-x86_64-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-Desktop-x86_64-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>997115904</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/19/Live/x86_64/Fedora-Live-KDE-x86_64-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-KDE-x86_64-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>920012800</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- LXDE-->
+    <media arch="x86_64" live="true">
+      <url>https://archive.fedoraproject.org/pub/alt/releases/19/Spins/x86_64/Fedora-Live-LXDE-x86_64-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-LXDE-x86_64-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724379648</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- XFCE -->
+    <media arch="x86_64" live="true">
+      <url>https://archive.fedoraproject.org/pub/alt/releases/19/Spins/x86_64/Fedora-Live-XFCE-x86_64-19-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-XFCE-x86_64-19-1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>650180608</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>19</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/x86_64/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>19</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora2.xml.in b/data/oses/fedora/fedora2.xml.in
new file mode 100644
index 0000000..e247ba2
--- /dev/null
+++ b/data/oses/fedora/fedora2.xml.in
@@ -0,0 +1,139 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/2">
+    <short-id>fedora2</short-id>
+    <_name>Fedora Core 2</_name>
+    <version>2</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Tettnang</codename>
+    <upgrades id="http://fedoraproject.org/fedora/1"/>
+    <derives-from id="http://fedoraproject.org/fedora/1"/>
+
+    <release-date>2004-05-18</release-date>
+    <eol-date>2005-04-11</eol-date>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>667529216</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC/2 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>665802752</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC/2 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>669016064</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-disc4.iso</url>
+      <iso>
+        <application-id>FC/2 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>203737088</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/iso/FC2-i386-DVD.iso</url>
+      <iso>
+        <application-id>FC/2 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4370640896</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668203008</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc2.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>666394624</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc3.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>656420864</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-disc4.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>240547840</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/iso/FC2-x86_64-DVD.iso</url>
+      <iso>
+        <application-id>FC/2 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4273096704</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/2/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora20.xml.in b/data/oses/fedora/fedora20.xml.in
new file mode 100644
index 0000000..34fcafd
--- /dev/null
+++ b/data/oses/fedora/fedora20.xml.in
@@ -0,0 +1,141 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/20">
+    <short-id>fedora20</short-id>
+    <_name>Fedora 20</_name>
+    <version>20</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Heisenbug</codename>
+    <upgrades id="http://fedoraproject.org/fedora/19"/>
+    <derives-from id="http://fedoraproject.org/fedora/19"/>
+
+    <!-- Installer DVD -->
+    <media arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 20 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4679280640</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 20 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4602331136</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network Installer -->
+    <media arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/iso/Fedora-20-i386-netinst.iso</url>
+      <iso>
+        <volume-id>Fedora 20 i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>374159360</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-netinst.iso</url>
+      <iso>
+        <volume-id>Fedora 20 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>336367616</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="ppc64">
+      <url>http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso</url>
+
+      <iso>
+        <volume-id>Fedora_20_ppc64</volume-id>
+        <system-id>PPC</system-id>
+        <volume-size>356321280</volume-size>
+      </iso>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-Desktop-i686-20-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-Desktop-i686-20</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>966383616</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-Desktop-x86_64-20</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>998473728</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE -->
+    <media arch="i686" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/i386/Fedora-Live-KDE-i686-20-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-KDE-i686-20</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>939143168</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Live/x86_64/Fedora-Live-KDE-x86_64-20-1.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-KDE-x86_64-20</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>972208128</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>20</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>20</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora21.xml.in b/data/oses/fedora/fedora21.xml.in
new file mode 100644
index 0000000..08cfd53
--- /dev/null
+++ b/data/oses/fedora/fedora21.xml.in
@@ -0,0 +1,193 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/21">
+    <short-id>fedora21</short-id>
+    <_name>Fedora 21</_name>
+    <version>21</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <upgrades id="http://fedoraproject.org/fedora/20"/>
+    <derives-from id="http://fedoraproject.org/fedora/20"/>
+
+    <release-date>2014-12-03</release-date>
+
+    <variant id="workstation">
+      <_name>Fedora 21 Workstation</_name>
+    </variant>
+    <variant id="server">
+      <_name>Fedora 21 Server</_name>
+    </variant>
+    <variant id="netinst">
+      <_name>Fedora 21</_name>
+    </variant>
+    <variant id="cloud">
+      <_name>Fedora 21 Cloud</_name>
+    </variant>
+
+    <!-- Workstation -->
+
+    <!-- NOTE: There is no installer media for Workstation and even though Server
+               netiso is actually generic enough to let user install
+               Workstation as well, both netiso and full installer ISO have the
+               exact same volume-id so we can't simply assign netiso a (fake)
+               generic variant and be done with it. :( For more details:
+
+              https://bugzilla.redhat.com/show_bug.cgi?id=1178787
+    !-->
+
+    <media arch="i686" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-i686-21.*</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>1335937024</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-x86_64-21.*</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>1471502336</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- Server -->
+
+    <!-- DVD -->
+    <media arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso</url>
+      <iso>
+        <volume-id>Fedora-S.*21.*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2153469952</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso</url>
+      <iso>
+        <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2047315968</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network Installer
+
+         Although these ISOs are branded as 'Server', they are pretty generic. For details:
+
+         https://bugzilla.redhat.com/show_bug.cgi?id=1178787
+     !-->
+    <media arch="i686">
+      <variant id="netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso</url>
+      <iso>
+        <volume-id>Fedora-S.*21.*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>505403392</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso</url>
+      <iso>
+        <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>444067840</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>21</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/</url>
+      <variant id="server"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>21</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <!-- Cloud -->
+
+    <media arch="i686">
+      <variant id="cloud"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso</url>
+      <iso>
+        <volume-id>Fedora-C.*21.*-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>505688064</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="cloud"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso</url>
+      <iso>
+        <volume-id>Fedora-C.*-21.*-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>444221440</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/</url>
+      <variant id="cloud"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>21</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/</url>
+      <variant id="cloud"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>21</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora22.xml.in b/data/oses/fedora/fedora22.xml.in
new file mode 100644
index 0000000..f463edf
--- /dev/null
+++ b/data/oses/fedora/fedora22.xml.in
@@ -0,0 +1,167 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/22">
+    <short-id>fedora22</short-id>
+    <_name>Fedora 22</_name>
+    <version>22</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <upgrades id="http://fedoraproject.org/fedora/21"/>
+    <derives-from id="http://fedoraproject.org/fedora/21"/>
+
+    <release-date>2015-05-26</release-date>
+
+    <variant id="workstation">
+      <_name>Fedora 22 Workstation</_name>
+    </variant>
+    <variant id="workstation-netinst">
+      <_name>Fedora 22 Workstation</_name>
+    </variant>
+    <variant id="server">
+      <_name>Fedora 22 Server</_name>
+    </variant>
+    <variant id="server-netinst">
+      <_name>Fedora 22 Server</_name>
+    </variant>
+
+    <!-- Workstation -->
+
+    <!-- Live -->
+    <media arch="i686" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Live-Workstation-i686-22-3.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-i686-22.*</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>1398321152</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <variant id="workstation"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-22-3.iso</url>
+      <iso>
+        <volume-id>Fedora-Live-WS-x86_64-22.*</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>1430704128</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Workstation-netinst-i386-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>534521856</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="workstation-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>468690944</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Server -->
+
+    <!-- DVD -->
+    <media arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2334973952</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2216890368</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Network Installer !-->
+    <media arch="i686">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-netinst-i386-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>534495232</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <variant id="server-netinst"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22.iso</url>
+      <iso>
+        <volume-id>Fedora-22-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>468740096</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <variant id="server"/>
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/</url>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>22</version>
+        <arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/</url>
+      <variant id="server"/>
+      <treeinfo>
+        <family>Fedora</family>
+        <version>22</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <!-- No install media or tree is provided for Fedora 22 Cloud variant -->
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <ram>2147483648</ram>
+        <storage>21474836480</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora3.xml.in b/data/oses/fedora/fedora3.xml.in
new file mode 100644
index 0000000..e1c63f2
--- /dev/null
+++ b/data/oses/fedora/fedora3.xml.in
@@ -0,0 +1,139 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/3">
+    <short-id>fedora3</short-id>
+    <_name>Fedora Core 3</_name>
+    <version>3</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Heidelberg</codename>
+    <upgrades id="http://fedoraproject.org/fedora/2"/>
+    <derives-from id="http://fedoraproject.org/fedora/2"/>
+
+    <release-date>2004-11-08</release-date>
+    <eol-date>2006-01-16</eol-date>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>646987776</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC/3 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668520448</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC/3 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>667498496</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-disc4.iso</url>
+      <iso>
+        <application-id>FC/3 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>404764672</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/iso/FC3-i386-DVD.iso</url>
+      <iso>
+        <application-id>FC/3 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2466410496</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668137472</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc2.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>669126656</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc3.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668422144</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-disc4.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>634851328</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/iso/FC3-x86_64-DVD.iso</url>
+      <iso>
+        <application-id>FC/3 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2639267840</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/3/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora4.xml.in b/data/oses/fedora/fedora4.xml.in
new file mode 100644
index 0000000..3d010f7
--- /dev/null
+++ b/data/oses/fedora/fedora4.xml.in
@@ -0,0 +1,213 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/4">
+    <short-id>fedora4</short-id>
+    <_name>Fedora Core 4</_name>
+    <version>4</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Stentz</codename>
+    <upgrades id="http://fedoraproject.org/fedora/3"/>
+    <derives-from id="http://fedoraproject.org/fedora/3"/>
+
+    <release-date>2005-06-13</release-date>
+    <eol-date>2006-08-07</eol-date>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>665434112</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC/4 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668708864</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC/4 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668954624</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-disc4.iso</url>
+      <iso>
+        <application-id>FC/4 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>660512768</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/iso/FC4-i386-DVD.iso</url>
+      <iso>
+        <application-id>FC/4 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2750582784</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668174336</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc2.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>666898432</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc3.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>669458432</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc4.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>667107328</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-disc5.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>173809664</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/iso/FC4-x86_64-DVD.iso</url>
+      <iso>
+        <application-id>FC/4 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2932850688</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>661739520</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc2.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>642336768</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc3.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>614821888</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc4.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>662865920</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-disc5.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>462649344</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/ppc/iso/FC4-ppc-DVD.iso</url>
+      <iso>
+        <application-id>FC/4 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>3090690048</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/4/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora5.xml.in b/data/oses/fedora/fedora5.xml.in
new file mode 100644
index 0000000..3401e0e
--- /dev/null
+++ b/data/oses/fedora/fedora5.xml.in
@@ -0,0 +1,223 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/5">
+    <short-id>fedora5</short-id>
+    <_name>Fedora Core 5</_name>
+    <version>5</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Bordeaux</codename>
+    <upgrades id="http://fedoraproject.org/fedora/4"/>
+    <derives-from id="http://fedoraproject.org/fedora/4"/>
+
+    <release-date>2006-03-20</release-date>
+    <eol-date>2007-07-02</eol-date>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>687235072</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>700618752</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>721016832</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc4.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>720910336</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-disc5.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>387753984</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/iso/FC-5-i386-DVD.iso</url>
+      <iso>
+        <application-id>FC/5 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3253669888</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668962816</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc2.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>718063616</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc3.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>718374912</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc4.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>717789184</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-disc5.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>613832704</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/iso/FC-5-x86_64-DVD.iso</url>
+      <iso>
+        <application-id>FC/5 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3462629376</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>695058432</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc2.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719341568</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc3.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719454208</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc4.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>720560128</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-disc5.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>686794752</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/ppc/iso/FC-5-ppc-DVD.iso</url>
+      <iso>
+        <application-id>FC/5 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>3631042560</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora6.xml.in b/data/oses/fedora/fedora6.xml.in
new file mode 100644
index 0000000..8e4ae58
--- /dev/null
+++ b/data/oses/fedora/fedora6.xml.in
@@ -0,0 +1,243 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/6">
+    <short-id>fedora6</short-id>
+    <_name>Fedora Core 6</_name>
+    <version>6</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Zod</codename>
+    <upgrades id="http://fedoraproject.org/fedora/5"/>
+    <derives-from id="http://fedoraproject.org/fedora/5"/>
+
+    <release-date>2006-10-24</release-date>
+    <eol-date>2007-12-07</eol-date>
+
+    <!-- Disk 1 -->
+    <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>
+        <system-id>LINUX</system-id>
+        <volume-size>708780032</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc2.iso</url>
+      <iso>
+        <application-id>FC-6 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>714240000</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc3.iso</url>
+      <iso>
+        <application-id>FC-6 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>711491584</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc4.iso</url>
+      <iso>
+        <application-id>FC-6 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>715229184</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-disc5.iso</url>
+      <iso>
+        <application-id>FC-6 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>677183488</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/iso/FC-6-i386-DVD.iso</url>
+      <iso>
+        <application-id>FC/6 i386</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3525195776</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc1.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>704204800</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc2.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>709750784</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc3.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>706191360</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc4.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>707473408</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc5.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>715692032</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-disc6.iso</url>
+      <iso>
+        <application-id>FC-6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>546852864</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/iso/FC-6-x86_64-DVD.iso</url>
+      <iso>
+        <application-id>FC/6 x86_64</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4088006656</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc1.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>730435584</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc2.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>713457664</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc3.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>708587520</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc4.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>704706560</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc5.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>714592256</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-disc6.iso</url>
+      <iso>
+        <application-id>FC-6 ppc</application-id>
+        <system-id>LINUX</system-id>
+        <volume-size>604110848</volume-size>
+      </iso>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/ppc/iso/FC-6-ppc-DVD.iso</url>
+      <iso>
+        <application-id>FC/6 ppc</application-id>
+        <system-id>PPC</system-id>
+        <volume-size>4285673472</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/i386/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/core/6/x86_64/os/</url>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+      <boot-iso>images/boot.iso</boot-iso>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora7.xml.in b/data/oses/fedora/fedora7.xml.in
new file mode 100644
index 0000000..b320e9e
--- /dev/null
+++ b/data/oses/fedora/fedora7.xml.in
@@ -0,0 +1,116 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/7">
+    <short-id>fedora7</short-id>
+    <_name>Fedora 7</_name>
+    <version>7</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Moonshine</codename>
+    <upgrades id="http://fedoraproject.org/fedora/6"/>
+    <derives-from id="http://fedoraproject.org/fedora/6"/>
+
+    <release-date>2007-05-31</release-date>
+    <eol-date>2008-06-13</eol-date>
+
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>2900602880</volume-size>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/iso/F-7-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 7 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3447975936</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/ppc/iso/F-7-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 7 ppc</volume-id>
+        <system-id>PPC</system-id>
+        <volume-size>3620605952</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-Live-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-7-Live-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>733427712</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/i386/Fedora-7-KDE-Live-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-7-KDE-Live-i386</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>719859712</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-7-Live-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>817156096</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Live/x86_64/Fedora-7-KDE-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-7-KDE-Live-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>871643136</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>7</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>7</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora8.xml.in b/data/oses/fedora/fedora8.xml.in
new file mode 100644
index 0000000..6708aa7
--- /dev/null
+++ b/data/oses/fedora/fedora8.xml.in
@@ -0,0 +1,128 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/8">
+    <short-id>fedora8</short-id>
+    <_name>Fedora 8</_name>
+    <version>8</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Werewolf</codename>
+    <upgrades id="http://fedoraproject.org/fedora/7"/>
+    <derives-from id="http://fedoraproject.org/fedora/7"/>
+
+    <release-date>2007-11-08</release-date>
+    <eol-date>2009-01-07</eol-date>
+
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3424749568</volume-size>
+      </iso>
+    </media>
+
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/iso/Fedora-8-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 8 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3876407296</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/ppc/iso/Fedora-8-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 8 ppc</volume-id>
+        <system-id>PPC</system-id>
+        <volume-size>4118646784</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-i686</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>731086848</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/i686/Fedora-8-Live-KDE-i686.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-KDE-i686</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>732188672</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>803870720</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/x86_64/Fedora-8-Live-KDE-x86_64.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-KDE-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>844269568</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="ppc" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Live/ppc/Fedora-8-Live-ppc.iso</url>
+      <iso>
+        <volume-id>Fedora-8-Live-ppc</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>732942336</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>8</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>8</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora/fedora9.xml.in b/data/oses/fedora/fedora9.xml.in
new file mode 100644
index 0000000..b26b9a5
--- /dev/null
+++ b/data/oses/fedora/fedora9.xml.in
@@ -0,0 +1,367 @@
+<libosinfo version="0.0.1">
+  <os id="http://fedoraproject.org/fedora/9">
+    <short-id>fedora9</short-id>
+    <_name>Fedora 9</_name>
+    <version>9</version>
+    <_vendor>Fedora Project</_vendor>
+    <family>linux</family>
+    <distro>fedora</distro>
+    <codename>Sulphur</codename>
+    <upgrades id="http://fedoraproject.org/fedora/8"/>
+    <derives-from id="http://fedoraproject.org/fedora/8"/>
+
+    <release-date>2008-05-13</release-date>
+    <eol-date>2009-07-10</eol-date>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/> <!-- virtio-net -->
+      <!-- Apparently F9 has selinux errors when installing with virtio:
+           https://bugzilla.redhat.com/show_bug.cgi?id=470386
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+      -->
+    </devices>
+
+    <!-- DVD -->
+    <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</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>3580680192</volume-size>
+      </iso>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>638533632</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668082176</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>652095488</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668047360</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>664877056</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/iso/Fedora-9-i386-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 9 i386 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>290463744</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>4163696640</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 1</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>637575168</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 2</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>667353088</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 3</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668954624</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 4</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>668628992</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 5</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>663744512</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 6</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>660492288</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 7 -->
+    <media arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/iso/Fedora-9-x86_64-disc7.iso</url>
+      <iso>
+        <volume-id>Fedora 9 x86_64 Disc 7</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>197728256</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- DVD -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-DVD.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc</volume-id>
+        <system-id>PPC</system-id>
+        <volume-size>4417064960</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 1 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc1.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 1</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>649594880</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 2 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc2.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 2</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>663785472</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 3 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc3.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 3</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>665425920</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 4 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc4.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 4</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>661508096</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 5 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc5.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 5</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>667478016</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 6 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc6.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 6</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>655919104</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- Disk 7 -->
+    <media arch="ppc">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/ppc/iso/Fedora-9-ppc-disc7.iso</url>
+      <iso>
+        <volume-id>Fedora 9 ppc Disc 7</volume-id>
+        <system-id>PPC|LINUX</system-id>
+        <volume-size>319293440</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-i686</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724121600</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="i686" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/i686/Fedora-9-i686-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-KDE-i686</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>724975616</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- GNOME -->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>727169024</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <!-- KDE-->
+    <media arch="x86_64" live="true">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Live/x86_64/Fedora-9-x86_64-Live-KDE.iso</url>
+      <iso>
+        <volume-id>Fedora-9-Live-KDE-x86_64</volume-id>
+        <system-id>LINUX</system-id>
+        <volume-size>729272320</volume-size>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="i686">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>9</version>
+	<arch>i386</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="x86_64">
+      <url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
+      <treeinfo>
+	<family>Fedora</family>
+	<version>9</version>
+	<arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <installer>
+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 84c32ac..dded0bd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,6 +28,29 @@ data/oses/debian/debian5.xml.in
 data/oses/debian/debian6.xml.in
 data/oses/debian/debian7.xml.in
 data/oses/debian/debian8.xml.in
+data/oses/fedora/fedora1.xml.in
+data/oses/fedora/fedora2.xml.in
+data/oses/fedora/fedora3.xml.in
+data/oses/fedora/fedora4.xml.in
+data/oses/fedora/fedora5.xml.in
+data/oses/fedora/fedora6.xml.in
+data/oses/fedora/fedora7.xml.in
+data/oses/fedora/fedora8.xml.in
+data/oses/fedora/fedora9.xml.in
+data/oses/fedora/fedora10.xml.in
+data/oses/fedora/fedora11.xml.in
+data/oses/fedora/fedora12.xml.in
+data/oses/fedora/fedora13.xml.in
+data/oses/fedora/fedora14.xml.in
+data/oses/fedora/fedora15.xml.in
+data/oses/fedora/fedora16.xml.in
+data/oses/fedora/fedora17.xml.in
+data/oses/fedora/fedora18.xml.in
+data/oses/fedora/fedora19.xml.in
+data/oses/fedora/fedora20.xml.in
+data/oses/fedora/fedora21.xml.in
+data/oses/fedora/fedora22.xml.in
+data/oses/fedora/fedora-unknown.xml.in
 data/oses/msdos/msdos6.22.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
@@ -37,7 +60,6 @@ data/oses/mandriva.xml.in
 data/oses/suse.xml.in
 data/oses/gnome.xml.in
 data/oses/rhel.xml.in
-data/oses/fedora.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
 data/oses/macos.xml.in
-- 
2.4.3



From berrange at redhat.com  Tue Sep 29 13:56:11 2015
From: berrange at redhat.com (Daniel P. Berrange)
Date: Tue, 29 Sep 2015 14:56:11 +0100
Subject: [Libosinfo] [PATCH 00/39] Split up database XML files
In-Reply-To: <1443455517-17894-1-git-send-email-berrange@redhat.com>
References: <1443455517-17894-1-git-send-email-berrange@redhat.com>
Message-ID: <20150929135611.GC31388@redhat.com>

On Mon, Sep 28, 2015 at 04:51:18PM +0100, Daniel P. Berrange wrote:
> This (pretty uninteresting) series splits up the current XML
> files so that we have at most 1 entity stored in each file.

I'm going to redo this split so that the filenames & directory
names follow a well defined naming format, instead of the fairly
adhoc one we have now. This will involve renaming some ids in
the database, so I'll do that first and repost.


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|