[Libosinfo] [PATCH v3 30/60] data: split openbsd into one file per OS

Daniel P. Berrange berrange at redhat.com
Mon Oct 12 17:10:51 UTC 2015


Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                             |   1 +
 data/oses/Makefile.am                    |   2 +-
 data/oses/openbsd.org/Makefile.am        |   1 +
 data/oses/openbsd.org/openbsd-4.2.xml.in |  28 ++
 data/oses/openbsd.org/openbsd-4.3.xml.in |  30 ++
 data/oses/openbsd.org/openbsd-4.4.xml.in |  30 ++
 data/oses/openbsd.org/openbsd-4.5.xml.in |  30 ++
 data/oses/openbsd.org/openbsd-4.8.xml.in |  30 ++
 data/oses/openbsd.org/openbsd-4.9.xml.in |  34 +++
 data/oses/openbsd.org/openbsd-5.0.xml.in |  31 +++
 data/oses/openbsd.org/openbsd-5.1.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.2.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.3.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.4.xml.in |  37 +++
 data/oses/openbsd.org/openbsd-5.5.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.6.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.7.xml.in |  32 +++
 data/oses/openbsd.org/openbsd-5.8.xml.in |  32 +++
 data/oses/openbsd.xml.in                 | 463 -------------------------------
 po/POTFILES.in                           |  16 +-
 20 files changed, 492 insertions(+), 465 deletions(-)
 create mode 100644 data/oses/openbsd.org/Makefile.am
 create mode 100644 data/oses/openbsd.org/openbsd-4.2.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-4.3.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-4.4.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-4.5.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-4.8.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-4.9.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.0.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.1.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.2.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.3.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.4.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.5.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.6.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.7.xml.in
 create mode 100644 data/oses/openbsd.org/openbsd-5.8.xml.in
 delete mode 100644 data/oses/openbsd.xml.in

