Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- 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 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
