3:04 p.m.
From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org>
Based on a patch from Mateusz Kaplon <mateusz.kaplon(a)gmail.com>.
---
data/oses/macos.xml | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
create mode 100644 data/oses/macos.xml
diff --git a/data/oses/macos.xml b/data/oses/macos.xml
new file mode 100644
index 0000000..84aaa58
--- /dev/null
+++ b/data/oses/macos.xml
@@ -0,0 +1,94 @@
+<libosinfo version="0.0.1">
+
+ <os id="http://apple.com/macosx/10.0">
+ <short-id>macosx100</short-id>
+ <name>MacOS X Cheetah</name>
+ <version>10.0</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ </os>
+
+ <os id="http://apple.com/macosx/10.1">
+ <short-id>macosx101</short-id>
+ <name>MacOS X Puma</name>
+ <version>10.1</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.0" />
+ </os>
+
+ <os id="http://apple.com/macosx/10.2">
+ <short-id>macosx102</short-id>
+ <name>MacOS X Jaghuar</name>
+ <version>10.2</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.1" />
+ </os>
+
+ <os id="http://apple.com/macosx/10.3">
+ <short-id>macosx103</short-id>
+ <name>MacOS X Panther</name>
+ <version>10.3</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.2" />
+ </os>
+
+ <os id="http://apple.com/macosx/10.4">
+ <short-id>macosx104</short-id>
+ <name>MacOS X Tiger</name>
+ <version>10.4</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.3" />
+ </os>
+
+ <os id="http://apple.com/macosx/10.5">
+ <short-id>macosx105</short-id>
+ <name>MacOS X Leopard</name>
+ <version>10.5</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.4" />
+ </os>
+
+ <os id="http://apple.com/macosx/10.6">
+ <short-id>macosx106</short-id>
+ <name>MacOS X Snow Leopard</name>
+ <version>10.6</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.5" />
+
+ <resources arch="all">
+ <minimal>
+ <n-cpus>2</n-cpus>
+ <cpu>1600000000</cpu>
+ <ram>2147483648</ram>
+ <storage>7516192768</storage>
+ </minimal>
+ </resources>
+
+ </os>
+
+ <os id="http://apple.com/macosx/10.7">
+ <short-id>macosx107</short-id>
+ <name>MacOS X Lion</name>
+ <version>10.7</version>
+ <vendor>Apple Inc.</vendor>
+ <family>MacOS</family>
+ <upgrades id="http://apple.com/macosx/10.6" />
+
+ <resources arch="all">
+ <minimal>
+ <n-cpus>2</n-cpus>
+ <cpu>1600000000</cpu>
+ <ram>2147483648</ram>
+ <storage>7516192768</storage>
+ </minimal>
+ </resources>
+
+ </os>
+
+</libosinfo>
--
1.7.7.3
3:04 p.m.
New subject: [libvirt] [libvirt-glib 2/2] Add more OS metadata
From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org>
- More metadata on Debian, *SUSE, Ubuntu and Windows.
- Correct some metadata.
Based on a patch from Mateusz Kaplon <mateusz.kaplon(a)gmail.com>.
---
data/oses/debian.xml | 142 ++++++++++++++++++++++++++++++++++
data/oses/opensuse.xml | 200 ++++++++++++++++++++++++++++++++++++++++++++++--
data/oses/suse.xml | 63 ++++++++++++++-
data/oses/ubuntu.xml | 118 +++++++++++++++++++++++++++-
data/oses/windows.xml | 122 +++++++++++++++++++++++++-----
5 files changed, 613 insertions(+), 32 deletions(-)
diff --git a/data/oses/debian.xml b/data/oses/debian.xml
index 06360b7..ddf0dbe 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml
@@ -1,11 +1,84 @@
<libosinfo version="0.0.1">
+ <os id="http://debian.org/buzz">
+ <short-id>debianbuzz</short-id>
+ <name>Debian Buzz</name>
+ <version>1.1</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ </os>
+
+ <os id="http://debian.org/rex">
+ <short-id>debianrex</short-id>
+ <name>Debian Rex</name>
+ <version>1.2</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/buzz"/>
+ </os>
+
+ <os id="http://debian.org/bo">
+ <short-id>debianbo</short-id>
+ <name>Debian Bo</name>
+ <version>1.3</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/rex"/>
+ </os>
+
+ <os id="http://debian.org/hamm">
+ <short-id>debianhamm</short-id>
+ <name>Debian Hamm</name>
+ <version>2.0</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/bo"/>
+ </os>
+
+ <os id="http://debian.org/silnk">
+ <short-id>debiansilnk</short-id>
+ <name>Debian Silnk</name>
+ <version>2.1</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/hamm"/>
+ </os>
+
+ <os id="http://debian.org/potato">
+ <short-id>debianpotato</short-id>
+ <name>Debian Potato</name>
+ <version>2.2</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/silnk"/>
+ </os>
+
+ <os id="http://debian.org/woody">
+ <short-id>debianwoody</short-id>
+ <name>Debian Woody</name>
+ <version>3</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/potato"/>
+ </os>
+
+
+ <os id="http://debian.org/sarge">
+ <short-id>debiansarge</short-id>
+ <name>Debian Sarge</name>
+ <version>3.1</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/woody"/>
+ </os>
+
<os id="http://debian.org/etch">
<short-id>debianetch</short-id>
<name>Debian Etch</name>
<version>4</version>
<vendor>Debian Project</vendor>
<family>Linux</family>
+ <upgrades id="http://debian.org/sarge"/>
</os>
<os id="http://debian.org/lenny">
@@ -20,6 +93,20 @@
<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-cpu>1</n-cpu>
+ <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/squeeze">
@@ -33,6 +120,61 @@
<devices>
<device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
</devices>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpu>1</n-cpu>
+ <ram>134217728</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>536870912</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+
+ <media arch="i386">
+ <url>http://cdimage.debian.org/debian-cd/6.0.3/i386/iso-dvd/</url>
+ <iso>
+ <volume-id>Debian 6.0.3 i386 1</volume-id>
+ </iso>
+ <kernel>/vmlinuz</kernel>
+ <initrd>/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <url>http://cdimage.debian.org/debian-cd/6.0.3/amd64/iso-dvd/</url>
+ <iso>
+ <volume-id>Debian 6.0.3 amd64 1</volume-id>
+ </iso>
+ </media>
+
+ <media arch="i386" live="true">
+
<url>http://cdimage.debian.org/debian-cd/6.0.3-live/i386/iso-hybrid/<...
+ <iso>
+ <volume-id>Debian squeeze 20111014-08:13</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ </media>
+ <media arch="x86_64" live="true">
+
<url>http://cdimage.debian.org/debian-cd/6.0.3-live/amd64/iso-hybrid/&l...
+ <iso>
+ <volume-id>Debian squeeze 20111014-08:11</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ </media>
+ </os>
+
+<!-- Wheezy isn't released yet
+ <os id="http://debian.org/wheezy">
+ <short-id>debianwheezy</short-id>
+ <name>Debian Wheezy</name>
+ <version>7</version>
+ <vendor>Debian Project</vendor>
+ <family>Linux</family>
+ <upgrades id="http://debian.org/squeeze"/>
</os>
+-->
</libosinfo>
diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml
index ffbe4cd..dc484de 100644
--- a/data/oses/opensuse.xml
+++ b/data/oses/opensuse.xml
@@ -1,27 +1,167 @@
<libosinfo version="0.0.1">
+ <os id="http://opensuse.org/linux/10.2">
+ <short-id>opensuse102</short-id>
+ <name>openSUSE 10.2</name>
+ <version>10.2</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ </os>
+
+ <os id="http://opensuse.org/linux/10.3">
+ <short-id>opensuse103</short-id>
+ <name>openSUSE 10.3</name>
+ <version>10.3</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/10.2" />
+ </os>
+
+ <os id="http://opensuse.org/linux/11.0">
+ <short-id>opensuse110</short-id>
+ <name>openSUSE 11.0</name>
+ <version>11.0</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/10.3" />
+ </os>
+
+ <os id="http://opensuse.org/linux/11.1">
+ <short-id>opensuse111</short-id>
+ <name>openSUSE 11.1</name>
+ <version>11.1</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/11.0" />
+ </os>
+
+ <os id="http://opensuse.org/linux/11.2">
+ <short-id>opensuse112</short-id>
+ <name>openSUSE 11.2</name>
+ <version>11.2</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/11.1" />
+ </os>
+
+ <os id="http://opensuse.org/linux/11.3">
+ <short-id>opensuse113</short-id>
+ <name>openSUSE 11.3</name>
+ <version>11.3</version>
+ <vendor>openSUSE</vendor>
+ <family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/11.2" />
+
+ <media arch="i586">
+
<url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-D...
+ <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>vmlinuz</kernel>
+ <initrd>initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+
<url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-D...
+ <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>vmlinuz</kernel>
+ <initrd>initrd.img</initrd>
+ </media>
+
+ <media arch="i586" live="true">
+ <url>http://software.opensuse.org/113/en</url>
+ <iso>
+ <volume-id>openSUSE Live CD.*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ <kernel>vmlinuz</kernel>
+ <initrd>initrd.img</initrd>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://software.opensuse.org/113/en</url>
+ <iso>
+ <volume-id>openSUSE Live CD.*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ <kernel>vmlinuz</kernel>
+ <initrd>initrd.img</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/linux/11.4">
<short-id>opensuse114</short-id>
<name>openSUSE 11.4</name>
<version>11.4</version>
<vendor>openSUSE</vendor>
<family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/11.3" />
- <media arch="i386">
-
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-D...
+ <media arch="i586">
+
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-D...
+ <iso>
+ <volume-id>openSUSE-DVD-i586-Build0024</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-D...
<iso>
- <volume-id>openSUSE-DVD-i586-Build0024</volume-id>
+ <volume-id>openSUSE-DVD-x86_640024</volume-id>
<system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
</iso>
+ </media>
+ <media arch="i586" live="true">
+ <url>http://software.opensuse.org/114/pl</url>
+ <iso>
+ <volume-id>openSUSE Live CD.*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
</media>
- <media arch="x86_64">
-
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-D...
+ <media arch="x86_64" live="true">
+ <url>http://software.opensuse.org/114/pl</url>
<iso>
- <volume-id>openSUSE-DVD-x86_640024</volume-id>
+ <volume-id>openSUSE Live CD.*</volume-id>
<system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
</iso>
</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/linux/12.1">
@@ -30,6 +170,54 @@
<version>12.1</version>
<vendor>openSUSE</vendor>
<family>Linux</family>
+ <upgrades id="http://opensuse.org/linux/11.4" />
+
+ <media arch="i586">
+
<url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-D...
+ <iso>
+ <volume-id>openSUSE-DVD-i586-Build0039</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ </media>
+ <media arch="x86_64">
+
<url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-D...
+ <iso>
+ <volume-id>openSUSE-DVD-x86_640039</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ </media>
+
+ <media arch="i586" live="true">
+ <url>http://software.opensuse.org/121/pl</url>
+ <iso>
+ <volume-id>openSUSE Live CD.*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ </media>
+ <media arch="x86_64" live="true">
+ <url>http://software.opensuse.org/121/pl</url>
+ <iso>
+ <volume-id>openSUSE Live CD.*</volume-id>
+ <system-id>LINUX</system-id>
+ <publisher-id>SUSE LINUX Products GmbH</publisher-id>
+ </iso>
+ </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/suse.xml b/data/oses/suse.xml
index ff9c2a0..3cd0463 100644
--- a/data/oses/suse.xml
+++ b/data/oses/suse.xml
@@ -1,20 +1,29 @@
<libosinfo version="0.0.1">
- <os id="http://www.novell.com/linux/sles10">
+ <os id="http://suse.com/linux/sles9">
+ <short-id>sles9</short-id>
+ <name>Suse Linux Enterprise Server 9</name>
+ <version>9</version>
+ <vendor>Novell</vendor>
+ <family>Linux</family>
+ </os>
+
+ <os id="http://suse.com/linux/sles10">
<short-id>sles10</short-id>
<name>Suse Linux Enterprise Server 10</name>
<version>10</version>
<vendor>Novell</vendor>
<family>Linux</family>
+ <upgrades id="http://suse.com/linux/sles9"/>
</os>
- <os id="http://www.novell.com/linux/sles11">
+ <os id="http://suse.com/linux/sles11">
<short-id>sles11</short-id>
<name>Suse Linux Enterprise Server 11</name>
<version>11</version>
<vendor>Novell</vendor>
<family>Linux</family>
- <upgrades id='http://www.novell.com/linux/sles10'/>
+ <upgrades id="http://suse.com/linux/sles10"/>
<devices>
<device
id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -22,4 +31,52 @@
</devices>
</os>
+ <os id="http://suse.com/linux/sled9">
+ <short-id>sled9</short-id>
+ <name>Suse Linux Enterprise Desktop 9</name>
+ <version>9</version>
+ <vendor>Novell</vendor>
+ <family>Linux</family>
+ </os>
+
+ <os id="http://suse.com/linux/sled10">
+ <short-id>sled10</short-id>
+ <name>Suse Linux Enterprise Desktop 10</name>
+ <version>10</version>
+ <vendor>Novell</vendor>
+ <family>Linux</family>
+ <upgrades id="http://suse.com/linux/sled9"/>
+
+ <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/linux/sled11">
+ <short-id>sled11</short-id>
+ <name>Suse Linux Enterprise Desktop 11</name>
+ <version>11</version>
+ <vendor>Novell</vendor>
+ <family>Linux</family>
+ <upgrades id="http://suse.com/linux/sled10"/>
+
+ <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/ubuntu.xml b/data/oses/ubuntu.xml
index 86cf559..35a7812 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml
@@ -50,6 +50,39 @@
<vendor>Canonical</vendor>
<family>Linux</family>
<upgrades id="http://ubuntu.com/karmic"/>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpu>1</n-cpu>
+ <ram>67108864</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>536870912</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+
+ <media arch="x86_64" live="true">
+ <url>http://releases.ubuntu.com/10.04/</url>
+ <iso>
+ <volume-id>.*Ubuntu.* 10.04.3 .* amd64.*</volume-id>
+ <system-id>LINUX</system-id>
+ </iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.img</initrd>
+ </media>
+ <media arch="i386" live="true">
+ <url>http://releases.ubuntu.com/10.04/</url>
+ <iso>
+ <volume-id>.*Ubuntu.* 10.04.3 .* 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/maverick">
@@ -59,6 +92,39 @@
<vendor>Canonical</vendor>
<family>Linux</family>
<upgrades id="http://ubuntu.com/lucid"/>
+
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpu>1</n-cpu>
+ <ram>67108864</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>536870912</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+
+ <media arch="i386" live="true">
+ <url>http://releases.ubuntu.com/10.10/</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://releases.ubuntu.com/10.10/</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/natty">
@@ -69,17 +135,37 @@
<family>Linux</family>
<upgrades id="http://ubuntu.com/maverick"/>
- <media arch="i386">
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpu>1</n-cpu>
+ <ram>67108864</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>536870912</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+
+ <media arch="i386" live="true">
+ <url>http://releases.ubuntu.com/11.04/</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">
+ <media arch="x86_64" live="true">
+ <url>http://releases.ubuntu.com/11.04/</url>
<iso>
- <volume-id>Ubuntu.* 11.04 amd64.*</volume-id>
+ <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>
@@ -91,15 +177,37 @@
<family>Linux</family>
<upgrades id="http://ubuntu.com/natty"/>
- <media arch="i386">
+ <resources arch="all">
+ <minimum>
+ <cpu>1000000000</cpu>
+ <n-cpu>1</n-cpu>
+ <ram>67108864</ram>
+ <storage>5368709120</storage>
+ </minimum>
+ <recommended>
+ <cpu>1000000000</cpu>
+ <ram>536870912</ram>
+ <storage>5368709120</storage>
+ </recommended>
+ </resources>
+
+ <media arch="i386" live="true">
+ <url>http://releases.ubuntu.com/11.10/</url>
<iso>
<volume-id>.*Ubuntu.* 11.10 i386.*</volume-id>
+ <system-id>LINUX</system-id>
</iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.img</initrd>
</media>
- <media arch="x86_64">
+ <media arch="x86_64" live="true">
+ <url>http://releases.ubuntu.com/11.10/</url>
<iso>
<volume-id>.*Ubuntu.* 11.10 amd64.*</volume-id>
+ <system-id>LINUX</system-id>
</iso>
+ <kernel>casper/vmlinuz</kernel>
+ <initrd>casper/initrd.img</initrd>
</media>
</os>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 15255cc..3da62a8 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -12,6 +12,95 @@
</devices>
</os>
+ <os id="http://microsoft.com/win95">
+ <short-id>win95</short-id>
+ <name>Microsoft Windows 95</name>
+ <version>4.0</version>
+ <vendor>Microsoft</vendor>
+ <family>Windows</family>
+ <derives-from id="http://microsoft.com/windows"/>
+
+ <resources arch="i386">
+ <minimum>
+ <cpu>12000000</cpu>
+ <ram>4194304</ram>
+ <storage>41943040</storage>
+ </minimum>
+ </resources>
+ </os>
+
+ <os id="http://microsoft.com/win98">
+ <short-id>win98</short-id>
+ <name>Microsoft Windows 98</name>
+ <version>4.1</version>
+ <vendor>Microsoft</vendor>
+ <family>Windows</family>
+ <derives-from id="http://microsoft.com/windows"/>
+ <upgrades id="http://microsoft.com/win95"/>
+
+ <resources arch="i386">
+ <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/winme">
+ <short-id>winme</short-id>
+ <name>Microsoft Windows Millennium Edition</name>
+ <version>4.9</version>
+ <vendor>Microsoft</vendor>
+ <family>Windows</family>
+ <derives-from id="http://microsoft.com/windows"/>
+ <upgrades id="http://microsoft.com/win98"/>
+
+ <resources arch="i386">
+ <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/win2k">
+ <short-id>win2k</short-id>
+ <name>Microsoft Windows 2000</name>
+ <version>5.0</version>
+ <vendor>Microsoft</vendor>
+ <family>Windows</family>
+ <derives-from id="http://microsoft.com/windows"/>
+
+ <resources arch="i386">
+ <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>
+ </os>
+
+
<os id="http://microsoft.com/winxp">
<short-id>winxp</short-id>
<name>Microsoft Windows XP</name>
@@ -19,6 +108,7 @@
<vendor>Microsoft</vendor>
<family>Windows</family>
<derives-from id="http://microsoft.com/windows"/>
+ <upgrades id="http://microsoft.com/win2k"/>
<media arch="i386">
<iso>
@@ -50,15 +140,15 @@
<vendor>Microsoft</vendor>
<family>Windows</family>
<derives-from id="http://microsoft.com/windows"/>
- </os>
- <os id="http://microsoft.com/win2k">
- <short-id>win2k</short-id>
- <name>Microsoft Windows 2000</name>
- <version>5.0</version>
- <vendor>Microsoft</vendor>
- <family>Windows</family>
- <derives-from id="http://microsoft.com/windows"/>
+ <resources arch="x86_64">
+ <minimum>
+ <cpu>733000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>268435456</ram>
+ <storage>1610612736</storage>
+ </minimum>
+ </resources>
</os>
<os id="http://microsoft.com/win2k3">
@@ -161,22 +251,18 @@
<derives-from id="http://microsoft.com/windows"/>
<upgrades id="http://microsoft.com/winxp"/>
- <resources arch="i386">
+ <resources arch="all">
<minimum>
- <cpu>1000000000</cpu>
+ <cpu>800000000</cpu>
<n-cpus>1</n-cpus>
- <ram>1073741824</ram>
- <storage>42949672960</storage>
+ <ram>536870912</ram>
+ <storage>16106127360</storage>
</minimum>
- </resources>
-
- <resources arch="x86_64">
- <minimum>
+ <recommended>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
<ram>1073741824</ram>
<storage>42949672960</storage>
- </minimum>
+ </recommended>
</resources>
</os>
--
1.7.7.3
3:05 p.m.
On Mon, Nov 28, 2011 at 11:04 PM, Zeeshan Ali (Khattak)
<zeeshanak(a)gnome.org> wrote:
From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org>
Based on a patch from Mateusz Kaplon <mateusz.kaplon(a)gmail.com>.
Ouch, wrong tag and wrong list. Please ignore. :(
--
Regards,
Zeeshan Ali (Khattak)
FSF member#5124
4742
days inactive
4742
days old
2 comments
1 participants
participants (1)
-
Zeeshan Ali (Khattak)