diff --git a/configure.ac b/configure.ac
index 44813c0..20bea25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,7 @@ AC_CONFIG_FILES([
 	data/oses/microsoft.com/Makefile
 	data/oses/netbsd.org/Makefile
 	data/oses/novell.com/Makefile
+	data/oses/openbsd.org/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 9fd75f5..830078e 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -12,11 +12,11 @@ SUBDIRS = \
 	microsoft.com \
 	netbsd.org \
 	novell.com \
+	openbsd.org \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	openbsd.xml.in  \
 	opensuse.xml.in \
 	rhl.xml.in      \
 	rhel.xml.in     \
diff --git a/data/oses/openbsd.org/Makefile.am b/data/oses/openbsd.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/openbsd.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/openbsd.org/openbsd-4.2.xml.in b/data/oses/openbsd.org/openbsd-4.2.xml.in
new file mode 100644
index 0000000..a322187
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.2.xml.in
@@ -0,0 +1,28 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.2">
+    <short-id>openbsd4.2</short-id>
+    <_name>OpenBSD 4.2</_name>
+    <version>4.2</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-4.3.xml.in b/data/oses/openbsd.org/openbsd-4.3.xml.in
new file mode 100644
index 0000000..635b656
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.3.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.3">
+    <short-id>openbsd4.3</short-id>
+    <_name>OpenBSD 4.3</_name>
+    <version>4.3</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.2'/>
+    <derives-from id='http://openbsd.org/openbsd/4.2'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-4.4.xml.in b/data/oses/openbsd.org/openbsd-4.4.xml.in
new file mode 100644
index 0000000..f5b4e8e
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.4.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.4">
+    <short-id>openbsd4.4</short-id>
+    <_name>OpenBSD 4.4</_name>
+    <version>4.4</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.3'/>
+    <derives-from id='http://openbsd.org/openbsd/4.3'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-4.5.xml.in b/data/oses/openbsd.org/openbsd-4.5.xml.in
new file mode 100644
index 0000000..2f51347
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.5.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.5">
+    <short-id>openbsd4.5</short-id>
+    <_name>OpenBSD 4.5</_name>
+    <version>4.5</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.4'/>
+    <derives-from id='http://openbsd.org/openbsd/4.4'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-4.8.xml.in b/data/oses/openbsd.org/openbsd-4.8.xml.in
new file mode 100644
index 0000000..ee53699
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.8.xml.in
@@ -0,0 +1,30 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.8">
+    <short-id>openbsd4.8</short-id>
+    <_name>OpenBSD 4.8</_name>
+    <version>4.8</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.5'/>
+    <derives-from id='http://openbsd.org/openbsd/4.5'/>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-4.9.xml.in b/data/oses/openbsd.org/openbsd-4.9.xml.in
new file mode 100644
index 0000000..93ea7b4
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-4.9.xml.in
@@ -0,0 +1,34 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/4.9">
+    <short-id>openbsd4.9</short-id>
+    <_name>OpenBSD 4.9</_name>
+    <version>4.9</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.8'/>
+    <derives-from id='http://openbsd.org/openbsd/4.8'/>
+
+    <devices>
+      <device id="http://pcisig.com/pci/1022/2000"/>
+    </devices>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.0.xml.in b/data/oses/openbsd.org/openbsd-5.0.xml.in
new file mode 100644
index 0000000..fedfdda
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.0.xml.in
@@ -0,0 +1,31 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.0">
+    <short-id>openbsd5.0</short-id>
+    <_name>OpenBSD 5.0</_name>
+    <version>5.0</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.9'/>
+    <derives-from id='http://openbsd.org/openbsd/4.9'/>
+
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.1.xml.in b/data/oses/openbsd.org/openbsd-5.1.xml.in
new file mode 100644
index 0000000..1fffa8a
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.1.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.1">
+    <short-id>openbsd5.1</short-id>
+    <_name>OpenBSD 5.1</_name>
+    <version>5.1</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.0'/>
+    <derives-from id='http://openbsd.org/openbsd/5.0'/>
+
+    <release-date>2012-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.1 Install CD</volume-id>
+	<application-id>OpenBSD 5.1 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.1 Install CD</volume-id>
+	<application-id>OpenBSD 5.1 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.2.xml.in b/data/oses/openbsd.org/openbsd-5.2.xml.in
new file mode 100644
index 0000000..d4a4b24
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.2.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.2">
+    <short-id>openbsd5.2</short-id>
+    <_name>OpenBSD 5.2</_name>
+    <version>5.2</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.1'/>
+    <derives-from id='http://openbsd.org/openbsd/5.1'/>
+
+    <release-date>2012-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.2 Install CD</volume-id>
+	<application-id>OpenBSD 5.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.2 Install CD</volume-id>
+	<application-id>OpenBSD 5.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.3.xml.in b/data/oses/openbsd.org/openbsd-5.3.xml.in
new file mode 100644
index 0000000..b23adb4
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.3.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.3">
+    <short-id>openbsd5.3</short-id>
+    <_name>OpenBSD 5.3</_name>
+    <version>5.3</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.2'/>
+    <derives-from id='http://openbsd.org/openbsd/5.2'/>
+
+    <release-date>2013-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.3 Install CD</volume-id>
+	<application-id>OpenBSD 5.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.3 Install CD</volume-id>
+	<application-id>OpenBSD 5.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.4.xml.in b/data/oses/openbsd.org/openbsd-5.4.xml.in
new file mode 100644
index 0000000..f3d2d9a
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.4.xml.in
@@ -0,0 +1,37 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.4">
+    <short-id>openbsd5.4</short-id>
+    <_name>OpenBSD 5.4</_name>
+    <version>5.4</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.3'/>
+    <derives-from id='http://openbsd.org/openbsd/5.3'/>
+
+    <release-date>2013-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.4 Install CD</volume-id>
+	<application-id>OpenBSD 5.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.4 Install CD</volume-id>
+	<application-id>OpenBSD 5.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+
+    <devices>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.5.xml.in b/data/oses/openbsd.org/openbsd-5.5.xml.in
new file mode 100644
index 0000000..328b8d5
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.5.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.5">
+    <short-id>openbsd5.5</short-id>
+    <_name>OpenBSD 5.5</_name>
+    <version>5.5</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.4'/>
+    <derives-from id='http://openbsd.org/openbsd/5.4'/>
+
+    <release-date>2014-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.5 Install CD</volume-id>
+	<application-id>OpenBSD 5.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.5 Install CD</volume-id>
+	<application-id>OpenBSD 5.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.6.xml.in b/data/oses/openbsd.org/openbsd-5.6.xml.in
new file mode 100644
index 0000000..57f8b35
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.6.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.6">
+    <short-id>openbsd5.6</short-id>
+    <_name>OpenBSD 5.6</_name>
+    <version>5.6</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.5'/>
+    <derives-from id='http://openbsd.org/openbsd/5.5'/>
+
+    <release-date>2014-11-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.6 Install CD</volume-id>
+	<application-id>OpenBSD 5.6 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.6 Install CD</volume-id>
+	<application-id>OpenBSD 5.6 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.7.xml.in b/data/oses/openbsd.org/openbsd-5.7.xml.in
new file mode 100644
index 0000000..064a50a
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.7.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.7">
+    <short-id>openbsd5.7</short-id>
+    <_name>OpenBSD 5.7</_name>
+    <version>5.7</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.6'/>
+    <derives-from id='http://openbsd.org/openbsd/5.6'/>
+
+    <release-date>2015-05-01</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.7 Install CD</volume-id>
+	<application-id>OpenBSD 5.7 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.7 Install CD</volume-id>
+	<application-id>OpenBSD 5.7 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.org/openbsd-5.8.xml.in b/data/oses/openbsd.org/openbsd-5.8.xml.in
new file mode 100644
index 0000000..f3cc36d
--- /dev/null
+++ b/data/oses/openbsd.org/openbsd-5.8.xml.in
@@ -0,0 +1,32 @@
+<libosinfo version="0.0.1">
+  <os id="http://openbsd.org/openbsd/5.8">
+    <short-id>openbsd5.8</short-id>
+    <_name>OpenBSD 5.8</_name>
+    <version>5.8</version>
+    <family>openbsd</family>
+    <distro>openbsd</distro>
+    <_vendor>OpenBSD Project</_vendor>
+    <upgrades id='http://openbsd.org/openbsd/5.7'/>
+    <derives-from id='http://openbsd.org/openbsd/5.7'/>
+
+    <release-date>2015-10-18</release-date>
+
+    <media arch='i686'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.8 Install CD</volume-id>
+	<application-id>OpenBSD 5.8 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.8 Install CD</volume-id>
+	<application-id>OpenBSD 5.8 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+</libosinfo>
diff --git a/data/oses/openbsd.xml.in b/data/oses/openbsd.xml.in
deleted file mode 100644
index 9f1ecda..0000000
--- a/data/oses/openbsd.xml.in
+++ /dev/null
@@ -1,463 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://openbsd.org/openbsd/4.2">
-    <short-id>openbsd4.2</short-id>
-    <_name>OpenBSD 4.2</_name>
-    <version>4.2</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
-	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.3">
-    <short-id>openbsd4.3</short-id>
-    <_name>OpenBSD 4.3</_name>
-    <version>4.3</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.2'/>
-    <derives-from id='http://openbsd.org/openbsd/4.2'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
-	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.4">
-    <short-id>openbsd4.4</short-id>
-    <_name>OpenBSD 4.4</_name>
-    <version>4.4</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.3'/>
-    <derives-from id='http://openbsd.org/openbsd/4.3'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
-	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.5">
-    <short-id>openbsd4.5</short-id>
-    <_name>OpenBSD 4.5</_name>
-    <version>4.5</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.4'/>
-    <derives-from id='http://openbsd.org/openbsd/4.4'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
-	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.8">
-    <short-id>openbsd4.8</short-id>
-    <_name>OpenBSD 4.8</_name>
-    <version>4.8</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.5'/>
-    <derives-from id='http://openbsd.org/openbsd/4.5'/>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
-	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/4.9">
-    <short-id>openbsd4.9</short-id>
-    <_name>OpenBSD 4.9</_name>
-    <version>4.9</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.8'/>
-    <derives-from id='http://openbsd.org/openbsd/4.8'/>
-
-    <devices>
-      <device id="http://pcisig.com/pci/1022/2000"/>
-    </devices>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
-	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-
-  <os id="http://openbsd.org/openbsd/5.0">
-    <short-id>openbsd5.0</short-id>
-    <_name>OpenBSD 5.0</_name>
-    <version>5.0</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/4.9'/>
-    <derives-from id='http://openbsd.org/openbsd/4.9'/>
-
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
-	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.1">
-    <short-id>openbsd5.1</short-id>
-    <_name>OpenBSD 5.1</_name>
-    <version>5.1</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.0'/>
-    <derives-from id='http://openbsd.org/openbsd/5.0'/>
-
-    <release-date>2012-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.1 Install CD</volume-id>
-	<application-id>OpenBSD 5.1 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.1 Install CD</volume-id>
-	<application-id>OpenBSD 5.1 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.2">
-    <short-id>openbsd5.2</short-id>
-    <_name>OpenBSD 5.2</_name>
-    <version>5.2</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.1'/>
-    <derives-from id='http://openbsd.org/openbsd/5.1'/>
-
-    <release-date>2012-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.2 Install CD</volume-id>
-	<application-id>OpenBSD 5.2 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.2 Install CD</volume-id>
-	<application-id>OpenBSD 5.2 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.3">
-    <short-id>openbsd5.3</short-id>
-    <_name>OpenBSD 5.3</_name>
-    <version>5.3</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.2'/>
-    <derives-from id='http://openbsd.org/openbsd/5.2'/>
-
-    <release-date>2013-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.3 Install CD</volume-id>
-	<application-id>OpenBSD 5.3 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.3 Install CD</volume-id>
-	<application-id>OpenBSD 5.3 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.4">
-    <short-id>openbsd5.4</short-id>
-    <_name>OpenBSD 5.4</_name>
-    <version>5.4</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.3'/>
-    <derives-from id='http://openbsd.org/openbsd/5.3'/>
-
-    <release-date>2013-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.4 Install CD</volume-id>
-	<application-id>OpenBSD 5.4 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.4 Install CD</volume-id>
-	<application-id>OpenBSD 5.4 amd64 Install CD</application-id>
-      </iso>
-    </media>
-
-    <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-    </devices>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.5">
-    <short-id>openbsd5.5</short-id>
-    <_name>OpenBSD 5.5</_name>
-    <version>5.5</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.4'/>
-    <derives-from id='http://openbsd.org/openbsd/5.4'/>
-
-    <release-date>2014-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.5 Install CD</volume-id>
-	<application-id>OpenBSD 5.5 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.5 Install CD</volume-id>
-	<application-id>OpenBSD 5.5 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.6">
-    <short-id>openbsd5.6</short-id>
-    <_name>OpenBSD 5.6</_name>
-    <version>5.6</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.5'/>
-    <derives-from id='http://openbsd.org/openbsd/5.5'/>
-
-    <release-date>2014-11-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.6 Install CD</volume-id>
-	<application-id>OpenBSD 5.6 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.6 Install CD</volume-id>
-	<application-id>OpenBSD 5.6 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.7">
-    <short-id>openbsd5.7</short-id>
-    <_name>OpenBSD 5.7</_name>
-    <version>5.7</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.6'/>
-    <derives-from id='http://openbsd.org/openbsd/5.6'/>
-
-    <release-date>2015-05-01</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.7 Install CD</volume-id>
-	<application-id>OpenBSD 5.7 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.7 Install CD</volume-id>
-	<application-id>OpenBSD 5.7 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-  <os id="http://openbsd.org/openbsd/5.8">
-    <short-id>openbsd5.8</short-id>
-    <_name>OpenBSD 5.8</_name>
-    <version>5.8</version>
-    <family>openbsd</family>
-    <distro>openbsd</distro>
-    <_vendor>OpenBSD Project</_vendor>
-    <upgrades id='http://openbsd.org/openbsd/5.7'/>
-    <derives-from id='http://openbsd.org/openbsd/5.7'/>
-
-    <release-date>2015-10-18</release-date>
-
-    <media arch='i686'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/i386    5.8 Install CD</volume-id>
-	<application-id>OpenBSD 5.8 i386 Install CD</application-id>
-      </iso>
-    </media>
-
-    <media arch='x86_64'>
-      <iso>
-	<publisher-id>The OpenBSD project</publisher-id>
-	<system-id>OpenBSD</system-id>
-	<volume-id>OpenBSD/amd64   5.8 Install CD</volume-id>
-	<application-id>OpenBSD 5.8 amd64 Install CD</application-id>
-      </iso>
-    </media>
-  </os>
-
-</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9fe7ea8..d66d5df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -163,13 +163,27 @@ data/oses/netbsd.org/netbsd-5.1.xml.in
 data/oses/novell.com/netware-4.xml.in
 data/oses/novell.com/netware-5.xml.in
 data/oses/novell.com/netware-6.xml.in
+data/oses/openbsd.org/openbsd-4.2.xml.in
+data/oses/openbsd.org/openbsd-4.3.xml.in
+data/oses/openbsd.org/openbsd-4.4.xml.in
+data/oses/openbsd.org/openbsd-4.5.xml.in
+data/oses/openbsd.org/openbsd-4.8.xml.in
+data/oses/openbsd.org/openbsd-4.9.xml.in
+data/oses/openbsd.org/openbsd-5.0.xml.in
+data/oses/openbsd.org/openbsd-5.1.xml.in
+data/oses/openbsd.org/openbsd-5.2.xml.in
+data/oses/openbsd.org/openbsd-5.3.xml.in
+data/oses/openbsd.org/openbsd-5.4.xml.in
+data/oses/openbsd.org/openbsd-5.5.xml.in
+data/oses/openbsd.org/openbsd-5.6.xml.in
+data/oses/openbsd.org/openbsd-5.7.xml.in
+data/oses/openbsd.org/openbsd-5.8.xml.in
 data/oses/solaris.xml.in
 data/oses/suse.xml.in
 data/oses/rhel.xml.in
 data/oses/windows.xml.in
 data/oses/opensuse.xml.in
 data/oses/ubuntu.xml.in
-data/oses/openbsd.xml.in
 data/oses/rhl.xml.in
 data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
-- 
2.4.3




More information about the Libosinfo mailing list