From zeeshanak at gnome.org Thu Oct 1 12:40:55 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Thu, 1 Oct 2015 13:40:55 +0100 Subject: [Libosinfo] [PATCH 39/39] tests: switch to use XML from builddir only In-Reply-To: <1443455517-17894-40-git-send-email-berrange@redhat.com> References: <1443455517-17894-1-git-send-email-berrange@redhat.com> <1443455517-17894-40-git-send-email-berrange@redhat.com> Message-ID: A bit of explanation in commit message would be good. On Mon, Sep 28, 2015 at 4:51 PM, Daniel P. Berrange wrote: > --- > test/test-isodetect.c | 6 +----- > test/test-xml-validate | 2 +- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/test/test-isodetect.c b/test/test-isodetect.c > index e223d1a..c378246 100644 > --- a/test/test-isodetect.c > +++ b/test/test-isodetect.c > @@ -319,12 +319,8 @@ static void test_one(const gchar *vendor) > fail_unless(OSINFO_IS_LOADER(loader), "Loader is not a LOADER"); > fail_unless(OSINFO_IS_DB(db), "Db is not a DB"); > > - osinfo_loader_process_path(loader, SRCDIR "/data", &error); > + osinfo_loader_process_path(loader, BUILDDIR "/data", &error); > fail_unless(error == NULL, error ? error->message : "none"); > - if (!g_str_equal(SRCDIR, BUILDDIR)) { > - osinfo_loader_process_path(loader, BUILDDIR "/data", &error); > - fail_unless(error == NULL, error ? error->message : "none"); > - } > > isos = load_isos(vendor, &error); > > diff --git a/test/test-xml-validate b/test/test-xml-validate > index e3cb1a0..4b646bc 100755 > --- a/test/test-xml-validate > +++ b/test/test-xml-validate > @@ -11,7 +11,7 @@ n=0 > f=0 > for dir in $DIRS > do > - XML=`find $abs_srcdir/../data/$dir -name '*.xml'` || exit 1 > + XML=`find $abs_builddir/../data/$dir -name '*.xml'` || exit 1 > > for xml in `echo "$XML" | sort` > do > -- > 2.4.3 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo -- Regards, Zeeshan Ali (Khattak) ________________________________________ Befriend GNOME: http://www.gnome.org/friends/ From zeeshanak at gnome.org Thu Oct 1 12:54:51 2015 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Thu, 1 Oct 2015 13:54:51 +0100 Subject: [Libosinfo] [PATCH] Use a proper URI for ib700 device In-Reply-To: <1443437365-32114-1-git-send-email-berrange@redhat.com> References: <1443437365-32114-1-git-send-email-berrange@redhat.com> Message-ID: On Mon, Sep 28, 2015 at 11:49 AM, Daniel P. Berrange wrote: > The ib700 device currently uses a URI of "isa://ib700". Change > that to refer to the product vendor http://ibasetechnologies.net/ib700 I actually never liked this scheme of using invalid HTTP URLs as IDs in libosinfo. They look like HTTP(S) URLs but then they are not. However, since we have been using them everywhere, why be inconsistent here. Besides "isa://ib700" is not any better either so ACK. -- Regards, Zeeshan Ali (Khattak) ________________________________________ Befriend GNOME: http://www.gnome.org/friends/ From berrange at redhat.com Mon Oct 5 15:31:04 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:04 +0100 Subject: [Libosinfo] [PATCH v2 00/52] Split up database XML files Message-ID: <1444059116-459-1-git-send-email-berrange@redhat.com> This is a v2 of my previous posting https://www.redhat.com/archives/libosinfo/2015-September/msg00043.html This series splits up the current XML files so that we have at most one entity stored in each file. I've not attempted to change anything about the way we load files, or the format, so this is fully back compatible with current loader code. The interesting patches are at the start of the series. In particular the first two patches add some documentation which is intended to act as an informal specification for our database layout and file naming scheme. Patches 17 and onwards are the splitting up of data files, so not going to be particularly interesting to review. I used a script to do the actual splitting initially, which should have ensure I didn't loose any data / introduce mistakes, though I've done a few rebases which needed manual fixing since then. The final layout should match what I describe in the docs. Since it is not obvious from the patches, filenames in the database are as follows: $ROOT/datamap $ROOT/datamap/x.org $ROOT/datamap/x.org/x11-keyboard.xml $ROOT/datamap/microsoft.com $ROOT/datamap/microsoft.com/win-7-l10n-language.xml $ROOT/datamap/microsoft.com/win-8-l10n-language-reverse.xml $ROOT/datamap/microsoft.com/win-8-l10n-language.xml $ROOT/platform $ROOT/platform/qemu.org $ROOT/platform/qemu.org/qemu-1.4.0.xml $ROOT/platform/qemu.org/qemu-1.0.xml $ROOT/platform/qemu.org/qemu-1.2.2.xml $ROOT/platform/qemu.org/qemu-2.3.0.xml $ROOT/platform/qemu.org/qemu-1.7.1.xml $ROOT/platform/qemu.org/qemu-1.2.1.xml $ROOT/platform/qemu.org/qemu-1.6.0.xml $ROOT/platform/qemu.org/qemu-1.6.2.xml $ROOT/platform/qemu.org/qemu-2.0.0.xml $ROOT/platform/qemu.org/qemu-1.6.1.xml $ROOT/platform/qemu.org/qemu-1.1.1.xml $ROOT/platform/qemu.org/qemu-1.1.2.xml $ROOT/platform/qemu.org/qemu-1.2.0.xml $ROOT/platform/qemu.org/qemu-1.5.2.xml $ROOT/platform/qemu.org/qemu-2.1.2.xml $ROOT/platform/qemu.org/qemu-1.5.0.xml $ROOT/platform/qemu.org/qemu-1.4.2.xml $ROOT/platform/qemu.org/qemu-2.0.2.xml $ROOT/platform/qemu.org/qemu-2.2.0.xml $ROOT/platform/qemu.org/qemu-1.3.0.xml $ROOT/platform/qemu.org/qemu-1.7.0.xml $ROOT/platform/qemu.org/qemu-1.4.1.xml $ROOT/platform/qemu.org/qemu-1.5.1.xml $ROOT/platform/qemu.org/qemu-2.1.3.xml $ROOT/platform/qemu.org/qemu-2.1.0.xml $ROOT/platform/qemu.org/qemu-2.1.1.xml $ROOT/platform/qemu.org/qemu-1.0.1.xml $ROOT/platform/qemu.org/qemu-1.5.3.xml $ROOT/platform/qemu.org/qemu-1.1.1-1.xml $ROOT/platform/qemu.org/qemu-2.2.1.xml $ROOT/platform/qemu.org/qemu-2.0.1.xml $ROOT/platform/qemu.org/qemu-1.3.1.xml $ROOT/platform/qemu.org/qemu-1.7.2.xml $ROOT/platform/qemu.org/qemu-1.1.xml $ROOT/platform/redhat.com $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.7.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.6.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.2.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.4.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.5.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.1.xml $ROOT/platform/redhat.com/xen-rhel-3.1.0.5.3.xml $ROOT/platform/redhat.com/xen-rhel-3.0.3.5.0.xml $ROOT/platform/xen.org $ROOT/platform/xen.org/xen-3.1.4.xml $ROOT/platform/xen.org/xen-3.1.3.xml $ROOT/platform/xen.org/xen-3.0.2.xml $ROOT/platform/xen.org/xen-3.2.1.xml $ROOT/platform/xen.org/xen-4.1.0.xml $ROOT/platform/xen.org/xen-3.3.0.xml $ROOT/platform/xen.org/xen-4.0.0.xml $ROOT/platform/xen.org/xen-3.0.4.xml $ROOT/platform/xen.org/xen-3.4.2.xml $ROOT/platform/xen.org/xen-3.3.1.xml $ROOT/platform/xen.org/xen-3.0.3.xml $ROOT/platform/xen.org/xen-3.4.0.xml $ROOT/platform/xen.org/xen-4.0.1.xml $ROOT/platform/xen.org/xen-3.4.3.xml $ROOT/platform/xen.org/xen-3.2.3.xml $ROOT/platform/xen.org/xen-3.4.1.xml $ROOT/platform/xen.org/xen-3.3.2.xml $ROOT/platform/xen.org/xen-3.2.2.xml $ROOT/platform/xen.org/xen-3.2.0.xml $ROOT/platform/linux-kvm.org $ROOT/platform/linux-kvm.org/qemu-kvm-1.2.0.xml $ROOT/platform/linux-kvm.org/qemu-kvm-1.1.0.xml $ROOT/platform/linux-kvm.org/qemu-kvm-1.0.xml $ROOT/platform/linux-kvm.org/qemu-kvm-1.1.2.xml $ROOT/platform/linux-kvm.org/qemu-kvm-1.0.1.xml $ROOT/platform/linux-kvm.org/qemu-kvm-1.1.1.xml $ROOT/install-script $ROOT/install-script/redhat.com $ROOT/install-script/redhat.com/rhel-kickstart-jeos.xml $ROOT/install-script/redhat.com/rhel-kickstart-desktop.xml $ROOT/install-script/ubuntu.com $ROOT/install-script/ubuntu.com/ubuntu-preseed-jeos.xml $ROOT/install-script/fedoraproject.org $ROOT/install-script/fedoraproject.org/fedora-kickstart-jeos.xml $ROOT/install-script/fedoraproject.org/fedora-kickstart-desktop.xml $ROOT/install-script/debian.org $ROOT/install-script/debian.org/debian-preseed-jeos.xml $ROOT/install-script/debian.org/debian-preseed-desktop.xml $ROOT/install-script/microsoft.com $ROOT/install-script/microsoft.com/windows-reg-desktop.xml $ROOT/install-script/microsoft.com/windows-unattend-jeos.xml $ROOT/install-script/microsoft.com/windows-unattend-desktop.xml $ROOT/install-script/microsoft.com/windows-sif-desktop.xml $ROOT/install-script/microsoft.com/windows-sif-jeos.xml $ROOT/install-script/microsoft.com/windows-cmd-desktop.xml $ROOT/os $ROOT/os/openbsd.org $ROOT/os/openbsd.org/openbsd-5.0.xml $ROOT/os/openbsd.org/openbsd-5.2.xml $ROOT/os/openbsd.org/openbsd-5.3.xml $ROOT/os/openbsd.org/openbsd-4.3.xml $ROOT/os/openbsd.org/openbsd-4.9.xml $ROOT/os/openbsd.org/openbsd-5.6.xml $ROOT/os/openbsd.org/openbsd-5.5.xml $ROOT/os/openbsd.org/openbsd-4.5.xml $ROOT/os/openbsd.org/openbsd-4.8.xml $ROOT/os/openbsd.org/openbsd-4.4.xml $ROOT/os/openbsd.org/openbsd-4.2.xml $ROOT/os/openbsd.org/openbsd-5.1.xml $ROOT/os/openbsd.org/openbsd-5.4.xml $ROOT/os/novell.com $ROOT/os/novell.com/netware-6.xml $ROOT/os/novell.com/netware-4.xml $ROOT/os/novell.com/netware-5.xml $ROOT/os/apple.com $ROOT/os/apple.com/macosx-10.7.xml $ROOT/os/apple.com/macosx-10.6.xml $ROOT/os/apple.com/macosx-10.3.xml $ROOT/os/apple.com/macosx-10.2.xml $ROOT/os/apple.com/macosx-10.5.xml $ROOT/os/apple.com/macosx-10.4.xml $ROOT/os/apple.com/macosx-10.0.xml $ROOT/os/apple.com/macosx-10.1.xml $ROOT/os/redhat.com $ROOT/os/redhat.com/rhl-7.2.xml $ROOT/os/redhat.com/rhl-4.0.xml $ROOT/os/redhat.com/rhel-5.6.xml $ROOT/os/redhat.com/rhl-5.1.xml $ROOT/os/redhat.com/rhel-3.2.xml $ROOT/os/redhat.com/rhel-3.4.xml $ROOT/os/redhat.com/rhel-6.6.xml $ROOT/os/redhat.com/rhl-3.0.3.xml $ROOT/os/redhat.com/rhel-atomic-7.0.xml $ROOT/os/redhat.com/rhel-7.0.xml $ROOT/os/redhat.com/rhel-5.1.xml $ROOT/os/redhat.com/rhel-4.2.xml $ROOT/os/redhat.com/rhel-6.5.xml $ROOT/os/redhat.com/rhl-7.xml $ROOT/os/redhat.com/rhel-2.1.xml $ROOT/os/redhat.com/rhl-6.2.xml $ROOT/os/redhat.com/rhel-6.3.xml $ROOT/os/redhat.com/rhl-4.1.xml $ROOT/os/redhat.com/rhel-5.11.xml $ROOT/os/redhat.com/rhel-6.0.xml $ROOT/os/redhat.com/rhel-2.1.7.xml $ROOT/os/redhat.com/rhl-1.1.xml $ROOT/os/redhat.com/rhl-8.0.xml $ROOT/os/redhat.com/rhel-atomic-7.1.xml $ROOT/os/redhat.com/rhel-4.1.xml $ROOT/os/redhat.com/rhl-5.2.xml $ROOT/os/redhat.com/rhl-7.1.xml $ROOT/os/redhat.com/rhel-4.0.xml $ROOT/os/redhat.com/rhel-2.1.6.xml $ROOT/os/redhat.com/rhl-2.0.xml $ROOT/os/redhat.com/rhel-5.9.xml $ROOT/os/redhat.com/rhel-2.1.3.xml $ROOT/os/redhat.com/rhel-2.1.4.xml $ROOT/os/redhat.com/rhel-2.1.1.xml $ROOT/os/redhat.com/rhl-6.1.xml $ROOT/os/redhat.com/rhel-3.6.xml $ROOT/os/redhat.com/rhel-5.8.xml $ROOT/os/redhat.com/rhel-3.1.xml $ROOT/os/redhat.com/rhel-5.5.xml $ROOT/os/redhat.com/rhel-5.7.xml $ROOT/os/redhat.com/rhel-6.2.xml $ROOT/os/redhat.com/rhel-3.xml $ROOT/os/redhat.com/rhel-2.1.5.xml $ROOT/os/redhat.com/rhel-4.6.xml $ROOT/os/redhat.com/rhel-2.1.2.xml $ROOT/os/redhat.com/rhl-9.xml $ROOT/os/redhat.com/rhel-3.7.xml $ROOT/os/redhat.com/rhel-3.8.xml $ROOT/os/redhat.com/rhel-3.9.xml $ROOT/os/redhat.com/rhel-7.1.xml $ROOT/os/redhat.com/rhel-5.4.xml $ROOT/os/redhat.com/rhl-7.3.xml $ROOT/os/redhat.com/rhel-4.4.xml $ROOT/os/redhat.com/rhl-1.0.xml $ROOT/os/redhat.com/rhl-4.2.xml $ROOT/os/redhat.com/rhel-4.8.xml $ROOT/os/redhat.com/rhel-4.5.xml $ROOT/os/redhat.com/rhl-2.1.xml $ROOT/os/redhat.com/rhl-6.0.xml $ROOT/os/redhat.com/rhel-6.1.xml $ROOT/os/redhat.com/rhel-3.3.xml $ROOT/os/redhat.com/rhel-4.7.xml $ROOT/os/redhat.com/rhel-5.10.xml $ROOT/os/redhat.com/rhel-5.3.xml $ROOT/os/redhat.com/rhel-6.4.xml $ROOT/os/redhat.com/rhel-4.9.xml $ROOT/os/redhat.com/rhel-4.3.xml $ROOT/os/redhat.com/rhel-3.5.xml $ROOT/os/redhat.com/rhel-5.2.xml $ROOT/os/redhat.com/rhel-5.0.xml $ROOT/os/redhat.com/rhl-5.0.xml $ROOT/os/centos.org $ROOT/os/centos.org/centos-6.5.xml $ROOT/os/centos.org/centos-6.0.xml $ROOT/os/centos.org/centos-6.4.xml $ROOT/os/centos.org/centos-6.1.xml $ROOT/os/centos.org/centos-6.3.xml $ROOT/os/centos.org/centos-6.2.xml $ROOT/os/centos.org/centos-7.0.xml $ROOT/os/gnome.org $ROOT/os/gnome.org/gnome-3.6.xml $ROOT/os/gnome.org/gnome-continuous-3.12.xml $ROOT/os/gnome.org/gnome-3.8.xml $ROOT/os/gnome.org/gnome-continuous-3.14.xml $ROOT/os/gnome.org/gnome-continuous-3.10.xml $ROOT/os/ubuntu.com $ROOT/os/ubuntu.com/ubuntu-5.04.xml $ROOT/os/ubuntu.com/ubuntu-11.10.xml $ROOT/os/ubuntu.com/ubuntu-13.10.xml $ROOT/os/ubuntu.com/ubuntu-13.04.xml $ROOT/os/ubuntu.com/ubuntu-11.04.xml $ROOT/os/ubuntu.com/ubuntu-7.04.xml $ROOT/os/ubuntu.com/ubuntu-12.10.xml $ROOT/os/ubuntu.com/ubuntu-4.10.xml $ROOT/os/ubuntu.com/ubuntu-14.04.xml $ROOT/os/ubuntu.com/ubuntu-15.10.xml $ROOT/os/ubuntu.com/ubuntu-9.04.xml $ROOT/os/ubuntu.com/ubuntu-14.10.xml $ROOT/os/ubuntu.com/ubuntu-10.10.xml $ROOT/os/ubuntu.com/ubuntu-6.10.xml $ROOT/os/ubuntu.com/ubuntu-12.04.xml $ROOT/os/ubuntu.com/ubuntu-6.06.xml $ROOT/os/ubuntu.com/ubuntu-9.10.xml $ROOT/os/ubuntu.com/ubuntu-15.04.xml $ROOT/os/ubuntu.com/ubuntu-5.10.xml $ROOT/os/ubuntu.com/ubuntu-10.04.xml $ROOT/os/ubuntu.com/ubuntu-8.04.xml $ROOT/os/ubuntu.com/ubuntu-8.10.xml $ROOT/os/ubuntu.com/ubuntu-7.10.xml $ROOT/os/oracle.com $ROOT/os/oracle.com/solaris-11.xml $ROOT/os/opensuse.org $ROOT/os/opensuse.org/opensuse-unknown.xml $ROOT/os/opensuse.org/opensuse-12.3.xml $ROOT/os/opensuse.org/opensuse-12.1.xml $ROOT/os/opensuse.org/opensuse-13.1.xml $ROOT/os/opensuse.org/opensuse-11.1.xml $ROOT/os/opensuse.org/opensuse-12.2.xml $ROOT/os/opensuse.org/opensuse-10.3.xml $ROOT/os/opensuse.org/opensuse-factory.xml $ROOT/os/opensuse.org/opensuse-13.2.xml $ROOT/os/opensuse.org/opensuse-11.3.xml $ROOT/os/opensuse.org/opensuse-11.2.xml $ROOT/os/opensuse.org/opensuse-11.0.xml $ROOT/os/opensuse.org/opensuse-11.4.xml $ROOT/os/opensuse.org/opensuse-10.2.xml $ROOT/os/suse.com $ROOT/os/suse.com/sles-11.4.xml $ROOT/os/suse.com/sled-12.xml $ROOT/os/suse.com/sled-11.1.xml $ROOT/os/suse.com/sles-10.xml $ROOT/os/suse.com/sled-11.3.xml $ROOT/os/suse.com/sles-11.1.xml $ROOT/os/suse.com/sles-12.xml $ROOT/os/suse.com/sles-11.xml $ROOT/os/suse.com/sled-11.4.xml $ROOT/os/suse.com/sled-10.xml $ROOT/os/suse.com/sled-9.xml $ROOT/os/suse.com/sled-11.2.xml $ROOT/os/suse.com/sled-11.xml $ROOT/os/suse.com/sles-11.2.xml $ROOT/os/suse.com/sles-11.3.xml $ROOT/os/suse.com/sles-9.xml $ROOT/os/fedoraproject.org $ROOT/os/fedoraproject.org/fedora-20.xml $ROOT/os/fedoraproject.org/fedora-15.xml $ROOT/os/fedoraproject.org/fedora-1.xml $ROOT/os/fedoraproject.org/fedora-10.xml $ROOT/os/fedoraproject.org/fedora-7.xml $ROOT/os/fedoraproject.org/fedora-22.xml $ROOT/os/fedoraproject.org/fedora-12.xml $ROOT/os/fedoraproject.org/fedora-2.xml $ROOT/os/fedoraproject.org/fedora-5.xml $ROOT/os/fedoraproject.org/fedora-9.xml $ROOT/os/fedoraproject.org/fedora-8.xml $ROOT/os/fedoraproject.org/fedora-14.xml $ROOT/os/fedoraproject.org/fedora-18.xml $ROOT/os/fedoraproject.org/fedora-4.xml $ROOT/os/fedoraproject.org/fedora-17.xml $ROOT/os/fedoraproject.org/fedora-6.xml $ROOT/os/fedoraproject.org/fedora-16.xml $ROOT/os/fedoraproject.org/fedora-3.xml $ROOT/os/fedoraproject.org/fedora-21.xml $ROOT/os/fedoraproject.org/fedora-unknown.xml $ROOT/os/fedoraproject.org/fedora-13.xml $ROOT/os/fedoraproject.org/fedora-11.xml $ROOT/os/fedoraproject.org/fedora-19.xml $ROOT/os/sun.com $ROOT/os/sun.com/opensolaris-2009.06.xml $ROOT/os/sun.com/solaris-10.xml $ROOT/os/sun.com/solaris-9.xml $ROOT/os/mageia.org $ROOT/os/mageia.org/mageia-1.xml $ROOT/os/mageia.org/mageia-2.xml $ROOT/os/mageia.org/mageia-3.xml $ROOT/os/altlinux.org $ROOT/os/altlinux.org/altlinux-5.0.xml $ROOT/os/altlinux.org/altlinux-2.4.xml $ROOT/os/altlinux.org/altlinux-7.0.xml $ROOT/os/altlinux.org/altlinux-4.0.xml $ROOT/os/altlinux.org/altlinux-2.2.xml $ROOT/os/altlinux.org/altlinux-2.0.xml $ROOT/os/altlinux.org/altlinux-1.0.xml $ROOT/os/altlinux.org/altlinux-6.0.xml $ROOT/os/altlinux.org/altlinux-3.0.xml $ROOT/os/altlinux.org/altlinux-4.1.xml $ROOT/os/debian.org $ROOT/os/debian.org/debian-6.xml $ROOT/os/debian.org/debian-3.xml $ROOT/os/debian.org/debian-4.xml $ROOT/os/debian.org/debian-1.1.xml $ROOT/os/debian.org/debian-7.xml $ROOT/os/debian.org/debian-1.2.xml $ROOT/os/debian.org/debian-3.1.xml $ROOT/os/debian.org/debian-8.xml $ROOT/os/debian.org/debian-2.2.xml $ROOT/os/debian.org/debian-1.3.xml $ROOT/os/debian.org/debian-5.xml $ROOT/os/debian.org/debian-2.0.xml $ROOT/os/debian.org/debian-2.1.xml $ROOT/os/mandriva.com $ROOT/os/mandriva.com/mes-5.1.xml $ROOT/os/mandriva.com/mandrake-10.0.xml $ROOT/os/mandriva.com/mandrake-6.0.xml $ROOT/os/mandriva.com/mandrake-5.1.xml $ROOT/os/mandriva.com/mandrake-7.2.xml $ROOT/os/mandriva.com/mandrake-10.2.xml $ROOT/os/mandriva.com/mandriva-2006.0.xml $ROOT/os/mandriva.com/mes-5.0.xml $ROOT/os/mandriva.com/mandriva-2008.0.xml $ROOT/os/mandriva.com/mandrake-9.0.xml $ROOT/os/mandriva.com/mandriva-2010.1.xml $ROOT/os/mandriva.com/mandrake-10.1.xml $ROOT/os/mandriva.com/mandrake-8.0.xml $ROOT/os/mandriva.com/mandriva-2007.xml $ROOT/os/mandriva.com/mandrake-7.1.xml $ROOT/os/mandriva.com/mandriva-2007.1.xml $ROOT/os/mandriva.com/mandrake-7.0.xml $ROOT/os/mandriva.com/mandriva-2010.2.xml $ROOT/os/mandriva.com/mandrake-5.2.xml $ROOT/os/mandriva.com/mandrake-8.2.xml $ROOT/os/mandriva.com/mandrake-9.2.xml $ROOT/os/mandriva.com/mandriva-2009.1.xml $ROOT/os/mandriva.com/mandriva-2011.xml $ROOT/os/mandriva.com/mbs-1.0.xml $ROOT/os/mandriva.com/mandrake-9.1.xml $ROOT/os/mandriva.com/mandriva-2010.0.xml $ROOT/os/mandriva.com/mandrake-8.1.xml $ROOT/os/mandriva.com/mandriva-2008.1.xml $ROOT/os/mandriva.com/mandrake-5.3.xml $ROOT/os/mandriva.com/mandriva-2009.0.xml $ROOT/os/mandriva.com/mandrake-6.1.xml $ROOT/os/freebsd.org $ROOT/os/freebsd.org/freebsd-8.3.xml $ROOT/os/freebsd.org/freebsd-6.0.xml $ROOT/os/freebsd.org/freebsd-2.0.5.xml $ROOT/os/freebsd.org/freebsd-3.2.xml $ROOT/os/freebsd.org/freebsd-5.1.xml $ROOT/os/freebsd.org/freebsd-4.4.xml $ROOT/os/freebsd.org/freebsd-1.0.xml $ROOT/os/freebsd.org/freebsd-5.3.xml $ROOT/os/freebsd.org/freebsd-7.3.xml $ROOT/os/freebsd.org/freebsd-4.9.xml $ROOT/os/freebsd.org/freebsd-9.0.xml $ROOT/os/freebsd.org/freebsd-9.2.xml $ROOT/os/freebsd.org/freebsd-3.0.xml $ROOT/os/freebsd.org/freebsd-6.3.xml $ROOT/os/freebsd.org/freebsd-4.7.xml $ROOT/os/freebsd.org/freebsd-8.1.xml $ROOT/os/freebsd.org/freebsd-8.4.xml $ROOT/os/freebsd.org/freebsd-5.4.xml $ROOT/os/freebsd.org/freebsd-6.4.xml $ROOT/os/freebsd.org/freebsd-4.2.xml $ROOT/os/freebsd.org/freebsd-9.1.xml $ROOT/os/freebsd.org/freebsd-4.6.xml $ROOT/os/freebsd.org/freebsd-4.0.xml $ROOT/os/freebsd.org/freebsd-10.0.xml $ROOT/os/freebsd.org/freebsd-10.1.xml $ROOT/os/freebsd.org/freebsd-5.2.xml $ROOT/os/freebsd.org/freebsd-5.5.xml $ROOT/os/freebsd.org/freebsd-6.1.xml $ROOT/os/freebsd.org/freebsd-2.0.xml $ROOT/os/freebsd.org/freebsd-8.0.xml $ROOT/os/freebsd.org/freebsd-4.1.xml $ROOT/os/freebsd.org/freebsd-7.0.xml $ROOT/os/freebsd.org/freebsd-4.10.xml $ROOT/os/freebsd.org/freebsd-9.3.xml $ROOT/os/freebsd.org/freebsd-4.11.xml $ROOT/os/freebsd.org/freebsd-7.4.xml $ROOT/os/freebsd.org/freebsd-7.2.xml $ROOT/os/freebsd.org/freebsd-4.8.xml $ROOT/os/freebsd.org/freebsd-7.1.xml $ROOT/os/freebsd.org/freebsd-4.3.xml $ROOT/os/freebsd.org/freebsd-8.2.xml $ROOT/os/freebsd.org/freebsd-4.5.xml $ROOT/os/freebsd.org/freebsd-6.2.xml $ROOT/os/freebsd.org/freebsd-2.2.9.xml $ROOT/os/freebsd.org/freebsd-2.2.8.xml $ROOT/os/freebsd.org/freebsd-5.0.xml $ROOT/os/freebsd.org/freebsd-5.2.1.xml $ROOT/os/microsoft.com $ROOT/os/microsoft.com/win-2k.xml $ROOT/os/microsoft.com/win-xp.xml $ROOT/os/microsoft.com/win-95.xml $ROOT/os/microsoft.com/win-3.1.xml $ROOT/os/microsoft.com/winnt-3.5.xml $ROOT/os/microsoft.com/win-vista.xml $ROOT/os/microsoft.com/win-8.1.xml $ROOT/os/microsoft.com/winnt-4.0.xml $ROOT/os/microsoft.com/win-2k3r2.xml $ROOT/os/microsoft.com/win-7.xml $ROOT/os/microsoft.com/winnt-3.51.xml $ROOT/os/microsoft.com/win-2k8.xml $ROOT/os/microsoft.com/win-me.xml $ROOT/os/microsoft.com/win-2.1.xml $ROOT/os/microsoft.com/win-10.xml $ROOT/os/microsoft.com/win-2k3.xml $ROOT/os/microsoft.com/win-2.0.xml $ROOT/os/microsoft.com/msdos-6.22.xml $ROOT/os/microsoft.com/win-2k12r2.xml $ROOT/os/microsoft.com/win-2k8r2.xml $ROOT/os/microsoft.com/win-2k12.xml $ROOT/os/microsoft.com/win-8.xml $ROOT/os/microsoft.com/winnt-3.1.xml $ROOT/os/microsoft.com/win-98.xml $ROOT/os/microsoft.com/win-1.0.xml $ROOT/os/netbsd.org $ROOT/os/netbsd.org/netbsd-0.8.xml $ROOT/os/netbsd.org/netbsd-4.0.xml $ROOT/os/netbsd.org/netbsd-5.1.xml $ROOT/os/netbsd.org/netbsd-1.1.xml $ROOT/os/netbsd.org/netbsd-5.0.xml $ROOT/os/netbsd.org/netbsd-3.0.xml $ROOT/os/netbsd.org/netbsd-2.0.xml $ROOT/os/netbsd.org/netbsd-1.3.xml $ROOT/os/netbsd.org/netbsd-1.6.xml $ROOT/os/netbsd.org/netbsd-1.4.xml $ROOT/os/netbsd.org/netbsd-1.5.xml $ROOT/os/netbsd.org/netbsd-1.2.xml $ROOT/os/netbsd.org/netbsd-0.9.xml $ROOT/os/netbsd.org/netbsd-1.0.xml $ROOT/device $ROOT/device/pcisig.com $ROOT/device/pcisig.com/pci-1022-2000.xml $ROOT/device/pcisig.com/pci-1013-00b8.xml $ROOT/device/pcisig.com/pci-8086-100e.xml $ROOT/device/pcisig.com/pci-1af4-1001.xml $ROOT/device/pcisig.com/pci-10ec-8139.xml $ROOT/device/pcisig.com/pci-1000-0012.xml $ROOT/device/pcisig.com/pci-1af4-1002.xml $ROOT/device/pcisig.com/pci-8086-2415.xml $ROOT/device/pcisig.com/pci-1af4-1003.xml $ROOT/device/pcisig.com/pci-15ad-0710.xml $ROOT/device/pcisig.com/pci-8086-25ab.xml $ROOT/device/pcisig.com/pci-1af4-1000.xml $ROOT/device/pcisig.com/pci-8086-2668.xml $ROOT/device/pcisig.com/pci-1274-5000.xml $ROOT/device/pcisig.com/pci-1b36-0100.xml $ROOT/device/pcisig.com/pci-1234-1111.xml $ROOT/device/pcisig.com/pci-10ec-8029.xml $ROOT/device/pcisig.com/pci-1af4-1009.xml $ROOT/device/ibm.com $ROOT/device/ibm.com/ps2-keyboard.xml $ROOT/device/ibm.com/ps2-mouse.xml $ROOT/device/usb.org $ROOT/device/usb.org/usb-80ee-0021.xml $ROOT/device/xen.org $ROOT/device/xen.org/xen-vscsi.xml $ROOT/device/xen.org/xen-vfb.xml $ROOT/device/xen.org/xen-vbd.xml $ROOT/device/xen.org/xen-console.xml $ROOT/device/xen.org/xen-pci.xml $ROOT/device/xen.org/xen-vtpm.xml $ROOT/device/xen.org/xen-vkbd.xml $ROOT/device/xen.org/xen-vif.xml $ROOT/device/ibasetechnologies.net $ROOT/device/ibasetechnologies.net/isa-ib700.xml You can see we have a fixed 3 level hiearchy, top level is the entity type, second level is the domain name of a corresponding vendor, and third level is the entity name. When this series is merged I'll be posting patches to change the loader to follow the systemd-like directory override semantics I described in a previous thread. Daniel P. Berrange (52): docs: describe entity URI ID scheme docs: add document describing database organization data: remove most information about PCI devices data: change PCI and USB device ID URIs data: remove duplication in Xen hypervisor devices data: sanitize Xen device ID URIs and add missing devs data: fix RHEL Xen platform versions & adjust IDs data: change QEMU/KVM ID URIs to include product string data: change GNOME URIs to include 'gnome' prefix data: fix typos in altlinux, debian and rhl datasets data: change URIs for netware OS data: fix URI scheme use for ib700 device data: change PS2 device URIs to refer to ibm.com data: change domain name for x11 keyboard map data: standard install script URI format data: rename 'hypervisors' to 'platforms' data: split altlinux into one file per OS data: split centos into one file per OS data: split debian into one file per OS data: split dos into one file per OS data: split fedora into one file per OS data: split freebsd into one file per OS data: split gnome into one file per OS data: split macos into one file per OS data: split mageia into one file per OS data: split mandrake into one file per OS data: split mandriva into one file per OS data: split netbsd into one file per OS data: split netware into one file per OS data: split openbsd into one file per OS data: split opensuse into one file per OS data: split rhel into one file per OS data: split rhl into one file per OS data: split solaris into one file per OS data: split suse into one file per OS data: split ubuntu into one file per OS data: split windows into one file per OS data: split kvm into one file per platform data: split qemu into one file per platform data: split rhel-xen into one file per platform data: split xen into one file per platform data: split windows-lang into one file per datamap data: split x11-keyboard into one file per datamap data: split debian into one file per install script data: split fedora into one file per install script data: split rhel into one file per install script data: split ubuntu into one file per install script data: split windows-* into one file per install script data: split devices into one file per device data: remove pluralization from data directories Update ignore files for new database layout tests: switch to use XML from builddir only .gitignore | 11 +- configure.ac | 45 +- data/Makefile.am | 2 +- data/Makefile.inc | 11 + data/datamap/Makefile.am | 5 + data/datamap/microsoft.com/Makefile.am | 1 + .../microsoft.com/win-7-l10n-language.xml.in | 40 + .../win-8-l10n-language-reverse.xml.in | 41 + .../microsoft.com/win-8-l10n-language.xml.in | 41 + data/datamap/x.org/Makefile.am | 1 + .../x.org/x11-keyboard.xml.in} | 9 +- data/datamaps/Makefile.am | 8 - data/datamaps/windows-lang.xml | 131 - data/device/Makefile.am | 8 + data/device/ibasetechnologies.net/Makefile.am | 1 + data/device/ibasetechnologies.net/isa-ib700.xml.in | 8 + data/device/ibm.com/Makefile.am | 1 + data/device/ibm.com/ps2-keyboard.xml.in | 9 + data/device/ibm.com/ps2-mouse.xml.in | 9 + data/device/pcisig.com/Makefile.am | 1 + data/device/pcisig.com/pci-1000-0012.xml.in | 6 + data/device/pcisig.com/pci-1013-00b8.xml.in | 6 + data/device/pcisig.com/pci-1022-2000.xml.in | 6 + data/device/pcisig.com/pci-10ec-8029.xml.in | 6 + data/device/pcisig.com/pci-10ec-8139.xml.in | 6 + data/device/pcisig.com/pci-1234-1111.xml.in | 11 + data/device/pcisig.com/pci-1274-5000.xml.in | 6 + data/device/pcisig.com/pci-15ad-0710.xml.in | 6 + data/device/pcisig.com/pci-1af4-1000.xml.in | 6 + data/device/pcisig.com/pci-1af4-1001.xml.in | 6 + data/device/pcisig.com/pci-1af4-1002.xml.in | 6 + data/device/pcisig.com/pci-1af4-1003.xml.in | 6 + data/device/pcisig.com/pci-1af4-1009.xml.in | 6 + data/device/pcisig.com/pci-1b36-0100.xml.in | 6 + data/device/pcisig.com/pci-8086-100e.xml.in | 6 + data/device/pcisig.com/pci-8086-2415.xml.in | 6 + data/device/pcisig.com/pci-8086-25ab.xml.in | 6 + data/device/pcisig.com/pci-8086-2668.xml.in | 6 + data/device/usb.org/Makefile.am | 1 + data/device/usb.org/usb-80ee-0021.xml.in | 6 + data/device/xen.org/Makefile.am | 1 + data/device/xen.org/xen-console.xml.in | 9 + data/device/xen.org/xen-pci.xml.in | 9 + data/device/xen.org/xen-vbd.xml.in | 9 + data/device/xen.org/xen-vfb.xml.in | 9 + data/device/xen.org/xen-vif.xml.in | 9 + data/device/xen.org/xen-vkbd.xml.in | 9 + data/device/xen.org/xen-vscsi.xml.in | 9 + data/device/xen.org/xen-vtpm.xml.in | 8 + data/devices/Makefile.am | 15 - data/devices/qemu-pci.xml.in | 152 - data/devices/qemu-ps2.xml.in | 20 - data/devices/qemu-usb.xml.in | 14 - data/devices/virtio-pci.xml.in | 54 - data/devices/xen.xml.in | 28 - data/hypervisors/Makefile.am | 9 - data/hypervisors/kvm.xml.in | 63 - data/hypervisors/qemu.xml.in | 363 -- data/hypervisors/rhel-xen.xml.in | 131 - data/hypervisors/xen.xml.in | 287 -- data/install-script/Makefile.am | 8 + data/install-script/debian.org/Makefile.am | 1 + .../debian.org/debian-preseed-desktop.xml.in} | 132 +- .../debian.org/debian-preseed-jeos.xml.in | 127 + data/install-script/fedoraproject.org/Makefile.am | 1 + .../fedora-kickstart-desktop.xml.in} | 162 +- .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 156 + data/install-script/microsoft.com/Makefile.am | 1 + .../microsoft.com/windows-cmd-desktop.xml.in} | 1 - .../microsoft.com/windows-reg-desktop.xml.in} | 1 - .../microsoft.com/windows-sif-desktop.xml.in} | 73 - .../microsoft.com/windows-sif-jeos.xml.in | 71 + .../microsoft.com/windows-unattend-desktop.xml.in} | 224 - .../microsoft.com/windows-unattend-jeos.xml.in | 224 + data/install-script/redhat.com/Makefile.am | 1 + .../redhat.com/rhel-kickstart-desktop.xml.in} | 109 +- .../redhat.com/rhel-kickstart-jeos.xml.in | 105 + data/install-script/ubuntu.com/Makefile.am | 1 + .../ubuntu.com/ubuntu-preseed-jeos.xml.in} | 6 +- data/install-scripts/Makefile.am | 14 - data/os/Makefile.am | 22 + data/os/altlinux.org/Makefile.am | 1 + data/os/altlinux.org/altlinux-1.0.xml.in | 12 + data/os/altlinux.org/altlinux-2.0.xml.in | 13 + data/os/altlinux.org/altlinux-2.2.xml.in | 13 + data/os/altlinux.org/altlinux-2.4.xml.in | 25 + data/os/altlinux.org/altlinux-3.0.xml.in | 25 + data/os/altlinux.org/altlinux-4.0.xml.in | 33 + data/os/altlinux.org/altlinux-4.1.xml.in | 32 + data/os/altlinux.org/altlinux-5.0.xml.in | 49 + data/os/altlinux.org/altlinux-6.0.xml.in | 37 + data/os/altlinux.org/altlinux-7.0.xml.in | 33 + data/os/apple.com/Makefile.am | 1 + data/os/apple.com/macosx-10.0.xml.in | 10 + data/os/apple.com/macosx-10.1.xml.in | 11 + data/os/apple.com/macosx-10.2.xml.in | 11 + data/os/apple.com/macosx-10.3.xml.in | 11 + data/os/apple.com/macosx-10.4.xml.in | 11 + data/os/apple.com/macosx-10.5.xml.in | 11 + data/os/apple.com/macosx-10.6.xml.in | 21 + data/os/apple.com/macosx-10.7.xml.in | 21 + data/os/centos.org/Makefile.am | 1 + data/os/centos.org/centos-6.0.xml.in | 48 + data/os/centos.org/centos-6.1.xml.in | 47 + data/os/centos.org/centos-6.2.xml.in | 47 + data/os/centos.org/centos-6.3.xml.in | 55 + data/os/centos.org/centos-6.4.xml.in | 47 + data/os/centos.org/centos-6.5.xml.in | 47 + data/os/centos.org/centos-7.0.xml.in | 41 + data/os/debian.org/Makefile.am | 1 + data/os/debian.org/debian-1.1.xml.in | 11 + data/os/debian.org/debian-1.2.xml.in | 13 + data/os/debian.org/debian-1.3.xml.in | 13 + data/os/debian.org/debian-2.0.xml.in | 13 + data/os/debian.org/debian-2.1.xml.in | 13 + data/os/debian.org/debian-2.2.xml.in | 13 + data/os/debian.org/debian-3.1.xml.in | 13 + data/os/debian.org/debian-3.xml.in | 13 + data/os/debian.org/debian-4.xml.in | 13 + data/os/debian.org/debian-5.xml.in | 32 + data/os/debian.org/debian-6.xml.in | 71 + data/os/debian.org/debian-7.xml.in | 53 + data/os/debian.org/debian-8.xml.in | 53 + data/os/fedoraproject.org/Makefile.am | 1 + data/os/fedoraproject.org/fedora-1.xml.in | 91 + data/os/fedoraproject.org/fedora-10.xml.in | 353 ++ data/os/fedoraproject.org/fedora-11.xml.in | 353 ++ data/os/fedoraproject.org/fedora-12.xml.in | 313 ++ data/os/fedoraproject.org/fedora-13.xml.in | 229 ++ data/os/fedoraproject.org/fedora-14.xml.in | 243 ++ data/os/fedoraproject.org/fedora-15.xml.in | 120 + data/os/fedoraproject.org/fedora-16.xml.in | 120 + data/os/fedoraproject.org/fedora-17.xml.in | 118 + data/os/fedoraproject.org/fedora-18.xml.in | 118 + data/os/fedoraproject.org/fedora-19.xml.in | 151 + data/os/fedoraproject.org/fedora-2.xml.in | 139 + data/os/fedoraproject.org/fedora-20.xml.in | 141 + data/os/fedoraproject.org/fedora-21.xml.in | 193 + data/os/fedoraproject.org/fedora-22.xml.in | 167 + data/os/fedoraproject.org/fedora-3.xml.in | 139 + data/os/fedoraproject.org/fedora-4.xml.in | 213 + data/os/fedoraproject.org/fedora-5.xml.in | 223 + data/os/fedoraproject.org/fedora-6.xml.in | 243 ++ data/os/fedoraproject.org/fedora-7.xml.in | 116 + data/os/fedoraproject.org/fedora-8.xml.in | 128 + data/os/fedoraproject.org/fedora-9.xml.in | 367 ++ data/os/fedoraproject.org/fedora-unknown.xml.in | 55 + data/os/freebsd.org/Makefile.am | 1 + data/os/freebsd.org/freebsd-1.0.xml.in | 13 + data/os/freebsd.org/freebsd-10.0.xml.in | 20 + data/os/freebsd.org/freebsd-10.1.xml.in | 27 + data/os/freebsd.org/freebsd-2.0.5.xml.in | 14 + data/os/freebsd.org/freebsd-2.0.xml.in | 16 + data/os/freebsd.org/freebsd-2.2.8.xml.in | 13 + data/os/freebsd.org/freebsd-2.2.9.xml.in | 13 + data/os/freebsd.org/freebsd-3.0.xml.in | 16 + data/os/freebsd.org/freebsd-3.2.xml.in | 13 + data/os/freebsd.org/freebsd-4.0.xml.in | 16 + data/os/freebsd.org/freebsd-4.1.xml.in | 14 + data/os/freebsd.org/freebsd-4.10.xml.in | 14 + data/os/freebsd.org/freebsd-4.11.xml.in | 17 + data/os/freebsd.org/freebsd-4.2.xml.in | 14 + data/os/freebsd.org/freebsd-4.3.xml.in | 14 + data/os/freebsd.org/freebsd-4.4.xml.in | 14 + data/os/freebsd.org/freebsd-4.5.xml.in | 14 + data/os/freebsd.org/freebsd-4.6.xml.in | 14 + data/os/freebsd.org/freebsd-4.7.xml.in | 14 + data/os/freebsd.org/freebsd-4.8.xml.in | 14 + data/os/freebsd.org/freebsd-4.9.xml.in | 14 + data/os/freebsd.org/freebsd-5.0.xml.in | 16 + data/os/freebsd.org/freebsd-5.1.xml.in | 14 + data/os/freebsd.org/freebsd-5.2.1.xml.in | 14 + data/os/freebsd.org/freebsd-5.2.xml.in | 14 + data/os/freebsd.org/freebsd-5.3.xml.in | 14 + data/os/freebsd.org/freebsd-5.4.xml.in | 14 + data/os/freebsd.org/freebsd-5.5.xml.in | 16 + data/os/freebsd.org/freebsd-6.0.xml.in | 18 + data/os/freebsd.org/freebsd-6.1.xml.in | 12 + data/os/freebsd.org/freebsd-6.2.xml.in | 12 + data/os/freebsd.org/freebsd-6.3.xml.in | 12 + data/os/freebsd.org/freebsd-6.4.xml.in | 14 + data/os/freebsd.org/freebsd-7.0.xml.in | 12 + data/os/freebsd.org/freebsd-7.1.xml.in | 12 + data/os/freebsd.org/freebsd-7.2.xml.in | 12 + data/os/freebsd.org/freebsd-7.3.xml.in | 12 + data/os/freebsd.org/freebsd-7.4.xml.in | 12 + data/os/freebsd.org/freebsd-8.0.xml.in | 18 + data/os/freebsd.org/freebsd-8.1.xml.in | 12 + data/os/freebsd.org/freebsd-8.2.xml.in | 12 + data/os/freebsd.org/freebsd-8.3.xml.in | 15 + data/os/freebsd.org/freebsd-8.4.xml.in | 15 + data/os/freebsd.org/freebsd-9.0.xml.in | 14 + data/os/freebsd.org/freebsd-9.1.xml.in | 15 + data/os/freebsd.org/freebsd-9.2.xml.in | 15 + data/os/freebsd.org/freebsd-9.3.xml.in | 15 + data/os/gnome.org/Makefile.am | 1 + data/os/gnome.org/gnome-3.6.xml.in | 32 + data/os/gnome.org/gnome-3.8.xml.in | 32 + data/os/gnome.org/gnome-continuous-3.10.xml.in | 28 + data/os/gnome.org/gnome-continuous-3.12.xml.in | 20 + data/os/gnome.org/gnome-continuous-3.14.xml.in | 20 + data/os/mageia.org/Makefile.am | 1 + data/os/mageia.org/mageia-1.xml.in | 58 + data/os/mageia.org/mageia-2.xml.in | 32 + data/os/mageia.org/mageia-3.xml.in | 43 + data/os/mandriva.com/Makefile.am | 1 + data/os/mandriva.com/mandrake-10.0.xml.in | 13 + data/os/mandriva.com/mandrake-10.1.xml.in | 13 + data/os/mandriva.com/mandrake-10.2.xml.in | 13 + data/os/mandriva.com/mandrake-5.1.xml.in | 11 + data/os/mandriva.com/mandrake-5.2.xml.in | 14 + data/os/mandriva.com/mandrake-5.3.xml.in | 14 + data/os/mandriva.com/mandrake-6.0.xml.in | 14 + data/os/mandriva.com/mandrake-6.1.xml.in | 14 + data/os/mandriva.com/mandrake-7.0.xml.in | 14 + data/os/mandriva.com/mandrake-7.1.xml.in | 14 + data/os/mandriva.com/mandrake-7.2.xml.in | 14 + data/os/mandriva.com/mandrake-8.0.xml.in | 14 + data/os/mandriva.com/mandrake-8.1.xml.in | 14 + data/os/mandriva.com/mandrake-8.2.xml.in | 14 + data/os/mandriva.com/mandrake-9.0.xml.in | 14 + data/os/mandriva.com/mandrake-9.1.xml.in | 14 + data/os/mandriva.com/mandrake-9.2.xml.in | 14 + data/os/mandriva.com/mandriva-2006.0.xml.in | 13 + data/os/mandriva.com/mandriva-2007.1.xml.in | 13 + data/os/mandriva.com/mandriva-2007.xml.in | 13 + data/os/mandriva.com/mandriva-2008.0.xml.in | 13 + data/os/mandriva.com/mandriva-2008.1.xml.in | 13 + data/os/mandriva.com/mandriva-2009.0.xml.in | 13 + data/os/mandriva.com/mandriva-2009.1.xml.in | 13 + data/os/mandriva.com/mandriva-2010.0.xml.in | 17 + data/os/mandriva.com/mandriva-2010.1.xml.in | 13 + data/os/mandriva.com/mandriva-2010.2.xml.in | 13 + data/os/mandriva.com/mandriva-2011.xml.in | 14 + data/os/mandriva.com/mbs-1.0.xml.in | 11 + data/os/mandriva.com/mes-5.0.xml.in | 11 + data/os/mandriva.com/mes-5.1.xml.in | 17 + data/os/microsoft.com/Makefile.am | 1 + .../microsoft.com/msdos-6.22.xml.in} | 0 data/os/microsoft.com/win-1.0.xml.in | 13 + data/os/microsoft.com/win-10.xml.in | 63 + data/os/microsoft.com/win-2.0.xml.in | 15 + data/os/microsoft.com/win-2.1.xml.in | 15 + data/os/microsoft.com/win-2k.xml.in | 49 + data/os/microsoft.com/win-2k12.xml.in | 68 + data/os/microsoft.com/win-2k12r2.xml.in | 67 + data/os/microsoft.com/win-2k3.xml.in | 72 + data/os/microsoft.com/win-2k3r2.xml.in | 65 + data/os/microsoft.com/win-2k8.xml.in | 65 + data/os/microsoft.com/win-2k8r2.xml.in | 50 + data/os/microsoft.com/win-3.1.xml.in | 15 + data/os/microsoft.com/win-7.xml.in | 231 ++ data/os/microsoft.com/win-8.1.xml.in | 149 + data/os/microsoft.com/win-8.xml.in | 59 + data/os/microsoft.com/win-95.xml.in | 30 + data/os/microsoft.com/win-98.xml.in | 28 + data/os/microsoft.com/win-me.xml.in | 28 + data/os/microsoft.com/win-vista.xml.in | 49 + data/os/microsoft.com/win-xp.xml.in | 113 + data/os/microsoft.com/winnt-3.1.xml.in | 12 + data/os/microsoft.com/winnt-3.5.xml.in | 15 + data/os/microsoft.com/winnt-3.51.xml.in | 15 + data/os/microsoft.com/winnt-4.0.xml.in | 15 + data/os/netbsd.org/Makefile.am | 1 + data/os/netbsd.org/netbsd-0.8.xml.in | 12 + data/os/netbsd.org/netbsd-0.9.xml.in | 14 + data/os/netbsd.org/netbsd-1.0.xml.in | 14 + data/os/netbsd.org/netbsd-1.1.xml.in | 14 + data/os/netbsd.org/netbsd-1.2.xml.in | 14 + data/os/netbsd.org/netbsd-1.3.xml.in | 14 + data/os/netbsd.org/netbsd-1.4.xml.in | 14 + data/os/netbsd.org/netbsd-1.5.xml.in | 14 + data/os/netbsd.org/netbsd-1.6.xml.in | 14 + data/os/netbsd.org/netbsd-2.0.xml.in | 14 + data/os/netbsd.org/netbsd-3.0.xml.in | 14 + data/os/netbsd.org/netbsd-4.0.xml.in | 14 + data/os/netbsd.org/netbsd-5.0.xml.in | 14 + data/os/netbsd.org/netbsd-5.1.xml.in | 14 + data/os/novell.com/Makefile.am | 1 + data/os/novell.com/netware-4.xml.in | 10 + data/os/novell.com/netware-5.xml.in | 10 + data/os/novell.com/netware-6.xml.in | 10 + data/os/openbsd.org/Makefile.am | 1 + data/os/openbsd.org/openbsd-4.2.xml.in | 28 + data/os/openbsd.org/openbsd-4.3.xml.in | 30 + data/os/openbsd.org/openbsd-4.4.xml.in | 30 + data/os/openbsd.org/openbsd-4.5.xml.in | 30 + data/os/openbsd.org/openbsd-4.8.xml.in | 30 + data/os/openbsd.org/openbsd-4.9.xml.in | 34 + data/os/openbsd.org/openbsd-5.0.xml.in | 31 + data/os/openbsd.org/openbsd-5.1.xml.in | 32 + data/os/openbsd.org/openbsd-5.2.xml.in | 32 + data/os/openbsd.org/openbsd-5.3.xml.in | 32 + data/os/openbsd.org/openbsd-5.4.xml.in | 37 + data/os/openbsd.org/openbsd-5.5.xml.in | 32 + data/os/openbsd.org/openbsd-5.6.xml.in | 32 + data/os/opensuse.org/Makefile.am | 1 + data/os/opensuse.org/opensuse-10.2.xml.in | 10 + data/os/opensuse.org/opensuse-10.3.xml.in | 12 + data/os/opensuse.org/opensuse-11.0.xml.in | 12 + data/os/opensuse.org/opensuse-11.1.xml.in | 12 + data/os/opensuse.org/opensuse-11.2.xml.in | 12 + data/os/opensuse.org/opensuse-11.3.xml.in | 67 + data/os/opensuse.org/opensuse-11.4.xml.in | 67 + data/os/opensuse.org/opensuse-12.1.xml.in | 68 + data/os/opensuse.org/opensuse-12.2.xml.in | 68 + data/os/opensuse.org/opensuse-12.3.xml.in | 48 + data/os/opensuse.org/opensuse-13.1.xml.in | 71 + data/os/opensuse.org/opensuse-13.2.xml.in | 35 + data/os/opensuse.org/opensuse-factory.xml.in | 47 + data/os/opensuse.org/opensuse-unknown.xml.in | 47 + data/os/oracle.com/Makefile.am | 1 + data/os/oracle.com/solaris-11.xml.in | 11 + data/os/redhat.com/Makefile.am | 1 + data/os/redhat.com/rhel-2.1.1.xml.in | 16 + data/os/redhat.com/rhel-2.1.2.xml.in | 16 + data/os/redhat.com/rhel-2.1.3.xml.in | 16 + data/os/redhat.com/rhel-2.1.4.xml.in | 16 + data/os/redhat.com/rhel-2.1.5.xml.in | 16 + data/os/redhat.com/rhel-2.1.6.xml.in | 16 + data/os/redhat.com/rhel-2.1.7.xml.in | 16 + data/os/redhat.com/rhel-2.1.xml.in | 14 + data/os/redhat.com/rhel-3.1.xml.in | 16 + data/os/redhat.com/rhel-3.2.xml.in | 16 + data/os/redhat.com/rhel-3.3.xml.in | 16 + data/os/redhat.com/rhel-3.4.xml.in | 16 + data/os/redhat.com/rhel-3.5.xml.in | 16 + data/os/redhat.com/rhel-3.6.xml.in | 16 + data/os/redhat.com/rhel-3.7.xml.in | 16 + data/os/redhat.com/rhel-3.8.xml.in | 16 + data/os/redhat.com/rhel-3.9.xml.in | 16 + data/os/redhat.com/rhel-3.xml.in | 14 + data/os/redhat.com/rhel-4.0.xml.in | 14 + data/os/redhat.com/rhel-4.1.xml.in | 16 + data/os/redhat.com/rhel-4.2.xml.in | 16 + data/os/redhat.com/rhel-4.3.xml.in | 16 + data/os/redhat.com/rhel-4.4.xml.in | 16 + data/os/redhat.com/rhel-4.5.xml.in | 16 + data/os/redhat.com/rhel-4.6.xml.in | 16 + data/os/redhat.com/rhel-4.7.xml.in | 16 + data/os/redhat.com/rhel-4.8.xml.in | 29 + data/os/redhat.com/rhel-4.9.xml.in | 29 + data/os/redhat.com/rhel-5.0.xml.in | 14 + data/os/redhat.com/rhel-5.1.xml.in | 16 + data/os/redhat.com/rhel-5.10.xml.in | 29 + data/os/redhat.com/rhel-5.11.xml.in | 29 + data/os/redhat.com/rhel-5.2.xml.in | 16 + data/os/redhat.com/rhel-5.3.xml.in | 16 + data/os/redhat.com/rhel-5.4.xml.in | 29 + data/os/redhat.com/rhel-5.5.xml.in | 29 + data/os/redhat.com/rhel-5.6.xml.in | 34 + data/os/redhat.com/rhel-5.7.xml.in | 29 + data/os/redhat.com/rhel-5.8.xml.in | 29 + data/os/redhat.com/rhel-5.9.xml.in | 29 + data/os/redhat.com/rhel-6.0.xml.in | 55 + data/os/redhat.com/rhel-6.1.xml.in | 51 + data/os/redhat.com/rhel-6.2.xml.in | 51 + data/os/redhat.com/rhel-6.3.xml.in | 51 + data/os/redhat.com/rhel-6.4.xml.in | 51 + data/os/redhat.com/rhel-6.5.xml.in | 51 + data/os/redhat.com/rhel-6.6.xml.in | 51 + data/os/redhat.com/rhel-7.0.xml.in | 80 + data/os/redhat.com/rhel-7.1.xml.in | 73 + data/os/redhat.com/rhel-atomic-7.0.xml.in | 43 + data/os/redhat.com/rhel-atomic-7.1.xml.in | 49 + data/os/redhat.com/rhl-1.0.xml.in | 13 + data/os/redhat.com/rhl-1.1.xml.in | 15 + data/os/redhat.com/rhl-2.0.xml.in | 14 + data/os/redhat.com/rhl-2.1.xml.in | 14 + data/os/redhat.com/rhl-3.0.3.xml.in | 15 + data/os/redhat.com/rhl-4.0.xml.in | 15 + data/os/redhat.com/rhl-4.1.xml.in | 15 + data/os/redhat.com/rhl-4.2.xml.in | 15 + data/os/redhat.com/rhl-5.0.xml.in | 15 + data/os/redhat.com/rhl-5.1.xml.in | 15 + data/os/redhat.com/rhl-5.2.xml.in | 15 + data/os/redhat.com/rhl-6.0.xml.in | 15 + data/os/redhat.com/rhl-6.1.xml.in | 15 + data/os/redhat.com/rhl-6.2.xml.in | 15 + data/os/redhat.com/rhl-7.1.xml.in | 16 + data/os/redhat.com/rhl-7.2.xml.in | 16 + data/os/redhat.com/rhl-7.3.xml.in | 16 + data/os/redhat.com/rhl-7.xml.in | 15 + data/os/redhat.com/rhl-8.0.xml.in | 16 + data/os/redhat.com/rhl-9.xml.in | 16 + data/os/sun.com/Makefile.am | 1 + data/os/sun.com/opensolaris-2009.06.xml.in | 14 + data/os/sun.com/solaris-10.xml.in | 15 + data/os/sun.com/solaris-9.xml.in | 10 + data/os/suse.com/Makefile.am | 1 + data/os/suse.com/sled-10.xml.in | 22 + data/os/suse.com/sled-11.1.xml.in | 28 + data/os/suse.com/sled-11.2.xml.in | 28 + data/os/suse.com/sled-11.3.xml.in | 28 + data/os/suse.com/sled-11.4.xml.in | 28 + data/os/suse.com/sled-11.xml.in | 22 + data/os/suse.com/sled-12.xml.in | 32 + data/os/suse.com/sled-9.xml.in | 10 + data/os/suse.com/sles-10.xml.in | 11 + data/os/suse.com/sles-11.1.xml.in | 30 + data/os/suse.com/sles-11.2.xml.in | 30 + data/os/suse.com/sles-11.3.xml.in | 30 + data/os/suse.com/sles-11.4.xml.in | 28 + data/os/suse.com/sles-11.xml.in | 16 + data/os/suse.com/sles-12.xml.in | 23 + data/os/suse.com/sles-9.xml.in | 10 + data/os/ubuntu.com/Makefile.am | 1 + data/os/ubuntu.com/ubuntu-10.04.xml.in | 49 + data/os/ubuntu.com/ubuntu-10.10.xml.in | 69 + data/os/ubuntu.com/ubuntu-11.04.xml.in | 69 + data/os/ubuntu.com/ubuntu-11.10.xml.in | 65 + data/os/ubuntu.com/ubuntu-12.04.xml.in | 67 + data/os/ubuntu.com/ubuntu-12.10.xml.in | 67 + data/os/ubuntu.com/ubuntu-13.04.xml.in | 67 + data/os/ubuntu.com/ubuntu-13.10.xml.in | 67 + data/os/ubuntu.com/ubuntu-14.04.xml.in | 68 + data/os/ubuntu.com/ubuntu-14.10.xml.in | 68 + data/os/ubuntu.com/ubuntu-15.04.xml.in | 68 + data/os/ubuntu.com/ubuntu-15.10.xml.in | 68 + data/os/ubuntu.com/ubuntu-4.10.xml.in | 44 + data/os/ubuntu.com/ubuntu-5.04.xml.in | 74 + data/os/ubuntu.com/ubuntu-5.10.xml.in | 102 + data/os/ubuntu.com/ubuntu-6.06.xml.in | 148 + data/os/ubuntu.com/ubuntu-6.10.xml.in | 82 + data/os/ubuntu.com/ubuntu-7.04.xml.in | 64 + data/os/ubuntu.com/ubuntu-7.10.xml.in | 64 + data/os/ubuntu.com/ubuntu-8.04.xml.in | 78 + data/os/ubuntu.com/ubuntu-8.10.xml.in | 55 + data/os/ubuntu.com/ubuntu-9.04.xml.in | 59 + data/os/ubuntu.com/ubuntu-9.10.xml.in | 55 + data/oses/Makefile.am | 31 - data/oses/altlinux.xml.in | 266 -- data/oses/centos.xml.in | 328 -- data/oses/debian.xml.in | 315 -- data/oses/fedora.xml.in | 4320 -------------------- data/oses/freebsd.xml.in | 635 --- data/oses/gnome.xml.in | 130 - data/oses/macos.xml.in | 102 - data/oses/mageia.xml.in | 133 - data/oses/mandrake.xml.in | 218 - data/oses/mandriva.xml.in | 176 - data/oses/netbsd.xml.in | 183 - data/oses/netware.xml.in | 29 - data/oses/openbsd.xml.in | 401 -- data/oses/opensuse.xml.in | 574 --- data/oses/rhel.xml.in | 1344 ------ data/oses/rhl.xml.in | 285 -- data/oses/solaris.xml.in | 49 - data/oses/suse.xml.in | 363 -- data/oses/ubuntu.xml.in | 1596 -------- data/oses/windows.xml.in | 1357 ------ data/platform/Makefile.am | 7 + data/platform/linux-kvm.org/Makefile.am | 1 + data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in | 11 + data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in | 10 + data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in | 11 + data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in | 11 + data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in | 11 + data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in | 11 + data/platform/qemu.org/Makefile.am | 1 + data/platform/qemu.org/qemu-1.0.1.xml.in | 10 + data/platform/qemu.org/qemu-1.0.xml.in | 55 + data/platform/qemu.org/qemu-1.1.1-1.xml.in | 10 + data/platform/qemu.org/qemu-1.1.1.xml.in | 10 + data/platform/qemu.org/qemu-1.1.2.xml.in | 10 + data/platform/qemu.org/qemu-1.1.xml.in | 10 + data/platform/qemu.org/qemu-1.2.0.xml.in | 10 + data/platform/qemu.org/qemu-1.2.1.xml.in | 10 + data/platform/qemu.org/qemu-1.2.2.xml.in | 10 + data/platform/qemu.org/qemu-1.3.0.xml.in | 10 + data/platform/qemu.org/qemu-1.3.1.xml.in | 10 + data/platform/qemu.org/qemu-1.4.0.xml.in | 10 + data/platform/qemu.org/qemu-1.4.1.xml.in | 10 + data/platform/qemu.org/qemu-1.4.2.xml.in | 10 + data/platform/qemu.org/qemu-1.5.0.xml.in | 10 + data/platform/qemu.org/qemu-1.5.1.xml.in | 10 + data/platform/qemu.org/qemu-1.5.2.xml.in | 10 + data/platform/qemu.org/qemu-1.5.3.xml.in | 10 + data/platform/qemu.org/qemu-1.6.0.xml.in | 10 + data/platform/qemu.org/qemu-1.6.1.xml.in | 10 + data/platform/qemu.org/qemu-1.6.2.xml.in | 10 + data/platform/qemu.org/qemu-1.7.0.xml.in | 10 + data/platform/qemu.org/qemu-1.7.1.xml.in | 10 + data/platform/qemu.org/qemu-1.7.2.xml.in | 10 + data/platform/qemu.org/qemu-2.0.0.xml.in | 10 + data/platform/qemu.org/qemu-2.0.1.xml.in | 10 + data/platform/qemu.org/qemu-2.0.2.xml.in | 10 + data/platform/qemu.org/qemu-2.1.0.xml.in | 10 + data/platform/qemu.org/qemu-2.1.1.xml.in | 10 + data/platform/qemu.org/qemu-2.1.2.xml.in | 10 + data/platform/qemu.org/qemu-2.1.3.xml.in | 10 + data/platform/qemu.org/qemu-2.2.0.xml.in | 10 + data/platform/qemu.org/qemu-2.2.1.xml.in | 10 + data/platform/qemu.org/qemu-2.3.0.xml.in | 10 + data/platform/redhat.com/Makefile.am | 1 + data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in | 14 + data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in | 11 + data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in | 11 + data/platform/xen.org/Makefile.am | 1 + data/platform/xen.org/xen-3.0.2.xml.in | 14 + data/platform/xen.org/xen-3.0.3.xml.in | 10 + data/platform/xen.org/xen-3.0.4.xml.in | 13 + data/platform/xen.org/xen-3.1.3.xml.in | 9 + data/platform/xen.org/xen-3.1.4.xml.in | 9 + data/platform/xen.org/xen-3.2.0.xml.in | 9 + data/platform/xen.org/xen-3.2.1.xml.in | 9 + data/platform/xen.org/xen-3.2.2.xml.in | 9 + data/platform/xen.org/xen-3.2.3.xml.in | 9 + data/platform/xen.org/xen-3.3.0.xml.in | 9 + data/platform/xen.org/xen-3.3.1.xml.in | 9 + data/platform/xen.org/xen-3.3.2.xml.in | 9 + data/platform/xen.org/xen-3.4.0.xml.in | 9 + data/platform/xen.org/xen-3.4.1.xml.in | 9 + data/platform/xen.org/xen-3.4.2.xml.in | 9 + data/platform/xen.org/xen-3.4.3.xml.in | 9 + data/platform/xen.org/xen-4.0.0.xml.in | 9 + data/platform/xen.org/xen-4.0.1.xml.in | 9 + data/platform/xen.org/xen-4.1.0.xml.in | 9 + data/schemas/libosinfo.rng | 35 +- docs/database-layout.txt | 225 + docs/entity-id-scheme.txt | 117 + libosinfo.spec.in | 2 +- mingw-libosinfo.spec.in | 4 +- osinfo/osinfo_loader.c | 8 +- po/POTFILES.in | 429 +- ...-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt | 0 ....0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt | 0 ...nux-5.0.0-ark-server-i586-ru-install-cd.iso.txt | 0 ...x-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt | 0 ...nux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0 ...x-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0 ....0.2-school-junior-i586-ru-install-dvd5.iso.txt | 0 ...ux-5.0.2-school-lite-i586-ru-install-cd.iso.txt | 0 ....0.2-school-master-i586-ru-install-dvd5.iso.txt | 0 ....0.2-school-server-i586-ru-install-dvd5.iso.txt | 0 ....2-school-server-x86_64-ru-install-dvd5.iso.txt | 0 ....2-school-terminal-i586-ru-install-dvd5.iso.txt | 0 ...ux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt | 0 ...-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt | 0 ...nux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0 ...x-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0 ...linux-6.0.1-simply-i586-ru-install-dvd5.iso.txt | 0 ...nux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt | 0 test/test-isodetect.c | 6 +- test/test-xml-validate | 4 +- 550 files changed, 15623 insertions(+), 14904 deletions(-) create mode 100644 data/Makefile.inc create mode 100644 data/datamap/Makefile.am create mode 100644 data/datamap/microsoft.com/Makefile.am create mode 100644 data/datamap/microsoft.com/win-7-l10n-language.xml.in create mode 100644 data/datamap/microsoft.com/win-8-l10n-language-reverse.xml.in create mode 100644 data/datamap/microsoft.com/win-8-l10n-language.xml.in create mode 100644 data/datamap/x.org/Makefile.am rename data/{datamaps/x11-keyboard.xml => datamap/x.org/x11-keyboard.xml.in} (95%) delete mode 100644 data/datamaps/Makefile.am delete mode 100644 data/datamaps/windows-lang.xml create mode 100644 data/device/Makefile.am create mode 100644 data/device/ibasetechnologies.net/Makefile.am create mode 100644 data/device/ibasetechnologies.net/isa-ib700.xml.in create mode 100644 data/device/ibm.com/Makefile.am create mode 100644 data/device/ibm.com/ps2-keyboard.xml.in create mode 100644 data/device/ibm.com/ps2-mouse.xml.in create mode 100644 data/device/pcisig.com/Makefile.am create mode 100644 data/device/pcisig.com/pci-1000-0012.xml.in create mode 100644 data/device/pcisig.com/pci-1013-00b8.xml.in create mode 100644 data/device/pcisig.com/pci-1022-2000.xml.in create mode 100644 data/device/pcisig.com/pci-10ec-8029.xml.in create mode 100644 data/device/pcisig.com/pci-10ec-8139.xml.in create mode 100644 data/device/pcisig.com/pci-1234-1111.xml.in create mode 100644 data/device/pcisig.com/pci-1274-5000.xml.in create mode 100644 data/device/pcisig.com/pci-15ad-0710.xml.in create mode 100644 data/device/pcisig.com/pci-1af4-1000.xml.in create mode 100644 data/device/pcisig.com/pci-1af4-1001.xml.in create mode 100644 data/device/pcisig.com/pci-1af4-1002.xml.in create mode 100644 data/device/pcisig.com/pci-1af4-1003.xml.in create mode 100644 data/device/pcisig.com/pci-1af4-1009.xml.in create mode 100644 data/device/pcisig.com/pci-1b36-0100.xml.in create mode 100644 data/device/pcisig.com/pci-8086-100e.xml.in create mode 100644 data/device/pcisig.com/pci-8086-2415.xml.in create mode 100644 data/device/pcisig.com/pci-8086-25ab.xml.in create mode 100644 data/device/pcisig.com/pci-8086-2668.xml.in create mode 100644 data/device/usb.org/Makefile.am create mode 100644 data/device/usb.org/usb-80ee-0021.xml.in create mode 100644 data/device/xen.org/Makefile.am create mode 100644 data/device/xen.org/xen-console.xml.in create mode 100644 data/device/xen.org/xen-pci.xml.in create mode 100644 data/device/xen.org/xen-vbd.xml.in create mode 100644 data/device/xen.org/xen-vfb.xml.in create mode 100644 data/device/xen.org/xen-vif.xml.in create mode 100644 data/device/xen.org/xen-vkbd.xml.in create mode 100644 data/device/xen.org/xen-vscsi.xml.in create mode 100644 data/device/xen.org/xen-vtpm.xml.in delete mode 100644 data/devices/Makefile.am delete mode 100644 data/devices/qemu-pci.xml.in delete mode 100644 data/devices/qemu-ps2.xml.in delete mode 100644 data/devices/qemu-usb.xml.in delete mode 100644 data/devices/virtio-pci.xml.in delete mode 100644 data/devices/xen.xml.in delete mode 100644 data/hypervisors/Makefile.am delete mode 100644 data/hypervisors/kvm.xml.in delete mode 100644 data/hypervisors/qemu.xml.in delete mode 100644 data/hypervisors/rhel-xen.xml.in delete mode 100644 data/hypervisors/xen.xml.in create mode 100644 data/install-script/Makefile.am create mode 100644 data/install-script/debian.org/Makefile.am rename data/{install-scripts/debian.xml => install-script/debian.org/debian-preseed-desktop.xml.in} (58%) create mode 100644 data/install-script/debian.org/debian-preseed-jeos.xml.in create mode 100644 data/install-script/fedoraproject.org/Makefile.am rename data/{install-scripts/fedora.xml => install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in} (55%) create mode 100644 data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in create mode 100644 data/install-script/microsoft.com/Makefile.am rename data/{install-scripts/windows-cmd.xml => install-script/microsoft.com/windows-cmd-desktop.xml.in} (99%) rename data/{install-scripts/windows-reg.xml => install-script/microsoft.com/windows-reg-desktop.xml.in} (97%) rename data/{install-scripts/windows-sif.xml => install-script/microsoft.com/windows-sif-desktop.xml.in} (68%) create mode 100644 data/install-script/microsoft.com/windows-sif-jeos.xml.in rename data/{install-scripts/windows-unattend.xml => install-script/microsoft.com/windows-unattend-desktop.xml.in} (55%) create mode 100644 data/install-script/microsoft.com/windows-unattend-jeos.xml.in create mode 100644 data/install-script/redhat.com/Makefile.am rename data/{install-scripts/rhel.xml => install-script/redhat.com/rhel-kickstart-desktop.xml.in} (58%) create mode 100644 data/install-script/redhat.com/rhel-kickstart-jeos.xml.in create mode 100644 data/install-script/ubuntu.com/Makefile.am rename data/{install-scripts/ubuntu.xml => install-script/ubuntu.com/ubuntu-preseed-jeos.xml.in} (97%) delete mode 100644 data/install-scripts/Makefile.am create mode 100644 data/os/Makefile.am create mode 100644 data/os/altlinux.org/Makefile.am create mode 100644 data/os/altlinux.org/altlinux-1.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-2.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-2.2.xml.in create mode 100644 data/os/altlinux.org/altlinux-2.4.xml.in create mode 100644 data/os/altlinux.org/altlinux-3.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-4.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-4.1.xml.in create mode 100644 data/os/altlinux.org/altlinux-5.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-6.0.xml.in create mode 100644 data/os/altlinux.org/altlinux-7.0.xml.in create mode 100644 data/os/apple.com/Makefile.am create mode 100644 data/os/apple.com/macosx-10.0.xml.in create mode 100644 data/os/apple.com/macosx-10.1.xml.in create mode 100644 data/os/apple.com/macosx-10.2.xml.in create mode 100644 data/os/apple.com/macosx-10.3.xml.in create mode 100644 data/os/apple.com/macosx-10.4.xml.in create mode 100644 data/os/apple.com/macosx-10.5.xml.in create mode 100644 data/os/apple.com/macosx-10.6.xml.in create mode 100644 data/os/apple.com/macosx-10.7.xml.in create mode 100644 data/os/centos.org/Makefile.am create mode 100644 data/os/centos.org/centos-6.0.xml.in create mode 100644 data/os/centos.org/centos-6.1.xml.in create mode 100644 data/os/centos.org/centos-6.2.xml.in create mode 100644 data/os/centos.org/centos-6.3.xml.in create mode 100644 data/os/centos.org/centos-6.4.xml.in create mode 100644 data/os/centos.org/centos-6.5.xml.in create mode 100644 data/os/centos.org/centos-7.0.xml.in create mode 100644 data/os/debian.org/Makefile.am create mode 100644 data/os/debian.org/debian-1.1.xml.in create mode 100644 data/os/debian.org/debian-1.2.xml.in create mode 100644 data/os/debian.org/debian-1.3.xml.in create mode 100644 data/os/debian.org/debian-2.0.xml.in create mode 100644 data/os/debian.org/debian-2.1.xml.in create mode 100644 data/os/debian.org/debian-2.2.xml.in create mode 100644 data/os/debian.org/debian-3.1.xml.in create mode 100644 data/os/debian.org/debian-3.xml.in create mode 100644 data/os/debian.org/debian-4.xml.in create mode 100644 data/os/debian.org/debian-5.xml.in create mode 100644 data/os/debian.org/debian-6.xml.in create mode 100644 data/os/debian.org/debian-7.xml.in create mode 100644 data/os/debian.org/debian-8.xml.in create mode 100644 data/os/fedoraproject.org/Makefile.am create mode 100644 data/os/fedoraproject.org/fedora-1.xml.in create mode 100644 data/os/fedoraproject.org/fedora-10.xml.in create mode 100644 data/os/fedoraproject.org/fedora-11.xml.in create mode 100644 data/os/fedoraproject.org/fedora-12.xml.in create mode 100644 data/os/fedoraproject.org/fedora-13.xml.in create mode 100644 data/os/fedoraproject.org/fedora-14.xml.in create mode 100644 data/os/fedoraproject.org/fedora-15.xml.in create mode 100644 data/os/fedoraproject.org/fedora-16.xml.in create mode 100644 data/os/fedoraproject.org/fedora-17.xml.in create mode 100644 data/os/fedoraproject.org/fedora-18.xml.in create mode 100644 data/os/fedoraproject.org/fedora-19.xml.in create mode 100644 data/os/fedoraproject.org/fedora-2.xml.in create mode 100644 data/os/fedoraproject.org/fedora-20.xml.in create mode 100644 data/os/fedoraproject.org/fedora-21.xml.in create mode 100644 data/os/fedoraproject.org/fedora-22.xml.in create mode 100644 data/os/fedoraproject.org/fedora-3.xml.in create mode 100644 data/os/fedoraproject.org/fedora-4.xml.in create mode 100644 data/os/fedoraproject.org/fedora-5.xml.in create mode 100644 data/os/fedoraproject.org/fedora-6.xml.in create mode 100644 data/os/fedoraproject.org/fedora-7.xml.in create mode 100644 data/os/fedoraproject.org/fedora-8.xml.in create mode 100644 data/os/fedoraproject.org/fedora-9.xml.in create mode 100644 data/os/fedoraproject.org/fedora-unknown.xml.in create mode 100644 data/os/freebsd.org/Makefile.am create mode 100644 data/os/freebsd.org/freebsd-1.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-10.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-10.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-2.0.5.xml.in create mode 100644 data/os/freebsd.org/freebsd-2.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-2.2.8.xml.in create mode 100644 data/os/freebsd.org/freebsd-2.2.9.xml.in create mode 100644 data/os/freebsd.org/freebsd-3.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-3.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.10.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.11.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.3.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.4.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.5.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.6.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.7.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.8.xml.in create mode 100644 data/os/freebsd.org/freebsd-4.9.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.2.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.3.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.4.xml.in create mode 100644 data/os/freebsd.org/freebsd-5.5.xml.in create mode 100644 data/os/freebsd.org/freebsd-6.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-6.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-6.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-6.3.xml.in create mode 100644 data/os/freebsd.org/freebsd-6.4.xml.in create mode 100644 data/os/freebsd.org/freebsd-7.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-7.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-7.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-7.3.xml.in create mode 100644 data/os/freebsd.org/freebsd-7.4.xml.in create mode 100644 data/os/freebsd.org/freebsd-8.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-8.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-8.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-8.3.xml.in create mode 100644 data/os/freebsd.org/freebsd-8.4.xml.in create mode 100644 data/os/freebsd.org/freebsd-9.0.xml.in create mode 100644 data/os/freebsd.org/freebsd-9.1.xml.in create mode 100644 data/os/freebsd.org/freebsd-9.2.xml.in create mode 100644 data/os/freebsd.org/freebsd-9.3.xml.in create mode 100644 data/os/gnome.org/Makefile.am create mode 100644 data/os/gnome.org/gnome-3.6.xml.in create mode 100644 data/os/gnome.org/gnome-3.8.xml.in create mode 100644 data/os/gnome.org/gnome-continuous-3.10.xml.in create mode 100644 data/os/gnome.org/gnome-continuous-3.12.xml.in create mode 100644 data/os/gnome.org/gnome-continuous-3.14.xml.in create mode 100644 data/os/mageia.org/Makefile.am create mode 100644 data/os/mageia.org/mageia-1.xml.in create mode 100644 data/os/mageia.org/mageia-2.xml.in create mode 100644 data/os/mageia.org/mageia-3.xml.in create mode 100644 data/os/mandriva.com/Makefile.am create mode 100644 data/os/mandriva.com/mandrake-10.0.xml.in create mode 100644 data/os/mandriva.com/mandrake-10.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-10.2.xml.in create mode 100644 data/os/mandriva.com/mandrake-5.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-5.2.xml.in create mode 100644 data/os/mandriva.com/mandrake-5.3.xml.in create mode 100644 data/os/mandriva.com/mandrake-6.0.xml.in create mode 100644 data/os/mandriva.com/mandrake-6.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-7.0.xml.in create mode 100644 data/os/mandriva.com/mandrake-7.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-7.2.xml.in create mode 100644 data/os/mandriva.com/mandrake-8.0.xml.in create mode 100644 data/os/mandriva.com/mandrake-8.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-8.2.xml.in create mode 100644 data/os/mandriva.com/mandrake-9.0.xml.in create mode 100644 data/os/mandriva.com/mandrake-9.1.xml.in create mode 100644 data/os/mandriva.com/mandrake-9.2.xml.in create mode 100644 data/os/mandriva.com/mandriva-2006.0.xml.in create mode 100644 data/os/mandriva.com/mandriva-2007.1.xml.in create mode 100644 data/os/mandriva.com/mandriva-2007.xml.in create mode 100644 data/os/mandriva.com/mandriva-2008.0.xml.in create mode 100644 data/os/mandriva.com/mandriva-2008.1.xml.in create mode 100644 data/os/mandriva.com/mandriva-2009.0.xml.in create mode 100644 data/os/mandriva.com/mandriva-2009.1.xml.in create mode 100644 data/os/mandriva.com/mandriva-2010.0.xml.in create mode 100644 data/os/mandriva.com/mandriva-2010.1.xml.in create mode 100644 data/os/mandriva.com/mandriva-2010.2.xml.in create mode 100644 data/os/mandriva.com/mandriva-2011.xml.in create mode 100644 data/os/mandriva.com/mbs-1.0.xml.in create mode 100644 data/os/mandriva.com/mes-5.0.xml.in create mode 100644 data/os/mandriva.com/mes-5.1.xml.in create mode 100644 data/os/microsoft.com/Makefile.am rename data/{oses/dos.xml.in => os/microsoft.com/msdos-6.22.xml.in} (100%) create mode 100644 data/os/microsoft.com/win-1.0.xml.in create mode 100644 data/os/microsoft.com/win-10.xml.in create mode 100644 data/os/microsoft.com/win-2.0.xml.in create mode 100644 data/os/microsoft.com/win-2.1.xml.in create mode 100644 data/os/microsoft.com/win-2k.xml.in create mode 100644 data/os/microsoft.com/win-2k12.xml.in create mode 100644 data/os/microsoft.com/win-2k12r2.xml.in create mode 100644 data/os/microsoft.com/win-2k3.xml.in create mode 100644 data/os/microsoft.com/win-2k3r2.xml.in create mode 100644 data/os/microsoft.com/win-2k8.xml.in create mode 100644 data/os/microsoft.com/win-2k8r2.xml.in create mode 100644 data/os/microsoft.com/win-3.1.xml.in create mode 100644 data/os/microsoft.com/win-7.xml.in create mode 100644 data/os/microsoft.com/win-8.1.xml.in create mode 100644 data/os/microsoft.com/win-8.xml.in create mode 100644 data/os/microsoft.com/win-95.xml.in create mode 100644 data/os/microsoft.com/win-98.xml.in create mode 100644 data/os/microsoft.com/win-me.xml.in create mode 100644 data/os/microsoft.com/win-vista.xml.in create mode 100644 data/os/microsoft.com/win-xp.xml.in create mode 100644 data/os/microsoft.com/winnt-3.1.xml.in create mode 100644 data/os/microsoft.com/winnt-3.5.xml.in create mode 100644 data/os/microsoft.com/winnt-3.51.xml.in create mode 100644 data/os/microsoft.com/winnt-4.0.xml.in create mode 100644 data/os/netbsd.org/Makefile.am create mode 100644 data/os/netbsd.org/netbsd-0.8.xml.in create mode 100644 data/os/netbsd.org/netbsd-0.9.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.0.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.1.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.2.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.3.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.4.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.5.xml.in create mode 100644 data/os/netbsd.org/netbsd-1.6.xml.in create mode 100644 data/os/netbsd.org/netbsd-2.0.xml.in create mode 100644 data/os/netbsd.org/netbsd-3.0.xml.in create mode 100644 data/os/netbsd.org/netbsd-4.0.xml.in create mode 100644 data/os/netbsd.org/netbsd-5.0.xml.in create mode 100644 data/os/netbsd.org/netbsd-5.1.xml.in create mode 100644 data/os/novell.com/Makefile.am create mode 100644 data/os/novell.com/netware-4.xml.in create mode 100644 data/os/novell.com/netware-5.xml.in create mode 100644 data/os/novell.com/netware-6.xml.in create mode 100644 data/os/openbsd.org/Makefile.am create mode 100644 data/os/openbsd.org/openbsd-4.2.xml.in create mode 100644 data/os/openbsd.org/openbsd-4.3.xml.in create mode 100644 data/os/openbsd.org/openbsd-4.4.xml.in create mode 100644 data/os/openbsd.org/openbsd-4.5.xml.in create mode 100644 data/os/openbsd.org/openbsd-4.8.xml.in create mode 100644 data/os/openbsd.org/openbsd-4.9.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.0.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.1.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.2.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.3.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.4.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.5.xml.in create mode 100644 data/os/openbsd.org/openbsd-5.6.xml.in create mode 100644 data/os/opensuse.org/Makefile.am create mode 100644 data/os/opensuse.org/opensuse-10.2.xml.in create mode 100644 data/os/opensuse.org/opensuse-10.3.xml.in create mode 100644 data/os/opensuse.org/opensuse-11.0.xml.in create mode 100644 data/os/opensuse.org/opensuse-11.1.xml.in create mode 100644 data/os/opensuse.org/opensuse-11.2.xml.in create mode 100644 data/os/opensuse.org/opensuse-11.3.xml.in create mode 100644 data/os/opensuse.org/opensuse-11.4.xml.in create mode 100644 data/os/opensuse.org/opensuse-12.1.xml.in create mode 100644 data/os/opensuse.org/opensuse-12.2.xml.in create mode 100644 data/os/opensuse.org/opensuse-12.3.xml.in create mode 100644 data/os/opensuse.org/opensuse-13.1.xml.in create mode 100644 data/os/opensuse.org/opensuse-13.2.xml.in create mode 100644 data/os/opensuse.org/opensuse-factory.xml.in create mode 100644 data/os/opensuse.org/opensuse-unknown.xml.in create mode 100644 data/os/oracle.com/Makefile.am create mode 100644 data/os/oracle.com/solaris-11.xml.in create mode 100644 data/os/redhat.com/Makefile.am create mode 100644 data/os/redhat.com/rhel-2.1.1.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.2.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.3.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.4.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.5.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.6.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.7.xml.in create mode 100644 data/os/redhat.com/rhel-2.1.xml.in create mode 100644 data/os/redhat.com/rhel-3.1.xml.in create mode 100644 data/os/redhat.com/rhel-3.2.xml.in create mode 100644 data/os/redhat.com/rhel-3.3.xml.in create mode 100644 data/os/redhat.com/rhel-3.4.xml.in create mode 100644 data/os/redhat.com/rhel-3.5.xml.in create mode 100644 data/os/redhat.com/rhel-3.6.xml.in create mode 100644 data/os/redhat.com/rhel-3.7.xml.in create mode 100644 data/os/redhat.com/rhel-3.8.xml.in create mode 100644 data/os/redhat.com/rhel-3.9.xml.in create mode 100644 data/os/redhat.com/rhel-3.xml.in create mode 100644 data/os/redhat.com/rhel-4.0.xml.in create mode 100644 data/os/redhat.com/rhel-4.1.xml.in create mode 100644 data/os/redhat.com/rhel-4.2.xml.in create mode 100644 data/os/redhat.com/rhel-4.3.xml.in create mode 100644 data/os/redhat.com/rhel-4.4.xml.in create mode 100644 data/os/redhat.com/rhel-4.5.xml.in create mode 100644 data/os/redhat.com/rhel-4.6.xml.in create mode 100644 data/os/redhat.com/rhel-4.7.xml.in create mode 100644 data/os/redhat.com/rhel-4.8.xml.in create mode 100644 data/os/redhat.com/rhel-4.9.xml.in create mode 100644 data/os/redhat.com/rhel-5.0.xml.in create mode 100644 data/os/redhat.com/rhel-5.1.xml.in create mode 100644 data/os/redhat.com/rhel-5.10.xml.in create mode 100644 data/os/redhat.com/rhel-5.11.xml.in create mode 100644 data/os/redhat.com/rhel-5.2.xml.in create mode 100644 data/os/redhat.com/rhel-5.3.xml.in create mode 100644 data/os/redhat.com/rhel-5.4.xml.in create mode 100644 data/os/redhat.com/rhel-5.5.xml.in create mode 100644 data/os/redhat.com/rhel-5.6.xml.in create mode 100644 data/os/redhat.com/rhel-5.7.xml.in create mode 100644 data/os/redhat.com/rhel-5.8.xml.in create mode 100644 data/os/redhat.com/rhel-5.9.xml.in create mode 100644 data/os/redhat.com/rhel-6.0.xml.in create mode 100644 data/os/redhat.com/rhel-6.1.xml.in create mode 100644 data/os/redhat.com/rhel-6.2.xml.in create mode 100644 data/os/redhat.com/rhel-6.3.xml.in create mode 100644 data/os/redhat.com/rhel-6.4.xml.in create mode 100644 data/os/redhat.com/rhel-6.5.xml.in create mode 100644 data/os/redhat.com/rhel-6.6.xml.in create mode 100644 data/os/redhat.com/rhel-7.0.xml.in create mode 100644 data/os/redhat.com/rhel-7.1.xml.in create mode 100644 data/os/redhat.com/rhel-atomic-7.0.xml.in create mode 100644 data/os/redhat.com/rhel-atomic-7.1.xml.in create mode 100644 data/os/redhat.com/rhl-1.0.xml.in create mode 100644 data/os/redhat.com/rhl-1.1.xml.in create mode 100644 data/os/redhat.com/rhl-2.0.xml.in create mode 100644 data/os/redhat.com/rhl-2.1.xml.in create mode 100644 data/os/redhat.com/rhl-3.0.3.xml.in create mode 100644 data/os/redhat.com/rhl-4.0.xml.in create mode 100644 data/os/redhat.com/rhl-4.1.xml.in create mode 100644 data/os/redhat.com/rhl-4.2.xml.in create mode 100644 data/os/redhat.com/rhl-5.0.xml.in create mode 100644 data/os/redhat.com/rhl-5.1.xml.in create mode 100644 data/os/redhat.com/rhl-5.2.xml.in create mode 100644 data/os/redhat.com/rhl-6.0.xml.in create mode 100644 data/os/redhat.com/rhl-6.1.xml.in create mode 100644 data/os/redhat.com/rhl-6.2.xml.in create mode 100644 data/os/redhat.com/rhl-7.1.xml.in create mode 100644 data/os/redhat.com/rhl-7.2.xml.in create mode 100644 data/os/redhat.com/rhl-7.3.xml.in create mode 100644 data/os/redhat.com/rhl-7.xml.in create mode 100644 data/os/redhat.com/rhl-8.0.xml.in create mode 100644 data/os/redhat.com/rhl-9.xml.in create mode 100644 data/os/sun.com/Makefile.am create mode 100644 data/os/sun.com/opensolaris-2009.06.xml.in create mode 100644 data/os/sun.com/solaris-10.xml.in create mode 100644 data/os/sun.com/solaris-9.xml.in create mode 100644 data/os/suse.com/Makefile.am create mode 100644 data/os/suse.com/sled-10.xml.in create mode 100644 data/os/suse.com/sled-11.1.xml.in create mode 100644 data/os/suse.com/sled-11.2.xml.in create mode 100644 data/os/suse.com/sled-11.3.xml.in create mode 100644 data/os/suse.com/sled-11.4.xml.in create mode 100644 data/os/suse.com/sled-11.xml.in create mode 100644 data/os/suse.com/sled-12.xml.in create mode 100644 data/os/suse.com/sled-9.xml.in create mode 100644 data/os/suse.com/sles-10.xml.in create mode 100644 data/os/suse.com/sles-11.1.xml.in create mode 100644 data/os/suse.com/sles-11.2.xml.in create mode 100644 data/os/suse.com/sles-11.3.xml.in create mode 100644 data/os/suse.com/sles-11.4.xml.in create mode 100644 data/os/suse.com/sles-11.xml.in create mode 100644 data/os/suse.com/sles-12.xml.in create mode 100644 data/os/suse.com/sles-9.xml.in create mode 100644 data/os/ubuntu.com/Makefile.am create mode 100644 data/os/ubuntu.com/ubuntu-10.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-10.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-11.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-11.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-12.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-12.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-13.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-13.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-14.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-14.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-15.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-15.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-4.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-5.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-5.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-6.06.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-6.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-7.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-7.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-8.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-8.10.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-9.04.xml.in create mode 100644 data/os/ubuntu.com/ubuntu-9.10.xml.in delete mode 100644 data/oses/Makefile.am delete mode 100644 data/oses/altlinux.xml.in delete mode 100644 data/oses/centos.xml.in delete mode 100644 data/oses/debian.xml.in delete mode 100644 data/oses/fedora.xml.in delete mode 100644 data/oses/freebsd.xml.in delete mode 100644 data/oses/gnome.xml.in delete mode 100644 data/oses/macos.xml.in delete mode 100644 data/oses/mageia.xml.in delete mode 100644 data/oses/mandrake.xml.in delete mode 100644 data/oses/mandriva.xml.in delete mode 100644 data/oses/netbsd.xml.in delete mode 100644 data/oses/netware.xml.in delete mode 100644 data/oses/openbsd.xml.in delete mode 100644 data/oses/opensuse.xml.in delete mode 100644 data/oses/rhel.xml.in delete mode 100644 data/oses/rhl.xml.in delete mode 100644 data/oses/solaris.xml.in delete mode 100644 data/oses/suse.xml.in delete mode 100644 data/oses/ubuntu.xml.in delete mode 100644 data/oses/windows.xml.in create mode 100644 data/platform/Makefile.am create mode 100644 data/platform/linux-kvm.org/Makefile.am create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.1.1.xml.in create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.1.2.xml.in create mode 100644 data/platform/linux-kvm.org/qemu-kvm-1.2.0.xml.in create mode 100644 data/platform/qemu.org/Makefile.am create mode 100644 data/platform/qemu.org/qemu-1.0.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.1.1-1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.1.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.1.2.xml.in create mode 100644 data/platform/qemu.org/qemu-1.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.2.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.2.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.2.2.xml.in create mode 100644 data/platform/qemu.org/qemu-1.3.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.3.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.4.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.4.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.4.2.xml.in create mode 100644 data/platform/qemu.org/qemu-1.5.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.5.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.5.2.xml.in create mode 100644 data/platform/qemu.org/qemu-1.5.3.xml.in create mode 100644 data/platform/qemu.org/qemu-1.6.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.6.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.6.2.xml.in create mode 100644 data/platform/qemu.org/qemu-1.7.0.xml.in create mode 100644 data/platform/qemu.org/qemu-1.7.1.xml.in create mode 100644 data/platform/qemu.org/qemu-1.7.2.xml.in create mode 100644 data/platform/qemu.org/qemu-2.0.0.xml.in create mode 100644 data/platform/qemu.org/qemu-2.0.1.xml.in create mode 100644 data/platform/qemu.org/qemu-2.0.2.xml.in create mode 100644 data/platform/qemu.org/qemu-2.1.0.xml.in create mode 100644 data/platform/qemu.org/qemu-2.1.1.xml.in create mode 100644 data/platform/qemu.org/qemu-2.1.2.xml.in create mode 100644 data/platform/qemu.org/qemu-2.1.3.xml.in create mode 100644 data/platform/qemu.org/qemu-2.2.0.xml.in create mode 100644 data/platform/qemu.org/qemu-2.2.1.xml.in create mode 100644 data/platform/qemu.org/qemu-2.3.0.xml.in create mode 100644 data/platform/redhat.com/Makefile.am create mode 100644 data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in create mode 100644 data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in create mode 100644 data/platform/xen.org/Makefile.am create mode 100644 data/platform/xen.org/xen-3.0.2.xml.in create mode 100644 data/platform/xen.org/xen-3.0.3.xml.in create mode 100644 data/platform/xen.org/xen-3.0.4.xml.in create mode 100644 data/platform/xen.org/xen-3.1.3.xml.in create mode 100644 data/platform/xen.org/xen-3.1.4.xml.in create mode 100644 data/platform/xen.org/xen-3.2.0.xml.in create mode 100644 data/platform/xen.org/xen-3.2.1.xml.in create mode 100644 data/platform/xen.org/xen-3.2.2.xml.in create mode 100644 data/platform/xen.org/xen-3.2.3.xml.in create mode 100644 data/platform/xen.org/xen-3.3.0.xml.in create mode 100644 data/platform/xen.org/xen-3.3.1.xml.in create mode 100644 data/platform/xen.org/xen-3.3.2.xml.in create mode 100644 data/platform/xen.org/xen-3.4.0.xml.in create mode 100644 data/platform/xen.org/xen-3.4.1.xml.in create mode 100644 data/platform/xen.org/xen-3.4.2.xml.in create mode 100644 data/platform/xen.org/xen-3.4.3.xml.in create mode 100644 data/platform/xen.org/xen-4.0.0.xml.in create mode 100644 data/platform/xen.org/xen-4.0.1.xml.in create mode 100644 data/platform/xen.org/xen-4.1.0.xml.in create mode 100644 docs/database-layout.txt create mode 100644 docs/entity-id-scheme.txt rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt (100%) -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:05 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:05 +0100 Subject: [Libosinfo] [PATCH v2 01/52] docs: describe entity URI ID scheme In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-2-git-send-email-berrange@redhat.com> Add a doc describing the best practice guidelines around the format of URIs for various entities. Signed-off-by: Daniel P. Berrange --- docs/entity-id-scheme.txt | 117 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 docs/entity-id-scheme.txt diff --git a/docs/entity-id-scheme.txt b/docs/entity-id-scheme.txt new file mode 100644 index 0000000..3121810 --- /dev/null +++ b/docs/entity-id-scheme.txt @@ -0,0 +1,117 @@ + Osinfo Entity ID Scheme + ======================= + +This document describes how to create URIs for entities in the osinfo +database. + +The ID URIs are used to determine what filename the XML document +for the entity will have, so care should be taken to follow +existing naming practices as closely as possible. + +Operating systems +================= + +The ID URI scheme SHOULD follow one of these patterns + + http://vendor-domain/distro-name/version + http://vendor-domain/short/id + +The "vendor-domain" component should refer to the domain name associated +with the vendor who originally shipped the operating system. For example, +with Solaris 8, the "vendor-domain" would be "sun.com", even though the +Solaris product line is now owned by Oracle. + +For legacy operating systems which were shipped before the arrival of the +world wide web, some guidelines should be followed to come with with a +suitable domain name. If the company that shipped the operating system +had a domain name at any time after the product was shipped, that should +be used. If the company never had any kind of domain name, a plausible +domain name should be invented. + +In general the scheme based on the distro name and version is preferred, +but some operating systems (eg Windows) don't have sensible unique +version numbers. In such cases, the alternative scheme based on the +short-id is acceptable. + +The "distro-name" component should match the value of the +attribute in the entity. + +The "version" component should match the value of the attribute +in the entity. + +The "short/id" component should be based on the value of the first + attribute in the entity. + +Some examples + + http://redhat.com/rhel/5.3 (distro==rhel, version=5.3) + http://microsoft.com/win/2k12r2 (short-id==win2k12r2) + + +Platforms +========= + +The ID URI scheme SHOULD follow this pattern + + http://vendor-domain/product-name/version + +The "vendor-domain" component should refer to the domain name associated +with the vendor who originally shipped the platform. For example, with +VirtualBox, for early releases the "vendor-domain" would be "sun.com", +while for latter releases it would be "oracle.com". + +The "product-name" component should match the value of the +attribute in the entity. + +The "version" component should match the value of the attribute +in the entity. + +Some examples + + http://xen.org/xen/3.0.2 (product==xen, version=3.0.2) + http://qemu.org/qemu/1.0 (product=qemu, version=1.0) + + +Devices +======= + +The ID URI scheme SHOULD follow one of these patterns + + http://pcisig.com/pci/vendor-id/product-id + http://usb.org/usb/vendor-id/product-id + http://xen.org/xen/name + http://ibm.com/ps2/name + http://vendor-domain/isa/name + + +Datamaps +======== + +The ID URI scheme SHOULD follow this pattern + + http://vendor-domain/map-name + +The choice of the "map-name" data format is not defined. + + +Install scripts +=============== + +The ID URI scheme SHOULD follow one of these patterns + + http://vendor-domain/distro/scheme/profile + http://vendor-domain/distro/version/scheme/profile + +"disto" is the name of the operating system distro that uses +the install script. + +"version" is an optional version number of the distro. This +is rarely used, as it is usually possible to create an +install script that works across multiple versions by using +XSL conditionals. + +"scheme" is the install script software format, eg "kickstart" +for Anaconda, or "preseed" for the Debian installer. + +"profile" is the declared install script profile "jeos" or +"desktop". -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:06 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:06 +0100 Subject: [Libosinfo] [PATCH v2 02/52] docs: add document describing database organization In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-3-git-send-email-berrange@redhat.com> Add a document that sets out the desired end goal for the database organization that the following patches will move towards. Signed-off-by: Daniel P. Berrange --- docs/database-layout.txt | 225 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 docs/database-layout.txt diff --git a/docs/database-layout.txt b/docs/database-layout.txt new file mode 100644 index 0000000..cb9557b --- /dev/null +++ b/docs/database-layout.txt @@ -0,0 +1,225 @@ + The Libosinfo Database Layout + ============================= + +This document specifies the layout of the libosinfo database and +details the process by which data files must be loaded by any +compliant applications consuming the database. + + +Entities +======== + +The purpose of the database is to store information related to +a number of entity types that are relevant when provisioning +virtual machines. + + - OS - a guest operating system + - Platform - a host virtualization platform + - Device - a hardware device + - Install Script - script for automated installation of an OS + - Data map - a mapping betweeen two datasets + - Deployment - an association of an OS on a Platform + +Each of these entities has a variety of pieces of information +associated with it. There are also relationships between many +of the entities. + +The path component of the entity ID URI will be used to form +the filename of the XML document on disk. + + +Database locations +================== + +There are a number of standard directory locations which +together form the database. + + + - System location + + This is determined by the env variable + + $OSINFO_SYSTEM_DIR + + If not set, then defaults to /usr/share/osinfo + + This location is intended for use by operating system + distributors to install the initial data set via a + package management system like RPM or Deb + + + - Local location + + This is determined by the env variable + + $OSINFO_LOCAL_DIR + + If not set, then defaults to /etc/osinfo + + This location is intended for use by local system + administrators to install custom local data that + should be available to all users on a host + + + - User location + + This is determined by the env variable + + $OSINFO_USER_DIR + + If not set, then defaults to $XDG_CONFIG_HOME/osinfo + + If that is not set, then defaults to $HOME/.config/osinfo + + This location is intended for use by unprivileged users + wishing to install local data for use by their applications + +A compliant implementation MUST load data from all the standard +locations declared in this document. An implementation MAY wish +to load data from additional non-standard locations depending +on application requirements. + +When loading entities from these locations, if the same +entity is present in multiple locations, the entity found +in the later location MUST take priority over the entity +found in the earlier locations. The next section details how +entities are named. + + +File naming +=========== + +Within each of the database locations mentioned above, there are +a number of file naming requirements that must be followed. + +First level directory +--------------------- + +The first (top) level directory within the database location +MUST only contain the following entries + + - os + - platform + - install-script + - datamap + - device + - deployment + +Each of these entries MUST be a directory, any other type of +file MUST NOT be loaded and a warning SHOULD be reported. +An entry MAY be omitted if there are no files to be stored +within it. + +These directory entries correspond to the types of entity +that are stored in the osinfo database. + + +Second level directory +---------------------- + +The second level directories within the database location are +used to group entities based on domain names from the entity +ID URI. + +For exaxple, if an entity has a URI + + http://fedoraproject.org/fedora/22 + +Then there will be a second level directory named +"fedoraproject.org" + +All entries in the second level MUST be directories, any +other type of file MUST NOT be loaded an a warning SHOULD +be reported. + + +Third level directory +--------------------- + +Within the thread level directories there may be further files +or directories with the following naming + + - ENTITY-NAME.xml + - ENTITY-NAME.d + +The ENTITY-NAME string MUST only contain characters from the +following set + + - Letters: a-z, A-Z + - Numbers: 0-9 + - Punctuation: _ - . + +Any file or directory names not matching these rules MUST be +ignored when loading the database, and a warning SHOULD be +reported. + +If both ENTITY-NAME.xml and ENTITY-NAME.d are present for a +common value of ENTITY-NAME, then ENTITY-NAME.xml MUST be +loaded before the contents of ENTITY-NAME.d are loaded. + +The ENTITY-NAME value is formed from the path component +of the entity ID URI. Any characters in the path component +which are not in the permitted set MUST be replaced by a +'-' character. + +For example, an entity ID of http://fedoraproject.org/fedora/22 +will result in an ENTITY-NAME of "fedora-22", since '/' is to +be substituted with '-'. + + +ENTITY-NAME.xml +--------------- + +This entry should either be a regular file, or a symbolic link +to /dev/null. If another file type is found, the file MUST NOT +be loaded and a warning SHOULD be reported. + +If the file is zero-length or points to /dev/null, then this +represents a black-out override. This indicates that the +ENTITY-NAME.xml file from a lower priority directory MUST NOT +be loaded. + +If the file is non-zero-length then its contents MUST be a +single entity with a URI that matches the file path of the +XML file relative to the location root. + +For example, if the file path is + + /etc/osinfo/os/fedoraproject.org/fedora-22.xml + +the, the file MUST contain a operating system entity definition +for the operating system with id http://fedoraproject.org/fedora-22.xml. +If the entity type does not match the directory in which the +file was located, the file MUST NOT be loaded and a warning +SHOULD be reported + + +ENTITY-NAME.d +------------- + +This entry MUST be a directory, if another file type is found +this entry MUST NOT be loaded and a warning SHOULD be reported + +Within this second level directories there may be further files +with the following naming + + - FILE-NAME.xml + +The FILE-NAME string MUST only contain characters from the +following set + + - Letters: a-z, A-Z + - Numbers: 0-9 + - Punctuation: _ - . + +Any file or directory names not matching these rules MUST be +ignored when loading the database, and a warning SHOULD be +reported. + +The FILE-NAME.xml must be a regular file, any other type +of file MUST NOT be loaded and a warning SHOULD be reported + +The contents of each FILE-NAME.xml found are used to augment +information associated with the entity identified by +ENTITY-NAME.d + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:07 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:07 +0100 Subject: [Libosinfo] [PATCH v2 03/52] data: remove most information about PCI devices In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-4-git-send-email-berrange@redhat.com> We already load PCI/USB information from the pci.ids/usb.ids files, so should not duplicate it again in XML files. The only info we need to retain are the device classes. Signed-off-by: Daniel P. Berrange --- data/devices/qemu-pci.xml.in | 61 +----------------------------------------- data/devices/qemu-usb.xml.in | 5 ---- data/devices/virtio-pci.xml.in | 25 ----------------- data/schemas/libosinfo.rng | 24 +++++++++-------- 4 files changed, 14 insertions(+), 101 deletions(-) diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in index 0d0fbc9..e880434 100644 --- a/data/devices/qemu-pci.xml.in +++ b/data/devices/qemu-pci.xml.in @@ -5,12 +5,7 @@ lsi - pci block - <_vendor>LSI Logic / Symbios Logic - 1000 - 53c895a - 0012 @@ -27,73 +22,39 @@ cirrus - pci video - <_vendor>Cirrus Logic - 1013 - GD 5446 - 00b8 vmvga - pci video - <_vendor>VMWare - 15ad - VGA - 0710 qxl - pci video - <_vendor>Red Hat, Inc - 1b36 - QXL - 0100 ne2k_pci - pci net - <_vendor>Realtek Semiconductor Co., Ltd. - 10ec - RTL-8029(AS) - 8029 pcnet - pci net - <_vendor>Advanced Micro Devices [AMD] - 1022 - 79c970 [PCnet32 LANCE] - 2000 rtl8139 - pci net - <_vendor>Realtek Semiconductor Co., Ltd. - 10ec - RTL-8139/8139C/8139C+ - 8139 e1000 - pci - <_vendor>Intel Corporation - 8086 - 82540EM Gigabit Ethernet Controller - 100e + net @@ -101,32 +62,17 @@ es1370 - pci audio - <_vendor>Ensoniq - 1274 - ES1370 [AudioPCI] - 5000 ac97 - pci audio - <_vendor>Intel Corporation - 8086 - 82801AA AC'97 Audio Controller - 2415 ich6 - pci audio - <_vendor>Intel Corporation - 8086 - 82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller - 2668 @@ -134,12 +80,7 @@ 6300esb - pci watchdog - <_vendor>Intel Corporation - 8086 - 6300ESB Watchdog Timer - 25ab diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in index 213187f..9719661 100644 --- a/data/devices/qemu-usb.xml.in +++ b/data/devices/qemu-usb.xml.in @@ -3,12 +3,7 @@ tablet - usb input - <_vendor>VirtualBox - 80ee - Tablet - 0021 diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in index b5b3948..ccc32da 100644 --- a/data/devices/virtio-pci.xml.in +++ b/data/devices/virtio-pci.xml.in @@ -3,52 +3,27 @@ virtio-net - pci net - <_vendor>Red Hat, Inc - 1af4 - Virtio network device - 1000 virtio-block - pci block - <_vendor>Red Hat, Inc - 1af4 - Virtio block device - 1001 virtio-balloon - pci memory.balloon - <_vendor>Red Hat, Inc - 1af4 - Virtio memory balloon - 1002 virtio-console - pci console - <_vendor>Red Hat, Inc - 1af4 - Virtio console - 1003 virtio-9p - pci filesystem - <_vendor>Red Hat, Inc - 1af4 - Virtio 9p - 1009 diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index b23d210..b36eef0 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -58,17 +58,19 @@ - - - isa - pci - usb - xen - ps2 - ide - virtio - - + + + + isa + pci + usb + xen + ps2 + ide + virtio + + + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:08 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:08 +0100 Subject: [Libosinfo] [PATCH v2 04/52] data: change PCI and USB device ID URIs In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-5-git-send-email-berrange@redhat.com> Currently PCI and USB device URIs look like http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668 http://www.linux-usb.org/usb.ids/80ee/0021 We want to associate filenames with URIs in a well-defined format. These existing URIs, particular the PCI one, are too long in the path component. It is also desirable to use the industry standards body as the domain name, rather than the domain of the specific project we happen to import data from right now. Thus the URIs are changed to http://pcisig.com/pci/1af4/1000 http://usb.org/usb/80ee/0021 --- data/devices/qemu-pci.xml.in | 26 +++++++-------- data/devices/qemu-usb.xml.in | 2 +- data/devices/virtio-pci.xml.in | 10 +++--- data/hypervisors/qemu.xml.in | 38 +++++++++++----------- data/oses/altlinux.xml.in | 6 ++-- data/oses/debian.xml.in | 10 +++--- data/oses/fedora.xml.in | 12 +++---- data/oses/freebsd.xml.in | 12 +++---- data/oses/gnome.xml.in | 10 +++--- data/oses/mandriva.xml.in | 8 ++--- data/oses/openbsd.xml.in | 6 ++-- data/oses/rhel.xml.in | 30 +++++++++--------- data/oses/solaris.xml.in | 4 +-- data/oses/suse.xml.in | 4 +-- data/oses/ubuntu.xml.in | 4 +-- data/oses/windows.xml.in | 72 +++++++++++++++++++++--------------------- osinfo/osinfo_loader.c | 8 ++--- 17 files changed, 131 insertions(+), 131 deletions(-) diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in index e880434..3e1ab5d 100644 --- a/data/devices/qemu-pci.xml.in +++ b/data/devices/qemu-pci.xml.in @@ -3,14 +3,14 @@ - + lsi block - + vga pci video @@ -20,39 +20,39 @@ 1111 - + cirrus video - + vmvga video - + qxl video - + ne2k_pci net - + pcnet net - + rtl8139 net - + e1000 net @@ -60,17 +60,17 @@ - + es1370 audio - + ac97 audio - + ich6 audio @@ -78,7 +78,7 @@ - + 6300esb watchdog diff --git a/data/devices/qemu-usb.xml.in b/data/devices/qemu-usb.xml.in index 9719661..7815ca8 100644 --- a/data/devices/qemu-usb.xml.in +++ b/data/devices/qemu-usb.xml.in @@ -1,7 +1,7 @@ - + tablet input diff --git a/data/devices/virtio-pci.xml.in b/data/devices/virtio-pci.xml.in index ccc32da..5ad58df 100644 --- a/data/devices/virtio-pci.xml.in +++ b/data/devices/virtio-pci.xml.in @@ -1,27 +1,27 @@ - + virtio-net net - + virtio-block block - + virtio-balloon memory.balloon - + virtio-console console - + virtio-9p filesystem diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 8fa2e0b..9523758 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -10,48 +10,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in index 9e6df02..704b338 100644 --- a/data/oses/altlinux.xml.in +++ b/data/oses/altlinux.xml.in @@ -160,8 +160,8 @@ 2009-10-29 - - + + @@ -208,7 +208,7 @@ 2011-10-26 - + diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 0e14568..57b3bd9 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -119,8 +119,8 @@ - - + + @@ -150,7 +150,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -272,7 +272,7 @@ - + diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in index cddb969..c10eb39 100644 --- a/data/oses/fedora.xml.in +++ b/data/oses/fedora.xml.in @@ -17,8 +17,8 @@ - - + + @@ -1299,10 +1299,10 @@ 2009-07-10 - + @@ -1665,7 +1665,7 @@ 2009-12-18 - + @@ -2017,7 +2017,7 @@ 2010-06-25 - + diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in index 59c84d8..6464060 100644 --- a/data/oses/freebsd.xml.in +++ b/data/oses/freebsd.xml.in @@ -360,7 +360,7 @@ 2005-11-04 - + @@ -478,7 +478,7 @@ 2009-11-25 - + @@ -601,8 +601,8 @@ 2015-01-31 - - + + @@ -620,8 +620,8 @@ 2016-12-31 - - + + diff --git a/data/oses/gnome.xml.in b/data/oses/gnome.xml.in index b9acf3c..c18ab4d 100644 --- a/data/oses/gnome.xml.in +++ b/data/oses/gnome.xml.in @@ -74,11 +74,11 @@ 2013-09-25 - - - - - + + + + + diff --git a/data/oses/mandriva.xml.in b/data/oses/mandriva.xml.in index 2816367..3184516 100644 --- a/data/oses/mandriva.xml.in +++ b/data/oses/mandriva.xml.in @@ -95,8 +95,8 @@ - - + + @@ -158,8 +158,8 @@ - - + + diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in index d1d2e50..1694739 100644 --- a/data/oses/openbsd.xml.in +++ b/data/oses/openbsd.xml.in @@ -154,7 +154,7 @@ - + @@ -331,8 +331,8 @@ - - + + diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in index 8bfbbcd..3aa53dd 100644 --- a/data/oses/rhel.xml.in +++ b/data/oses/rhel.xml.in @@ -584,8 +584,8 @@ 2020-03-31 - - + + @@ -757,9 +757,9 @@ 2023-11-30 - - - + + + @@ -1111,11 +1111,11 @@ - - - - - + + + + + @@ -1190,11 +1190,11 @@ - - - - - + + + + + diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in index 8c7c276..e7193df 100644 --- a/data/oses/solaris.xml.in +++ b/data/oses/solaris.xml.in @@ -19,7 +19,7 @@ - + @@ -42,7 +42,7 @@ opensolaris - + diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in index 1d913dc..fded429 100644 --- a/data/oses/suse.xml.in +++ b/data/oses/suse.xml.in @@ -29,8 +29,8 @@ - - + + diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in index 4624d2c..6857e01 100644 --- a/data/oses/ubuntu.xml.in +++ b/data/oses/ubuntu.xml.in @@ -587,7 +587,7 @@ 2013-05-09 - + @@ -718,7 +718,7 @@ 2010-10-23 - + diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index bbe1852..a038042 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -196,10 +196,10 @@ 2001-12-13 - - - - + + + + @@ -279,10 +279,10 @@ 2010-07-13 - - - - + + + + @@ -389,7 +389,7 @@ viostor.sys txtsetup.oem - + @@ -398,7 +398,7 @@ viostor.sys txtsetup.oem - + @@ -407,11 +407,11 @@ spice-guest-tools-0.65.cmd redhat09.cer redhat10.cer - - - - - + + + + + @@ -419,11 +419,11 @@ spice-guest-tools-0.65.cmd redhat09.cer redhat10.cer - - - - - + + + + + @@ -903,7 +903,7 @@ - + @@ -917,14 +917,14 @@ viostor.cat viostor.inf viostor.sys - + viostor.cat viostor.inf viostor.sys - + @@ -933,11 +933,11 @@ spice-guest-tools-0.65.cmd redhat09.cer redhat10.cer - - - - - + + + + + @@ -945,11 +945,11 @@ spice-guest-tools-0.65.cmd redhat09.cer redhat10.cer - - - - - + + + + + @@ -1002,7 +1002,7 @@ - + @@ -1155,7 +1155,7 @@ - + @@ -1350,7 +1350,7 @@ - + diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c index 4e8f942..a056495 100644 --- a/osinfo/osinfo_loader.c +++ b/osinfo/osinfo_loader.c @@ -1645,8 +1645,8 @@ osinfo_loader_process_file_reg_ids(OsinfoLoader *loader, WANT_REST(device); SAVE_BUF(device_buf); - gchar *id = g_strdup_printf("%s/%s/%s", - baseURI, vendor_id, device_id); + gchar *id = g_strdup_printf("%s/%s/%s/%s", + baseURI, busType, vendor_id, device_id); OsinfoDevice *dev = osinfo_loader_get_device(loader, id); OsinfoEntity *entity = OSINFO_ENTITY(dev); @@ -1696,7 +1696,7 @@ osinfo_loader_process_file_reg_usb(OsinfoLoader *loader, file, info, FALSE, - "http://www.linux-usb.org/usb.ids", + "http://usb.org", "usb", err); } @@ -1711,7 +1711,7 @@ osinfo_loader_process_file_reg_pci(OsinfoLoader *loader, file, info, TRUE, - "http://pciids.sourceforge.net/v2.2/pci.ids", + "http://pcisig.com", "pci", err); } -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:09 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:09 +0100 Subject: [Libosinfo] [PATCH v2 05/52] data: remove duplication in Xen hypervisor devices In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-6-git-send-email-berrange@redhat.com> Every Xen hypervisor platform has duplicated the list of supported devices. The RHEL Xen platforms also missed out the relationships. Remove all the device duplication and rely on inheritance instead. Signed-off-by: Daniel P. Berrange --- data/hypervisors/rhel-xen.xml.in | 59 +++---------------- data/hypervisors/xen.xml.in | 120 --------------------------------------- 2 files changed, 7 insertions(+), 172 deletions(-) diff --git a/data/hypervisors/rhel-xen.xml.in b/data/hypervisors/rhel-xen.xml.in index a67dc4e..5237482 100644 --- a/data/hypervisors/rhel-xen.xml.in +++ b/data/hypervisors/rhel-xen.xml.in @@ -9,9 +9,6 @@ - - - @@ -22,14 +19,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -38,14 +29,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -54,14 +39,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -70,14 +49,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -86,14 +59,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -102,14 +69,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - @@ -118,14 +79,8 @@ <_vendor>Red Hat, Inc. 3.1.0 + - - - - - - - diff --git a/data/hypervisors/xen.xml.in b/data/hypervisors/xen.xml.in index 98efefb..947610d 100644 --- a/data/hypervisors/xen.xml.in +++ b/data/hypervisors/xen.xml.in @@ -21,11 +21,6 @@ 3.0.3 - - - - - @@ -36,9 +31,6 @@ - - - @@ -49,13 +41,6 @@ <_vendor>Citrix Systems, Inc. 3.1.3 - - - - - - - @@ -64,13 +49,6 @@ <_vendor>Citrix Systems, Inc. 3.1.4 - - - - - - - @@ -79,13 +57,6 @@ <_vendor>Citrix Systems, Inc. 3.2.0 - - - - - - - @@ -94,13 +65,6 @@ <_vendor>Citrix Systems, Inc. 3.2.1 - - - - - - - @@ -109,13 +73,6 @@ <_vendor>Citrix Systems, Inc. 3.2.2 - - - - - - - @@ -124,13 +81,6 @@ <_vendor>Citrix Systems, Inc. 3.2.3 - - - - - - - @@ -139,13 +89,6 @@ <_vendor>Citrix Systems, Inc. 3.3.0 - - - - - - - @@ -154,13 +97,6 @@ <_vendor>Citrix Systems, Inc. 3.3.1 - - - - - - - @@ -169,13 +105,6 @@ <_vendor>Citrix Systems, Inc. 3.3.2 - - - - - - - @@ -184,13 +113,6 @@ <_vendor>Citrix Systems, Inc. 3.4.0 - - - - - - - @@ -199,13 +121,6 @@ <_vendor>Citrix Systems, Inc. 3.4.1 - - - - - - - @@ -214,13 +129,6 @@ <_vendor>Citrix Systems, Inc. 3.4.2 - - - - - - - @@ -229,13 +137,6 @@ <_vendor>Citrix Systems, Inc. 3.4.3 - - - - - - - @@ -244,13 +145,6 @@ <_vendor>Citrix Systems, Inc. 4.0.0 - - - - - - - @@ -259,13 +153,6 @@ <_vendor>Citrix Systems, Inc. 4.0.1 - - - - - - - @@ -274,13 +161,6 @@ <_vendor>Citrix Systems, Inc. 4.1.0 - - - - - - - -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:10 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:10 +0100 Subject: [Libosinfo] [PATCH v2 06/52] data: sanitize Xen device ID URIs and add missing devs In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-7-git-send-email-berrange@redhat.com> The Xen devices have a formal device ID value, which is used in Xen bus. We should record that in the field and add a corresponding string. Change the device ID URIs so that they are of the format http://xen.org/xen/$PRODUCT-ID Finally add various devices that were missing. Signed-off-by: Daniel P. Berrange --- data/devices/xen.xml.in | 61 +++++++++++++++++++++++++++++++++++++++------ data/hypervisors/xen.xml.in | 8 +++--- data/schemas/libosinfo.rng | 11 +++++++- 3 files changed, 68 insertions(+), 12 deletions(-) diff --git a/data/devices/xen.xml.in b/data/devices/xen.xml.in index 8065fec..451d71d 100644 --- a/data/devices/xen.xml.in +++ b/data/devices/xen.xml.in @@ -1,28 +1,75 @@ - + block xen - xen-block + Virtual Block Device + vbd + xen-vbd - + + block + xen + Virtual SCSI + vscsi + xen-vscsi + + + net xen - xen-net + Virtual Interface + vif + xen-vif - + console xen + Console + console xen-console - + video xen - xen-pvfb + Virtual FrameBuffer + vfb + xen-vfb + + + + xen + Virtual TPM + vtpm + xen-vtpm + + + + input + xen + Virtual Keyboard + vkbd + xen-vkbd + + + + input + xen + Virtual Keyboard + vkbd + xen-vkbd + + + + input + xen + Virtual PCI + pci + xen-pci diff --git a/data/hypervisors/xen.xml.in b/data/hypervisors/xen.xml.in index 947610d..86c49d4 100644 --- a/data/hypervisors/xen.xml.in +++ b/data/hypervisors/xen.xml.in @@ -8,9 +8,9 @@ 3.0.2 - - - + + + @@ -31,7 +31,7 @@ - + diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng index b36eef0..f957abc 100644 --- a/data/schemas/libosinfo.rng +++ b/data/schemas/libosinfo.rng @@ -108,7 +108,10 @@ - + + + + @@ -748,6 +751,12 @@ + + + [a-zA-Z]+ + + + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:11 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:11 +0100 Subject: [Libosinfo] [PATCH v2 07/52] data: fix RHEL Xen platform versions & adjust IDs In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-8-git-send-email-berrange@redhat.com> Currently the RHEL Xen platform is returning the same version number for multiple entities. Fix this by suffixing the Xen version with the RHEL version. Change the short-id and URI IDs so they are of the form 'xen-rhel-$VERSION' eg http://redhat.com/xen-rhel/3.1.0.5.6 xen-rhel-3.1.0.5.6 Signed-off-by: Daniel P. Berrange --- data/hypervisors/rhel-xen.xml.in | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/data/hypervisors/rhel-xen.xml.in b/data/hypervisors/rhel-xen.xml.in index 5237482..101573d 100644 --- a/data/hypervisors/rhel-xen.xml.in +++ b/data/hypervisors/rhel-xen.xml.in @@ -1,7 +1,7 @@ - - xen-3.0.3-rhel-5.0 + + xen-rhel-3.0.3.5.0 <_name>Xen 3.0.3 (RHEL 5.0) <_vendor>Red Hat, Inc. 3.0.3 @@ -13,73 +13,73 @@ - - xen-3.1.0-rhel-5.1 + + xen-rhel-3.1.0.5.1 <_name>Xen 3.1.0 (RHEL 5.1) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.1 - + - - xen-3.1.0-rhel-5.2 + + xen-rhel-3.1.0.5.2 <_name>Xen 3.1.0 (RHEL 5.2) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.2 - + - - xen-3.1.0-rhel-5.3 + + xen-rhel-3.1.0.5.3 <_name>Xen 3.1.0 (RHEL 5.3) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.3 - + - - xen-3.1.0-rhel-5.4 + + xen-rhel-3.1.0.5.4 <_name>Xen 3.1.0 (RHEL 5.4) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.4 - + - - xen-3.1.0-rhel-5.5 + + xen-rhel-3.1.0.5.5 <_name>Xen 3.1.0 (RHEL 5.5) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.5 - + - - xen-3.1.0-rhel-5.6 + + xen-rhel-3.1.0.5.6 <_name>Xen 3.1.0 (RHEL 5.6) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.6 - + - - xen-3.1.0-rhel-5.7 + + xen-rhel-3.1.0.5.7 <_name>Xen 3.1.0 (RHEL 5.7) <_vendor>Red Hat, Inc. - 3.1.0 + 3.1.0.5.7 - + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:12 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:12 +0100 Subject: [Libosinfo] [PATCH v2 08/52] data: change QEMU/KVM ID URIs to include product string In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-9-git-send-email-berrange@redhat.com> Include "qemu" and "qemu-kvm" as the first part of the path component of the URIs, since this will be used to form a filename later. Signed-off-by: Daniel P. Berrange --- data/hypervisors/kvm.xml.in | 34 +++++------ data/hypervisors/qemu.xml.in | 138 +++++++++++++++++++++---------------------- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/data/hypervisors/kvm.xml.in b/data/hypervisors/kvm.xml.in index 3833943..7507f61 100644 --- a/data/hypervisors/kvm.xml.in +++ b/data/hypervisors/kvm.xml.in @@ -1,63 +1,63 @@ - + qemu-kvm-1.0 <_name>QEMU-KVM 1.0 <_vendor>linux-kvm.org 1.0 2011-12-04 - + - + qemu-kvm-1.0.1 <_name>QEMU-KVM 1.0.1 <_vendor>linux-kvm.org 1.0.1 2012-04-17 - - + + - + qemu-kvm-1.1.0 <_name>QEMU-KVM 1.1.0 <_vendor>linux-kvm.org 1.1.0 2012-07-02 - - + + - + qemu-kvm-1.1.1 <_name>QEMU-KVM 1.1.1 <_vendor>linux-kvm.org 1.1.1 2012-08-27 - - + + - + qemu-kvm-1.1.2 <_name>QEMU-KVM 1.1.2 <_vendor>linux-kvm.org 1.1.2 2012-09-10 - - + + - + qemu-kvm-1.2.0 <_name>QEMU-KVM 1.2.0 <_vendor>linux-kvm.org 1.2.0 2012-09-10 - - + + diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 9523758..9e91888 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -1,7 +1,7 @@ - + qemu-1.0 <_name>QEMU 1.0 <_vendor>qemu.org @@ -55,309 +55,309 @@ - + qemu-1.0.1 <_name>QEMU 1.0.1 <_vendor>qemu.org 1.0.1 2012-02-17 - + - + qemu-1.1 <_name>QEMU 1.1 <_vendor>qemu.org 1.1 2012-06-01 - + - + qemu-1.1.1 <_name>QEMU 1.1.1 <_vendor>qemu.org 1.1.1 2012-07-12 - + - + qemu-1.1.1-1 <_name>QEMU 1.1.1-1 <_vendor>qemu.org 1.1.1-1 2012-07-17 - + - + qemu-1.1.2 <_name>QEMU 1.1.2 <_vendor>qemu.org 1.1.2 2012-09-05 - + - + qemu-1.2.0 <_name>QEMU 1.2.0 <_vendor>qemu.org 1.2.0 2012-09-05 - + - + qemu-1.2.1 <_name>QEMU 1.2.1 <_vendor>qemu.org 1.2.1 2012-11-20 - + - + qemu-1.2.2 <_name>QEMU 1.2.2 <_vendor>qemu.org 1.2.2 2012-12-11 - + - + qemu-1.3.0 <_name>QEMU 1.3.0 <_vendor>qemu.org 1.3.0 2012-12-03 - + - + qemu-1.3.1 <_name>QEMU 1.3.1 <_vendor>qemu.org 1.3.1 2013-01-28 - + - + qemu-1.4.0 <_name>QEMU 1.4.0 <_vendor>qemu.org 1.4.0 2013-02-15 - + - + qemu-1.4.1 <_name>QEMU 1.4.1 <_vendor>qemu.org 1.4.1 2013-04-15 - + - + qemu-1.4.2 <_name>QEMU 1.4.2 <_vendor>qemu.org 1.4.2 2013-05-24 - + - + qemu-1.5.0 <_name>QEMU 1.5.0 <_vendor>qemu.org 1.5.0 2013-05-20 - + - + qemu-1.5.1 <_name>QEMU 1.5.1 <_vendor>qemu.org 1.5.1 2013-06-26 - + - + qemu-1.5.2 <_name>QEMU 1.5.2 <_vendor>qemu.org 1.5.2 2013-07-25 - + - + qemu-1.5.3 <_name>QEMU 1.5.3 <_vendor>qemu.org 1.5.3 2013-08-27 - + - + qemu-1.6.0 <_name>QEMU 1.6.0 <_vendor>qemu.org 1.6.0 2013-08-15 - + - + qemu-1.6.0 <_name>QEMU 1.6.0 <_vendor>qemu.org 1.6.0 2013-08-15 - + - + qemu-1.6.1 <_name>QEMU 1.6.1 <_vendor>qemu.org 1.6.1 2013-10-09 - + - + qemu-1.6.2 <_name>QEMU 1.6.2 <_vendor>qemu.org 1.6.2 2013-12-16 - + - + qemu-1.7.0 <_name>QEMU 1.7.0 <_vendor>qemu.org 1.7.0 2013-11-28 - + - + qemu-1.7.1 <_name>QEMU 1.7.1 <_vendor>qemu.org 1.7.1 2014-03-03 - + - + qemu-1.7.2 <_name>QEMU 1.7.2 <_vendor>qemu.org 1.7.2 2014-07-21 - + - + qemu-2.0.0 <_name>QEMU 2.0.0 <_vendor>qemu.org 2.0.0 2014-04-17 - + - + qemu-2.0.1 <_name>QEMU 2.0.1 <_vendor>qemu.org 2.0.1 2014-08-15 - + - + qemu-2.0.2 <_name>QEMU 2.0.2 <_vendor>qemu.org 2.0.2 2014-08-18 - + - + qemu-2.1.0 <_name>QEMU 2.1.0 <_vendor>qemu.org 2.1.0 2014-08-01 - + - + qemu-2.1.1 <_name>QEMU 2.1.1 <_vendor>qemu.org 2.1.1 2014-09-10 - + - + qemu-2.1.2 <_name>QEMU 2.1.2 <_vendor>qemu.org 2.1.2 2014-09-25 - + - + qemu-2.1.3 <_name>QEMU 2.1.3 <_vendor>qemu.org 2.1.3 2015-01-22 - + - + qemu-2.2.0 <_name>QEMU 2.2.0 <_vendor>qemu.org 2.2.0 2014-12-09 - + - + qemu-2.2.1 <_name>QEMU 2.2.1 <_vendor>qemu.org 2.2.1 2015-03-10 - + - + qemu-2.3.0 <_name>QEMU 2.3.0 <_vendor>qemu.org 2.3.0 2015-04-24 - + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:13 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:13 +0100 Subject: [Libosinfo] [PATCH v2 09/52] data: change GNOME URIs to include 'gnome' prefix In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-10-git-send-email-berrange@redhat.com> Change GNOME URIs to include 'gnome' as the first part of the URI path, since this will be used to identify filenames later. Signed-off-by: Daniel P. Berrange --- data/oses/gnome.xml.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/oses/gnome.xml.in b/data/oses/gnome.xml.in index c18ab4d..ae68a28 100644 --- a/data/oses/gnome.xml.in +++ b/data/oses/gnome.xml.in @@ -1,6 +1,6 @@ - + gnome3.6 <_name>GNOME 3.6 3.6 @@ -31,7 +31,7 @@ - + gnome3.8 <_name>GNOME 3.8 3.8 @@ -39,7 +39,7 @@ linux gnome - + 2013-03-27 @@ -62,14 +62,14 @@ - + gnome-continuous-3.10 <_name>GNOME 3.10 3.10 <_vendor>GNOME Project linux gnome - + 2013-09-25 @@ -89,15 +89,15 @@ - + gnome-continuous-3.12 <_name>GNOME 3.12 3.12 <_vendor>GNOME Project linux gnome - - + + snapshot @@ -108,15 +108,15 @@ - + gnome-continuous-3.14 <_name>GNOME 3.14 3.14 <_vendor>GNOME Project linux gnome - - + + snapshot -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:14 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:14 +0100 Subject: [Libosinfo] [PATCH v2 10/52] data: fix typos in altlinux, debian and rhl datasets In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-11-git-send-email-berrange@redhat.com> The versions for altlinux 5/6/7 are inconsistent, sometimes using 1 digit, sometimes 2 digits and sometimes 3 digits. Change them all to use 2 digits as was practice for earlier versions. Also remove codenames from the product name. Debian buzz was 1.1, not 1.0 - there was never an official 1.0 release. The version of RHL 6.2 was wrong Signed-off-by: Daniel P. Berrange --- data/oses/altlinux.xml.in | 26 +++++++++++----------- data/oses/debian.xml.in | 4 ++-- data/oses/rhl.xml.in | 2 +- ...-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt | 0 ....0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt | 0 ...nux-5.0.0-ark-server-i586-ru-install-cd.iso.txt | 0 ...x-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt | 0 ...nux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0 ...x-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0 ....0.2-school-junior-i586-ru-install-dvd5.iso.txt | 0 ...ux-5.0.2-school-lite-i586-ru-install-cd.iso.txt | 0 ....0.2-school-master-i586-ru-install-dvd5.iso.txt | 0 ....0.2-school-server-i586-ru-install-dvd5.iso.txt | 0 ....2-school-server-x86_64-ru-install-dvd5.iso.txt | 0 ....2-school-terminal-i586-ru-install-dvd5.iso.txt | 0 ...ux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt | 0 ...-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt | 0 ...nux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0 ...x-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0 ...linux-6.0.1-simply-i586-ru-install-dvd5.iso.txt | 0 ...nux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt | 0 21 files changed, 16 insertions(+), 16 deletions(-) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt (100%) rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt (100%) diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in index 704b338..24d8f62 100644 --- a/data/oses/altlinux.xml.in +++ b/data/oses/altlinux.xml.in @@ -147,9 +147,9 @@ - - altlinux5 - <_name>ALT Linux 5.0.0 Ark + + altlinux5.0 + <_name>ALT Linux 5.0 5.0 <_vendor>ALTLinux linux @@ -195,16 +195,16 @@ - - altlinux6 - <_name>ALT Linux 6.0.0 Centaurus + + altlinux6.0 + <_name>ALT Linux 6.0 6.0 <_vendor>ALTLinux linux altlinux Centaurus - - + + 2011-10-26 @@ -231,16 +231,16 @@ - - altlinux7 - <_name>ALT Linux 7.0.0 Centaurus + + altlinux7.0 + <_name>ALT Linux 7.0 7.0 <_vendor>ALTLinux linux altlinux Centaurus - - + + 2012-10-01 diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 57b3bd9..51da273 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -1,7 +1,7 @@ - - debian1.0 + + debian1.1 debianbuzz <_name>Debian Buzz 1.1 diff --git a/data/oses/rhl.xml.in b/data/oses/rhl.xml.in index 2c134de..074c2a7 100644 --- a/data/oses/rhl.xml.in +++ b/data/oses/rhl.xml.in @@ -181,7 +181,7 @@ rhl6.2 <_name>Red Hat Linux 6.2 - 6.0 + 6.2 <_vendor>Red Hat, Inc linux rhl diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt similarity index 100% rename from test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:15 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:15 +0100 Subject: [Libosinfo] [PATCH v2 11/52] data: change URIs for netware OS In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-12-git-send-email-berrange@redhat.com> The common URI path format is distro/version, so make netware URIs comply. Signed-off-by: Daniel P. Berrange --- data/oses/netware.xml.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/oses/netware.xml.in b/data/oses/netware.xml.in index 7fd984c..35f0958 100644 --- a/data/oses/netware.xml.in +++ b/data/oses/netware.xml.in @@ -1,5 +1,5 @@ - + netware4 <_name>Novell Netware 4 <_vendor>Novell @@ -8,7 +8,7 @@ 4 - + netware5 <_name>Novell Netware 5 <_vendor>Novell @@ -17,7 +17,7 @@ 5 - + netware6 <_name>Novell Netware 6 <_vendor>Novell -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:16 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:16 +0100 Subject: [Libosinfo] [PATCH v2 12/52] data: fix URI scheme use for ib700 device In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-13-git-send-email-berrange@redhat.com> The ib700 device currently uses a URI of "isa://ib700". Change the URI to refer to the product vendor (http://ibasetechnologies.net) and use a path of "isa/ib700" for the device. Signed-off-by: Daniel P. Berrange --- data/devices/qemu-pci.xml.in | 2 +- data/hypervisors/qemu.xml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/devices/qemu-pci.xml.in b/data/devices/qemu-pci.xml.in index 3e1ab5d..89fa8a4 100644 --- a/data/devices/qemu-pci.xml.in +++ b/data/devices/qemu-pci.xml.in @@ -83,7 +83,7 @@ watchdog - + ib700 isa watchdog diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 9e91888..5c3a5e5 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -35,7 +35,7 @@ - + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:17 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:17 +0100 Subject: [Libosinfo] [PATCH v2 13/52] data: change PS2 device URIs to refer to ibm.com In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-14-git-send-email-berrange@redhat.com> The PS2 computer spec originated with IBM, so the correct URI to refer to is ibm.com not qemu.org Signed-off-by: Daniel P. Berrange --- data/devices/qemu-ps2.xml.in | 4 ++-- data/hypervisors/qemu.xml.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/devices/qemu-ps2.xml.in b/data/devices/qemu-ps2.xml.in index 2335ac0..cef68e2 100644 --- a/data/devices/qemu-ps2.xml.in +++ b/data/devices/qemu-ps2.xml.in @@ -1,7 +1,7 @@ - + keyboard ps2 input @@ -9,7 +9,7 @@ Keyboard - + mouse ps2 input diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 5c3a5e5..9f2ac0b 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -37,9 +37,9 @@ - + - + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:18 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:18 +0100 Subject: [Libosinfo] [PATCH v2 14/52] data: change domain name for x11 keyboard map In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-15-git-send-email-berrange@redhat.com> The X11 keyboard mapping is associated with the X.org site, not the libosinfo site. Signed-off-by: Daniel P. Berrange --- data/datamaps/x11-keyboard.xml | 2 +- data/install-scripts/debian.xml | 4 ++-- data/install-scripts/fedora.xml | 4 ++-- data/install-scripts/ubuntu.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/datamaps/x11-keyboard.xml b/data/datamaps/x11-keyboard.xml index 15a7cd5..e6bbc51 100644 --- a/data/datamaps/x11-keyboard.xml +++ b/data/datamaps/x11-keyboard.xml @@ -6,7 +6,7 @@ - + diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml index b164b01..3b054f1 100644 --- a/data/install-scripts/debian.xml +++ b/data/install-scripts/debian.xml @@ -6,7 +6,7 @@ true - + @@ -133,7 +133,7 @@ d-i preseed/late_command string in-target passwd -d root true - + diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml index 09233ed..405b9c5 100644 --- a/data/install-scripts/fedora.xml +++ b/data/install-scripts/fedora.xml @@ -5,7 +5,7 @@ fedora.ks - + @@ -160,7 +160,7 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install- desktop fedora.ks - + diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml index 86987b8..478d104 100644 --- a/data/install-scripts/ubuntu.xml +++ b/data/install-scripts/ubuntu.xml @@ -5,7 +5,7 @@ preseed.cfg - + -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:19 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:19 +0100 Subject: [Libosinfo] [PATCH v2 15/52] data: standard install script URI format In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-16-git-send-email-berrange@redhat.com> Fix the URI format for install scripts to take the scheme http://$domain-name/$distro/$script/$profile where "$script" is the type of install script (ie kickstart, preseed, unattend, etc) for the distro in question. Signed-off-by: Daniel P. Berrange --- data/install-scripts/debian.xml | 4 ++-- data/install-scripts/fedora.xml | 4 ++-- data/install-scripts/rhel.xml | 4 ++-- data/install-scripts/ubuntu.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/install-scripts/debian.xml b/data/install-scripts/debian.xml index 3b054f1..770820f 100644 --- a/data/install-scripts/debian.xml +++ b/data/install-scripts/debian.xml @@ -1,6 +1,6 @@ - + jeos preseed.cfg true @@ -127,7 +127,7 @@ d-i preseed/late_command string in-target passwd -d root - + desktop preseed.cfg true diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml index 405b9c5..263d14a 100644 --- a/data/install-scripts/fedora.xml +++ b/data/install-scripts/fedora.xml @@ -1,6 +1,6 @@ - + jeos fedora.ks @@ -156,7 +156,7 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install- - + desktop fedora.ks diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml index ddad117..33b0e68 100644 --- a/data/install-scripts/rhel.xml +++ b/data/install-scripts/rhel.xml @@ -1,6 +1,6 @@ - + jeos rhel.ks @@ -105,7 +105,7 @@ reboot - + desktop rhel.ks diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu.xml index 478d104..5c47c09 100644 --- a/data/install-scripts/ubuntu.xml +++ b/data/install-scripts/ubuntu.xml @@ -1,6 +1,6 @@ - + jeos preseed.cfg -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:20 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:20 +0100 Subject: [Libosinfo] [PATCH v2 16/52] data: rename 'hypervisors' to 'platforms' In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-17-git-send-email-berrange@redhat.com> The database directory name matches the object name, except in the case of the platform object, where the directory is named "hypevisors". Change the dir name to "platforms" to be consistent. --- configure.ac | 2 +- data/Makefile.am | 2 +- data/{hypervisors => platforms}/Makefile.am | 0 data/{hypervisors => platforms}/kvm.xml.in | 0 data/{hypervisors => platforms}/qemu.xml.in | 0 data/{hypervisors => platforms}/rhel-xen.xml.in | 0 data/{hypervisors => platforms}/xen.xml.in | 0 libosinfo.spec.in | 2 +- mingw-libosinfo.spec.in | 4 ++-- po/POTFILES.in | 8 ++++---- test/test-xml-validate | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename data/{hypervisors => platforms}/Makefile.am (100%) rename data/{hypervisors => platforms}/kvm.xml.in (100%) rename data/{hypervisors => platforms}/qemu.xml.in (100%) rename data/{hypervisors => platforms}/rhel-xen.xml.in (100%) rename data/{hypervisors => platforms}/xen.xml.in (100%) diff --git a/configure.ac b/configure.ac index 7e7e956..e328f3a 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,7 @@ AC_CONFIG_FILES([ data/Makefile data/datamaps/Makefile data/devices/Makefile - data/hypervisors/Makefile + data/platforms/Makefile data/install-scripts/Makefile data/oses/Makefile data/schemas/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 407cc28..a29fde1 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ INSTALL_DATA_HOOK_DEPS = -SUBDIRS = datamaps devices oses hypervisors install-scripts schemas +SUBDIRS = datamaps devices oses platforms install-scripts schemas EXTRA_DIST = usb.ids pci.ids CLEANFILES = usb.ids pci.ids diff --git a/data/hypervisors/Makefile.am b/data/platforms/Makefile.am similarity index 100% rename from data/hypervisors/Makefile.am rename to data/platforms/Makefile.am diff --git a/data/hypervisors/kvm.xml.in b/data/platforms/kvm.xml.in similarity index 100% rename from data/hypervisors/kvm.xml.in rename to data/platforms/kvm.xml.in diff --git a/data/hypervisors/qemu.xml.in b/data/platforms/qemu.xml.in similarity index 100% rename from data/hypervisors/qemu.xml.in rename to data/platforms/qemu.xml.in diff --git a/data/hypervisors/rhel-xen.xml.in b/data/platforms/rhel-xen.xml.in similarity index 100% rename from data/hypervisors/rhel-xen.xml.in rename to data/platforms/rhel-xen.xml.in diff --git a/data/hypervisors/xen.xml.in b/data/platforms/xen.xml.in similarity index 100% rename from data/hypervisors/xen.xml.in rename to data/platforms/xen.xml.in diff --git a/libosinfo.spec.in b/libosinfo.spec.in index 68e1da4..c9f7e2c 100644 --- a/libosinfo.spec.in +++ b/libosinfo.spec.in @@ -112,7 +112,7 @@ rm -fr %{buildroot} %{_datadir}/libosinfo/db/datamaps %{_datadir}/libosinfo/db/devices %{_datadir}/libosinfo/db/oses -%{_datadir}/libosinfo/db/hypervisors +%{_datadir}/libosinfo/db/platforms %{_datadir}/libosinfo/db/install-scripts %{_datadir}/libosinfo/schemas/libosinfo.rng %{_mandir}/man1/osinfo-db-validate.1* diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in index 377d7ba..a678c3f 100644 --- a/mingw-libosinfo.spec.in +++ b/mingw-libosinfo.spec.in @@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc %{mingw32_datadir}/libosinfo/db/datamaps %{mingw32_datadir}/libosinfo/db/devices %{mingw32_datadir}/libosinfo/db/oses -%{mingw32_datadir}/libosinfo/db/hypervisors +%{mingw32_datadir}/libosinfo/db/platforms %{mingw32_datadir}/libosinfo/db/install-scripts %{mingw32_datadir}/libosinfo/schemas/libosinfo.rng %{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo @@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc %{mingw64_datadir}/libosinfo/db/datamaps %{mingw64_datadir}/libosinfo/db/devices %{mingw64_datadir}/libosinfo/db/oses -%{mingw64_datadir}/libosinfo/db/hypervisors +%{mingw64_datadir}/libosinfo/db/platforms %{mingw64_datadir}/libosinfo/db/install-scripts %{mingw64_datadir}/libosinfo/schemas/libosinfo.rng %{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo diff --git a/po/POTFILES.in b/po/POTFILES.in index a1a551f..ed5a7b5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -23,10 +23,10 @@ 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/hypervisors/kvm.xml.in -data/hypervisors/qemu.xml.in -data/hypervisors/rhel-xen.xml.in -data/hypervisors/xen.xml.in +data/platforms/kvm.xml.in +data/platforms/qemu.xml.in +data/platforms/rhel-xen.xml.in +data/platforms/xen.xml.in osinfo/osinfo_avatar_format.c osinfo/osinfo_deployment.c osinfo/osinfo_devicelink.c diff --git a/test/test-xml-validate b/test/test-xml-validate index a2d20b4..e3cb1a0 100755 --- a/test/test-xml-validate +++ b/test/test-xml-validate @@ -42,7 +42,7 @@ exit $ret : ${srcdir=.} . $srcdir/test-lib.sh -DIRS="datamaps oses hypervisors devices install-scripts" +DIRS="datamaps oses platforms devices install-scripts" SCHEMA="libosinfo.rng" check_schema "$DIRS" "$SCHEMA" -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:21 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:21 +0100 Subject: [Libosinfo] [PATCH v2 17/52] data: split altlinux into one file per OS In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-18-git-send-email-berrange@redhat.com> Signed-off-by: Daniel P. Berrange --- configure.ac | 1 + data/Makefile.inc | 11 ++ data/oses/Makefile.am | 5 +- data/oses/altlinux.org/Makefile.am | 1 + data/oses/altlinux.org/altlinux-1.0.xml.in | 12 ++ data/oses/altlinux.org/altlinux-2.0.xml.in | 13 ++ data/oses/altlinux.org/altlinux-2.2.xml.in | 13 ++ data/oses/altlinux.org/altlinux-2.4.xml.in | 25 +++ data/oses/altlinux.org/altlinux-3.0.xml.in | 25 +++ data/oses/altlinux.org/altlinux-4.0.xml.in | 33 ++++ data/oses/altlinux.org/altlinux-4.1.xml.in | 32 ++++ data/oses/altlinux.org/altlinux-5.0.xml.in | 49 ++++++ data/oses/altlinux.org/altlinux-6.0.xml.in | 37 ++++ data/oses/altlinux.org/altlinux-7.0.xml.in | 33 ++++ data/oses/altlinux.xml.in | 266 ----------------------------- po/POTFILES.in | 11 +- 16 files changed, 299 insertions(+), 268 deletions(-) create mode 100644 data/Makefile.inc create mode 100644 data/oses/altlinux.org/Makefile.am create mode 100644 data/oses/altlinux.org/altlinux-1.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-2.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-2.2.xml.in create mode 100644 data/oses/altlinux.org/altlinux-2.4.xml.in create mode 100644 data/oses/altlinux.org/altlinux-3.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-4.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-4.1.xml.in create mode 100644 data/oses/altlinux.org/altlinux-5.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-6.0.xml.in create mode 100644 data/oses/altlinux.org/altlinux-7.0.xml.in delete mode 100644 data/oses/altlinux.xml.in diff --git a/configure.ac b/configure.ac index e328f3a..b3a9297 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,7 @@ AC_CONFIG_FILES([ data/platforms/Makefile data/install-scripts/Makefile data/oses/Makefile + data/oses/altlinux.org/Makefile data/schemas/Makefile tools/Makefile test/Makefile diff --git a/data/Makefile.inc b/data/Makefile.inc new file mode 100644 index 0000000..20d996b --- /dev/null +++ b/data/Makefile.inc @@ -0,0 +1,11 @@ +# Generic rules that work for any subdir + +databasedir := $(pkgdatadir)/db/$(abs_srcdir:$(abs_top_srcdir)/data/%=%) +database_SRC = $(wildcard $(srcdir)/*.xml.in) +database_DATA = $(database_SRC:$(srcdir)/%.xml.in=%.xml) + + at INTLTOOL_XML_RULE@ + +EXTRA_DIST = $(database_SRC) + +CLEANFILES = $(database_DATA) diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index e1fb6fb..9195755 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -1,7 +1,10 @@ +SUBDIRS = \ + altlinux.org \ + $(NULL) + databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - altlinux.xml.in \ centos.xml.in \ debian.xml.in \ dos.xml.in \ diff --git a/data/oses/altlinux.org/Makefile.am b/data/oses/altlinux.org/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/altlinux.org/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/altlinux.org/altlinux-1.0.xml.in b/data/oses/altlinux.org/altlinux-1.0.xml.in new file mode 100644 index 0000000..c5b7b11 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-1.0.xml.in @@ -0,0 +1,12 @@ + + + altlinux1.0 + <_name>Mandrake RE Spring 2001 + 1.0 + <_vendor>ALTLinux + linux + altlinux + 2001-03-01 + + + diff --git a/data/oses/altlinux.org/altlinux-2.0.xml.in b/data/oses/altlinux.org/altlinux-2.0.xml.in new file mode 100644 index 0000000..b77997b --- /dev/null +++ b/data/oses/altlinux.org/altlinux-2.0.xml.in @@ -0,0 +1,13 @@ + + + altlinux2.0 + <_name>ALT Linux 2.0 + 2.0 + <_vendor>ALTLinux + linux + altlinux + + + 2002-04-20 + + diff --git a/data/oses/altlinux.org/altlinux-2.2.xml.in b/data/oses/altlinux.org/altlinux-2.2.xml.in new file mode 100644 index 0000000..9e1f711 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-2.2.xml.in @@ -0,0 +1,13 @@ + + + altlinux2.2 + <_name>ALT Linux 2.2 + 2.2 + <_vendor>ALTLinux + linux + altlinux + + + 2003-03-01 + + diff --git a/data/oses/altlinux.org/altlinux-2.4.xml.in b/data/oses/altlinux.org/altlinux-2.4.xml.in new file mode 100644 index 0000000..c2a2f3e --- /dev/null +++ b/data/oses/altlinux.org/altlinux-2.4.xml.in @@ -0,0 +1,25 @@ + + + altlinux2.4 + <_name>ALT Linux 2.4 + 2.4 + <_vendor>ALTLinux + linux + altlinux + Citron + + + 2004-09-01 + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/2.4/Master/iso/Master-2.4-install-cd.iso + + LINUX + CDROM + ALT Linux + + isolinux/alt0/vmlinuz + isolinux/alt0/all.rdz + + + diff --git a/data/oses/altlinux.org/altlinux-3.0.xml.in b/data/oses/altlinux.org/altlinux-3.0.xml.in new file mode 100644 index 0000000..a3770b9 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-3.0.xml.in @@ -0,0 +1,25 @@ + + + altlinux3.0 + <_name>ALT Linux 3.0 + 3.0 + <_vendor>ALTLinux + linux + altlinux + caprifoil + + + 2005-03-22 + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/3.0/iso/compact-3.0.4.iso + + ALT Linux + Compact + ALT Linux + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + diff --git a/data/oses/altlinux.org/altlinux-4.0.xml.in b/data/oses/altlinux.org/altlinux-4.0.xml.in new file mode 100644 index 0000000..d89688a --- /dev/null +++ b/data/oses/altlinux.org/altlinux-4.0.xml.in @@ -0,0 +1,33 @@ + + + altlinux4.0 + <_name>ALT Linux 4.0 + 4.0 + <_vendor>ALTLinux + linux + altlinux + + + 2007-06-01 + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-i586-install-cd.iso + + ^("Terminal"|Server|"Desktop\ Personal")$ + ALT Linux( Team)? + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-x86_64-install-cd.iso + + ALT Linux Team + ^Server$ + ALT Linux + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + diff --git a/data/oses/altlinux.org/altlinux-4.1.xml.in b/data/oses/altlinux.org/altlinux-4.1.xml.in new file mode 100644 index 0000000..055ce57 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-4.1.xml.in @@ -0,0 +1,32 @@ + + + altlinux4.1 + <_name>ALT Linux 4.1 + 4.1 + <_vendor>ALTLinux + linux + altlinux + + + 2008-12-07 + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-i586-install-dvd5.iso + + ^"Desktop"$ + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso + + ^"Desktop"$ + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + diff --git a/data/oses/altlinux.org/altlinux-5.0.xml.in b/data/oses/altlinux.org/altlinux-5.0.xml.in new file mode 100644 index 0000000..d77536e --- /dev/null +++ b/data/oses/altlinux.org/altlinux-5.0.xml.in @@ -0,0 +1,49 @@ + + + altlinux5.0 + <_name>ALT Linux 5.0 + 5.0 + <_vendor>ALTLinux + linux + altlinux + Ark + + + 2009-10-29 + + + + + + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso + + ALT Linux 5.0.\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso + + ALT Linux 5.0.\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + + + 1 + 67108864 + + + 536870912 + 5368709120 + + + + diff --git a/data/oses/altlinux.org/altlinux-6.0.xml.in b/data/oses/altlinux.org/altlinux-6.0.xml.in new file mode 100644 index 0000000..dd0a3b5 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-6.0.xml.in @@ -0,0 +1,37 @@ + + + altlinux6.0 + <_name>ALT Linux 6.0 + 6.0 + <_vendor>ALTLinux + linux + altlinux + Centaurus + + + 2011-10-26 + + + + + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso + + (ALT|Simply) Linux 6.0.\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso + + (ALT|Simply) Linux 6.0.\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + diff --git a/data/oses/altlinux.org/altlinux-7.0.xml.in b/data/oses/altlinux.org/altlinux-7.0.xml.in new file mode 100644 index 0000000..66fe1f4 --- /dev/null +++ b/data/oses/altlinux.org/altlinux-7.0.xml.in @@ -0,0 +1,33 @@ + + + altlinux7.0 + <_name>ALT Linux 7.0 + 7.0 + <_vendor>ALTLinux + linux + altlinux + Centaurus + + + 2012-10-01 + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-i586-ru-install-dvd5.iso + + (ALT|Simply) Linux (6.9|7.0).\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-x86_64-ru-install-dvd5.iso + + (ALT|Simply) Linux (6.9|7.0).\d + ALT Linux Team + + isolinux/alt0/vmlinuz + isolinux/alt0/full.cz + + + diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in deleted file mode 100644 index 24d8f62..0000000 --- a/data/oses/altlinux.xml.in +++ /dev/null @@ -1,266 +0,0 @@ - - - - altlinux1.0 - <_name>Mandrake RE Spring 2001 - 1.0 - <_vendor>ALTLinux - linux - altlinux - 2001-03-01 - - - - - altlinux2.0 - <_name>ALT Linux 2.0 - 2.0 - <_vendor>ALTLinux - linux - altlinux - - - 2002-04-20 - - - - - altlinux2.2 - <_name>ALT Linux 2.2 - 2.2 - <_vendor>ALTLinux - linux - altlinux - - - 2003-03-01 - - - - altlinux2.4 - <_name>ALT Linux 2.4 - 2.4 - <_vendor>ALTLinux - linux - altlinux - Citron - - - 2004-09-01 - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/2.4/Master/iso/Master-2.4-install-cd.iso - - LINUX - CDROM - ALT Linux - - isolinux/alt0/vmlinuz - isolinux/alt0/all.rdz - - - - - altlinux3.0 - <_name>ALT Linux 3.0 - 3.0 - <_vendor>ALTLinux - linux - altlinux - caprifoil - - - 2005-03-22 - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/3.0/iso/compact-3.0.4.iso - - ALT Linux - Compact - ALT Linux - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - - altlinux4.0 - <_name>ALT Linux 4.0 - 4.0 - <_vendor>ALTLinux - linux - altlinux - - - 2007-06-01 - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-i586-install-cd.iso - - ^("Terminal"|Server|"Desktop\ Personal")$ - ALT Linux( Team)? - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-x86_64-install-cd.iso - - ALT Linux Team - ^Server$ - ALT Linux - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - - altlinux4.1 - <_name>ALT Linux 4.1 - 4.1 - <_vendor>ALTLinux - linux - altlinux - - - 2008-12-07 - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-i586-install-dvd5.iso - - ^"Desktop"$ - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso - - ^"Desktop"$ - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - - altlinux5.0 - <_name>ALT Linux 5.0 - 5.0 - <_vendor>ALTLinux - linux - altlinux - Ark - - - 2009-10-29 - - - - - - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso - - ALT Linux 5.0.\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso - - ALT Linux 5.0.\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - - 1 - 67108864 - - - 536870912 - 5368709120 - - - - - - altlinux6.0 - <_name>ALT Linux 6.0 - 6.0 - <_vendor>ALTLinux - linux - altlinux - Centaurus - - - 2011-10-26 - - - - - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso - - (ALT|Simply) Linux 6.0.\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso - - (ALT|Simply) Linux 6.0.\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - - altlinux7.0 - <_name>ALT Linux 7.0 - 7.0 - <_vendor>ALTLinux - linux - altlinux - Centaurus - - - 2012-10-01 - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-i586-ru-install-dvd5.iso - - (ALT|Simply) Linux (6.9|7.0).\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/iso/centaurus/altlinux-7.0.0-centaurus-x86_64-ru-install-dvd5.iso - - (ALT|Simply) Linux (6.9|7.0).\d - ALT Linux Team - - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index ed5a7b5..24e8119 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,13 @@ +data/oses/altlinux.org/altlinux-1.0.xml.in +data/oses/altlinux.org/altlinux-2.0.xml.in +data/oses/altlinux.org/altlinux-2.2.xml.in +data/oses/altlinux.org/altlinux-2.4.xml.in +data/oses/altlinux.org/altlinux-3.0.xml.in +data/oses/altlinux.org/altlinux-4.0.xml.in +data/oses/altlinux.org/altlinux-4.1.xml.in +data/oses/altlinux.org/altlinux-5.0.xml.in +data/oses/altlinux.org/altlinux-6.0.xml.in +data/oses/altlinux.org/altlinux-7.0.xml.in data/oses/netware.xml.in data/oses/solaris.xml.in data/oses/dos.xml.in @@ -18,7 +28,6 @@ data/oses/openbsd.xml.in data/oses/freebsd.xml.in data/oses/rhl.xml.in data/oses/netbsd.xml.in -data/oses/altlinux.xml.in data/devices/qemu-ps2.xml.in data/devices/qemu-pci.xml.in data/devices/virtio-pci.xml.in -- 2.4.3 From berrange at redhat.com Mon Oct 5 15:31:22 2015 From: berrange at redhat.com (Daniel P. Berrange) Date: Mon, 5 Oct 2015 16:31:22 +0100 Subject: [Libosinfo] [PATCH v2 18/52] data: split centos into one file per OS In-Reply-To: <1444059116-459-1-git-send-email-berrange@redhat.com> References: <1444059116-459-1-git-send-email-berrange@redhat.com> Message-ID: <1444059116-459-19-git-send-email-berrange@redhat.com> Signed-off-by: Daniel P. Berrange --- configure.ac | 1 + data/oses/Makefile.am | 2 +- data/oses/centos.org/Makefile.am | 1 + data/oses/centos.org/centos-6.0.xml.in | 48 +++++ data/oses/centos.org/centos-6.1.xml.in | 47 +++++ data/oses/centos.org/centos-6.2.xml.in | 47 +++++ data/oses/centos.org/centos-6.3.xml.in | 55 ++++++ data/oses/centos.org/centos-6.4.xml.in | 47 +++++ data/oses/centos.org/centos-6.5.xml.in | 47 +++++ data/oses/centos.org/centos-7.0.xml.in | 41 +++++ data/oses/centos.xml.in | 328 --------------------------------- po/POTFILES.in | 8 +- 12 files changed, 342 insertions(+), 330 deletions(-) create mode 100644 data/oses/centos.org/Makefile.am create mode 100644 data/oses/centos.org/centos-6.0.xml.in create mode 100644 data/oses/centos.org/centos-6.1.xml.in create mode 100644 data/oses/centos.org/centos-6.2.xml.in create mode 100644 data/oses/centos.org/centos-6.3.xml.in create mode 100644 data/oses/centos.org/centos-6.4.xml.in create mode 100644 data/oses/centos.org/centos-6.5.xml.in create mode 100644 data/oses/centos.org/centos-7.0.xml.in delete mode 100644 data/oses/centos.xml.in diff --git a/configure.ac b/configure.ac index b3a9297..a91265c 100644 --- a/configure.ac +++ b/configure.ac @@ -173,6 +173,7 @@ AC_CONFIG_FILES([ data/install-scripts/Makefile data/oses/Makefile data/oses/altlinux.org/Makefile + data/oses/centos.org/Makefile data/schemas/Makefile tools/Makefile test/Makefile diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index 9195755..13b18cf 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = \ altlinux.org \ + centos.org \ $(NULL) databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - centos.xml.in \ debian.xml.in \ dos.xml.in \ fedora.xml.in \ diff --git a/data/oses/centos.org/Makefile.am b/data/oses/centos.org/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/centos.org/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/centos.org/centos-6.0.xml.in b/data/oses/centos.org/centos-6.0.xml.in new file mode 100644 index 0000000..3de8d90 --- /dev/null +++ b/data/oses/centos.org/centos-6.0.xml.in @@ -0,0 +1,48 @@ + + + centos6.0 + <_name>CentOS 6.0 + 6.0 + <_vendor>CentOS + linux + centos + + + + + + LINUX + CentOS_6.0_Final + + isolinux/vmlinuz + isolinux/initrd.img + + + + LINUX + CentOS_6.0_Final + + isolinux/vmlinuz + isolinux/initrd.img + + + + + 1 + 536870912 + + + + 400000000 + 1073741824 + 9663676416 + + + + +