[Libosinfo] [PATCH 22/39] data: split solaris into one file per OS
Daniel P. Berrange
berrange at redhat.com
Mon Sep 28 15:51:40 UTC 2015
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
configure.ac | 1 +
data/oses/Makefile.am | 2 +-
data/oses/solaris.xml.in | 49 -----------------------------
data/oses/solaris/Makefile.am | 1 +
data/oses/solaris/opensolaris2009.06.xml.in | 14 +++++++++
data/oses/solaris/solaris10.xml.in | 15 +++++++++
data/oses/solaris/solaris11.xml.in | 11 +++++++
data/oses/solaris/solaris9.xml.in | 10 ++++++
po/POTFILES.in | 5 ++-
9 files changed, 57 insertions(+), 51 deletions(-)
delete mode 100644 data/oses/solaris.xml.in
create mode 100644 data/oses/solaris/Makefile.am
create mode 100644 data/oses/solaris/opensolaris2009.06.xml.in
create mode 100644 data/oses/solaris/solaris10.xml.in
create mode 100644 data/oses/solaris/solaris11.xml.in
create mode 100644 data/oses/solaris/solaris9.xml.in
diff --git a/configure.ac b/configure.ac
index 26221d6..e0df0b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,7 @@ AC_CONFIG_FILES([
data/oses/opensuse/Makefile
data/oses/rhel/Makefile
data/oses/rhl/Makefile
+ data/oses/solaris/Makefile
data/schemas/Makefile
tools/Makefile
test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 167bcb1..1ca63e5 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -17,11 +17,11 @@ SUBDIRS = \
opensuse \
rhel \
rhl \
+ solaris \
$(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/solaris.xml.in b/data/oses/solaris.xml.in
deleted file mode 100644
index 8c7c276..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://www.linux-usb.org/usb.ids/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://www.linux-usb.org/usb.ids/80ee/0021"/>
- </devices>
- </os>
-
-</libosinfo>
diff --git a/data/oses/solaris/Makefile.am b/data/oses/solaris/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/solaris/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/solaris/opensolaris2009.06.xml.in b/data/oses/solaris/opensolaris2009.06.xml.in
new file mode 100644
index 0000000..a5bfc81
--- /dev/null
+++ b/data/oses/solaris/opensolaris2009.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://www.linux-usb.org/usb.ids/80ee/0021"/>
+ </devices>
+ </os>
+</libosinfo>
diff --git a/data/oses/solaris/solaris10.xml.in b/data/oses/solaris/solaris10.xml.in
new file mode 100644
index 0000000..8e00b4a
--- /dev/null
+++ b/data/oses/solaris/solaris10.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://www.linux-usb.org/usb.ids/80ee/0021"/>
+ </devices>
+ </os>
+</libosinfo>
diff --git a/data/oses/solaris/solaris11.xml.in b/data/oses/solaris/solaris11.xml.in
new file mode 100644
index 0000000..b6da98f
--- /dev/null
+++ b/data/oses/solaris/solaris11.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/solaris9.xml.in b/data/oses/solaris/solaris9.xml.in
new file mode 100644
index 0000000..fccb5f1
--- /dev/null
+++ b/data/oses/solaris/solaris9.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 9448255..5e7ecd3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -261,7 +261,10 @@ data/oses/rhl/rhl7.3.xml.in
data/oses/rhl/rhl7.xml.in
data/oses/rhl/rhl8.0.xml.in
data/oses/rhl/rhl9.xml.in
-data/oses/solaris.xml.in
+data/oses/solaris/opensolaris2009.06.xml.in
+data/oses/solaris/solaris9.xml.in
+data/oses/solaris/solaris10.xml.in
+data/oses/solaris/solaris11.xml.in
data/oses/suse.xml.in
data/oses/windows.xml.in
data/oses/ubuntu.xml.in
--
2.4.3
More information about the Libosinfo
mailing list