Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 1 + data/platforms/Makefile.am | 7 ++- data/platforms/kvm.xml.in | 63 ---------------------- data/platforms/linux-kvm.org/Makefile.am | 1 + data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in | 11 ++++ data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in | 10 ++++ data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in | 11 ++++ data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in | 11 ++++ data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in | 11 ++++ data/platforms/linux-kvm.org/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/linux-kvm.org/Makefile.am create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in create mode 100644 data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in diff --git a/configure.ac b/configure.ac index c6bf314..cecb5e3 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/linux-kvm.org/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 4b84d3e..682b872 100644 --- a/data/platforms/Makefile.am +++ b/data/platforms/Makefile.am @@ -1,6 +1,11 @@ +SUBDIRS = \ + linux-kvm.org \ + $(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 4433f76..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/qemu-kvm/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/qemu/1.0"/> - </platform> - - <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.0"/> - <derives-from id="http://qemu.org/qemu/1.0.1"/> - </platform> - - <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.0.1"/> - <derives-from id="http://qemu.org/qemu/1.1"/> - </platform> - - <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.0"/> - <derives-from id="http://qemu.org/qemu/1.1.1"/> - </platform> - - <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.1"/> - <derives-from id="http://qemu.org/qemu/1.1.2"/> - </platform> - - <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.2"/> - <derives-from id="http://qemu.org/qemu/1.2.0"/> - </platform> - -</libosinfo> diff --git a/data/platforms/linux-kvm.org/Makefile.am b/data/platforms/linux-kvm.org/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/platforms/linux-kvm.org/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in new file mode 100644 index 0000000..0ce6011 --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.0.1.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.0"/> + <derives-from id="http://qemu.org/qemu/1.0.1"/> + </platform> +</libosinfo> diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in new file mode 100644 index 0000000..351e2c8 --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in @@ -0,0 +1,10 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu/1.0"/> + </platform> +</libosinfo> diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in new file mode 100644 index 0000000..606c25d --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.0.1"/> + <derives-from id="http://qemu.org/qemu/1.1"/> + </platform> +</libosinfo> diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in new file mode 100644 index 0000000..382f97e --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.0"/> + <derives-from id="http://qemu.org/qemu/1.1.1"/> + </platform> +</libosinfo> diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in new file mode 100644 index 0000000..e96725f --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.1"/> + <derives-from id="http://qemu.org/qemu/1.1.2"/> + </platform> +</libosinfo> diff --git a/data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in b/data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in new file mode 100644 index 0000000..bcd8823 --- /dev/null +++ b/data/platforms/linux-kvm.org/qemu-kvm-1.2.0.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <platform id="http://linux-kvm.org/qemu-kvm/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/qemu-kvm/1.1.2"/> + <derives-from id="http://qemu.org/qemu/1.2.0"/> + </platform> +</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 7899ac2..5ffacca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -334,7 +334,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/linux-kvm.org/qemu-kvm-1.0.1.xml.in +data/platforms/linux-kvm.org/qemu-kvm-1.0.xml.in +data/platforms/linux-kvm.org/qemu-kvm-1.1.0.xml.in +data/platforms/linux-kvm.org/qemu-kvm-1.1.1.xml.in +data/platforms/linux-kvm.org/qemu-kvm-1.1.2.xml.in +data/platforms/linux-kvm.org/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 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
