Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 2 ++ data/oses/Makefile.am | 3 +- data/oses/oracle.com/Makefile.am | 1 + data/oses/oracle.com/solaris-11.xml.in | 11 +++++++ data/oses/solaris.xml.in | 49 ---------------------------- data/oses/sun.com/Makefile.am | 1 + data/oses/sun.com/opensolaris-2009.06.xml.in | 14 ++++++++ data/oses/sun.com/solaris-10.xml.in | 15 +++++++++ data/oses/sun.com/solaris-9.xml.in | 10 ++++++ po/POTFILES.in | 5 ++- 10 files changed, 60 insertions(+), 51 deletions(-) create mode 100644 data/oses/oracle.com/Makefile.am create mode 100644 data/oses/oracle.com/solaris-11.xml.in delete mode 100644 data/oses/solaris.xml.in create mode 100644 data/oses/sun.com/Makefile.am create mode 100644 data/oses/sun.com/opensolaris-2009.06.xml.in create mode 100644 data/oses/sun.com/solaris-10.xml.in create mode 100644 data/oses/sun.com/solaris-9.xml.in diff --git a/configure.ac b/configure.ac index 7cf89ff..ead03e6 100644 --- a/configure.ac +++ b/configure.ac @@ -186,7 +186,9 @@ AC_CONFIG_FILES([ data/oses/novell.com/Makefile data/oses/openbsd.org/Makefile data/oses/opensuse.org/Makefile + data/oses/oracle.com/Makefile data/oses/redhat.com/Makefile + data/oses/sun.com/Makefile data/schemas/Makefile tools/Makefile test/Makefile diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index 7c6fd68..22e2301 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -14,12 +14,13 @@ SUBDIRS = \ novell.com \ openbsd.org \ opensuse.org \ + oracle.com \ redhat.com \ + sun.com \ $(NULL) databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - solaris.xml.in \ suse.xml.in \ ubuntu.xml.in \ windows.xml.in \ diff --git a/data/oses/oracle.com/Makefile.am b/data/oses/oracle.com/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/oracle.com/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/oracle.com/solaris-11.xml.in b/data/oses/oracle.com/solaris-11.xml.in new file mode 100644 index 0000000..b6da98f --- /dev/null +++ b/data/oses/oracle.com/solaris-11.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <os id="http://oracle.com/solaris/11";> + <short-id>solaris11</short-id> + <_name>Oracle Solaris 11</_name> + <version>11</version> + <_vendor>Oracle</_vendor> + <family>solaris</family> + <distro>solaris</distro> + <upgrades id="http://sun.com/solaris/10"/> + </os> +</libosinfo> diff --git a/data/oses/solaris.xml.in b/data/oses/solaris.xml.in deleted file mode 100644 index e7193df..0000000 --- a/data/oses/solaris.xml.in +++ /dev/null @@ -1,49 +0,0 @@ -<libosinfo version="0.0.1"> - - <os id="http://sun.com/solaris/9";> - <short-id>solaris9</short-id> - <_name>Solaris 9</_name> - <version>9</version> - <_vendor>Sun</_vendor> - <family>solaris</family> - <distro>solaris</distro> - </os> - - <os id="http://sun.com/solaris/10";> - <short-id>solaris10</short-id> - <_name>Solaris 10</_name> - <version>10</version> - <_vendor>Sun</_vendor> - <family>solaris</family> - <distro>solaris</distro> - <upgrades id="http://sun.com/solaris/9"/> - - <devices> - <device id="http://usb.org/usb/80ee/0021"/> - </devices> - </os> - - <os id="http://oracle.com/solaris/11";> - <short-id>solaris11</short-id> - <_name>Oracle Solaris 11</_name> - <version>11</version> - <_vendor>Oracle</_vendor> - <family>solaris</family> - <distro>solaris</distro> - <upgrades id="http://sun.com/solaris/10"/> - </os> - - <os id="http://sun.com/opensolaris/2009.06";> - <short-id>opensolaris2009.06</short-id> - <_name>OpenSolaris 2009.06</_name> - <version>2009.06</version> - <_vendor>Sun</_vendor> - <family>solaris</family> - <distro>opensolaris</distro> - - <devices> - <device id="http://usb.org/usb/80ee/0021"/> - </devices> - </os> - -</libosinfo> diff --git a/data/oses/sun.com/Makefile.am b/data/oses/sun.com/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/sun.com/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/sun.com/opensolaris-2009.06.xml.in b/data/oses/sun.com/opensolaris-2009.06.xml.in new file mode 100644 index 0000000..0b6622b --- /dev/null +++ b/data/oses/sun.com/opensolaris-2009.06.xml.in @@ -0,0 +1,14 @@ +<libosinfo version="0.0.1"> + <os id="http://sun.com/opensolaris/2009.06";> + <short-id>opensolaris2009.06</short-id> + <_name>OpenSolaris 2009.06</_name> + <version>2009.06</version> + <_vendor>Sun</_vendor> + <family>solaris</family> + <distro>opensolaris</distro> + + <devices> + <device id="http://usb.org/usb/80ee/0021"/> + </devices> + </os> +</libosinfo> diff --git a/data/oses/sun.com/solaris-10.xml.in b/data/oses/sun.com/solaris-10.xml.in new file mode 100644 index 0000000..d4bf84e --- /dev/null +++ b/data/oses/sun.com/solaris-10.xml.in @@ -0,0 +1,15 @@ +<libosinfo version="0.0.1"> + <os id="http://sun.com/solaris/10";> + <short-id>solaris10</short-id> + <_name>Solaris 10</_name> + <version>10</version> + <_vendor>Sun</_vendor> + <family>solaris</family> + <distro>solaris</distro> + <upgrades id="http://sun.com/solaris/9"/> + + <devices> + <device id="http://usb.org/usb/80ee/0021"/> + </devices> + </os> +</libosinfo> diff --git a/data/oses/sun.com/solaris-9.xml.in b/data/oses/sun.com/solaris-9.xml.in new file mode 100644 index 0000000..fccb5f1 --- /dev/null +++ b/data/oses/sun.com/solaris-9.xml.in @@ -0,0 +1,10 @@ +<libosinfo version="0.0.1"> + <os id="http://sun.com/solaris/9";> + <short-id>solaris9</short-id> + <_name>Solaris 9</_name> + <version>9</version> + <_vendor>Sun</_vendor> + <family>solaris</family> + <distro>solaris</distro> + </os> +</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 606bede..5ff5edd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -192,6 +192,7 @@ data/oses/opensuse.org/opensuse-13.1.xml.in data/oses/opensuse.org/opensuse-13.2.xml.in data/oses/opensuse.org/opensuse-factory.xml.in data/oses/opensuse.org/opensuse-unknown.xml.in +data/oses/oracle.com/solaris-11.xml.in data/oses/redhat.com/rhel-2.1.1.xml.in data/oses/redhat.com/rhel-2.1.2.xml.in data/oses/redhat.com/rhel-2.1.3.xml.in @@ -263,7 +264,9 @@ data/oses/redhat.com/rhl-7.3.xml.in data/oses/redhat.com/rhl-7.xml.in data/oses/redhat.com/rhl-8.0.xml.in data/oses/redhat.com/rhl-9.xml.in -data/oses/solaris.xml.in +data/oses/sun.com/opensolaris-2009.06.xml.in +data/oses/sun.com/solaris-9.xml.in +data/oses/sun.com/solaris-10.xml.in data/oses/suse.xml.in data/oses/windows.xml.in data/oses/ubuntu.xml.in -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
