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