Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 1 + data/platforms/Makefile.am | 3 +- data/platforms/redhat.com/Makefile.am | 1 + .../platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in | 14 ++++ .../platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in | 11 +++ .../platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in | 11 +++ data/platforms/rhel-xen.xml.in | 86 ---------------------- po/POTFILES.in | 9 ++- 13 files changed, 103 insertions(+), 88 deletions(-) create mode 100644 data/platforms/redhat.com/Makefile.am create mode 100644 data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in create mode 100644 data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in delete mode 100644 data/platforms/rhel-xen.xml.in diff --git a/configure.ac b/configure.ac index d0c2c8e..3be609a 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,7 @@ AC_CONFIG_FILES([ data/platforms/Makefile data/platforms/linux-kvm.org/Makefile data/platforms/qemu.org/Makefile + data/platforms/redhat.com/Makefile data/install-scripts/Makefile data/oses/Makefile data/oses/altlinux.org/Makefile diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am index 465dcb4..e5a08c7 100644 --- a/data/platforms/Makefile.am +++ b/data/platforms/Makefile.am @@ -2,11 +2,12 @@ SUBDIRS = \ linux-kvm.org \ qemu.org \ + redhat.com \ $(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/redhat.com/Makefile.am b/data/platforms/redhat.com/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/platforms/redhat.com/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in b/data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in new file mode 100644 index 0000000..ba1d6ce --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in @@ -0,0 +1,14 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.0.3.5.0";> + <short-id>xen-rhel-3.0.3.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/xen/vfb"/> + </devices> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in new file mode 100644 index 0000000..5770748 --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.1";> + <short-id>xen-rhel-3.1.0.5.1</short-id> + <_name>Xen 3.1.0 (RHEL 5.1)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.1</version> + + <upgrades id="http://redhat.com/xen-rhel/3.0.3.5.0"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in new file mode 100644 index 0000000..9b2376c --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.2";> + <short-id>xen-rhel-3.1.0.5.2</short-id> + <_name>Xen 3.1.0 (RHEL 5.2)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.2</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.1"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in new file mode 100644 index 0000000..2c4c83f --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.3";> + <short-id>xen-rhel-3.1.0.5.3</short-id> + <_name>Xen 3.1.0 (RHEL 5.3)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.3</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.2"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in new file mode 100644 index 0000000..4bba93c --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.4";> + <short-id>xen-rhel-3.1.0.5.4</short-id> + <_name>Xen 3.1.0 (RHEL 5.4)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.4</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.3"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in new file mode 100644 index 0000000..0b9d43b --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.5";> + <short-id>xen-rhel-3.1.0.5.5</short-id> + <_name>Xen 3.1.0 (RHEL 5.5)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.5</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.4"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in new file mode 100644 index 0000000..38aaf91 --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.6";> + <short-id>xen-rhel-3.1.0.5.6</short-id> + <_name>Xen 3.1.0 (RHEL 5.6)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.6</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.5"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in b/data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in new file mode 100644 index 0000000..99b4f80 --- /dev/null +++ b/data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://redhat.com/xen-rhel/3.1.0.5.7";> + <short-id>xen-rhel-3.1.0.5.7</short-id> + <_name>Xen 3.1.0 (RHEL 5.7)</_name> + <_vendor>Red Hat, Inc.</_vendor> + <version>3.1.0.5.7</version> + + <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.6"/> + <derives-from id="http://xen.org/xen/3.1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/rhel-xen.xml.in b/data/platforms/rhel-xen.xml.in deleted file mode 100644 index 851946b..0000000 --- a/data/platforms/rhel-xen.xml.in +++ /dev/null @@ -1,86 +0,0 @@ -<libosinfo version="0.0.1"> - - <platform id="http://redhat.com/xen-rhel/3.0.3.5.0";> - <short-id>xen-rhel-3.0.3.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/xen/vfb"/> - </devices> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.1";> - <short-id>xen-rhel-3.1.0.5.1</short-id> - <_name>Xen 3.1.0 (RHEL 5.1)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.1</version> - - <upgrades id="http://redhat.com/xen-rhel/3.0.3.5.0"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.2";> - <short-id>xen-rhel-3.1.0.5.2</short-id> - <_name>Xen 3.1.0 (RHEL 5.2)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.2</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.1"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.3";> - <short-id>xen-rhel-3.1.0.5.3</short-id> - <_name>Xen 3.1.0 (RHEL 5.3)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.3</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.2"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.4";> - <short-id>xen-rhel-3.1.0.5.4</short-id> - <_name>Xen 3.1.0 (RHEL 5.4)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.4</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.3"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.5";> - <short-id>xen-rhel-3.1.0.5.5</short-id> - <_name>Xen 3.1.0 (RHEL 5.5)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.5</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.4"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.6";> - <short-id>xen-rhel-3.1.0.5.6</short-id> - <_name>Xen 3.1.0 (RHEL 5.6)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.6</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.5"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - - <platform id="http://redhat.com/xen-rhel/3.1.0.5.7";> - <short-id>xen-rhel-3.1.0.5.7</short-id> - <_name>Xen 3.1.0 (RHEL 5.7)</_name> - <_vendor>Red Hat, Inc.</_vendor> - <version>3.1.0.5.7</version> - - <upgrades id="http://redhat.com/xen-rhel/3.1.0.5.6"/> - <derives-from id="http://xen.org/xen/3.1.0"/> - </platform> - -</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 89a1da3..e6a24f5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -374,7 +374,14 @@ data/platforms/qemu.org/qemu-2.1.3.xml.in data/platforms/qemu.org/qemu-2.2.0.xml.in data/platforms/qemu.org/qemu-2.2.1.xml.in data/platforms/qemu.org/qemu-2.3.0.xml.in -data/platforms/rhel-xen.xml.in +data/platforms/redhat.com/xen-rhel-3.0.3.5.0.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.1.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.2.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.3.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.4.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.5.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.6.xml.in +data/platforms/redhat.com/xen-rhel-3.1.0.5.7.xml.in data/platforms/xen.xml.in osinfo/osinfo_avatar_format.c osinfo/osinfo_deployment.c -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
