[Libosinfo] [PATCH 12/39] data: split macos into one file per OS
Daniel P. Berrange
berrange at redhat.com
Mon Sep 28 15:51:30 UTC 2015
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
configure.ac | 1 +
data/oses/Makefile.am | 2 +-
data/oses/macos.xml.in | 102 --------------------------------------
data/oses/macos/Makefile.am | 1 +
data/oses/macos/macosx10.0.xml.in | 10 ++++
data/oses/macos/macosx10.1.xml.in | 11 ++++
data/oses/macos/macosx10.2.xml.in | 11 ++++
data/oses/macos/macosx10.3.xml.in | 11 ++++
data/oses/macos/macosx10.4.xml.in | 11 ++++
data/oses/macos/macosx10.5.xml.in | 11 ++++
data/oses/macos/macosx10.6.xml.in | 21 ++++++++
data/oses/macos/macosx10.7.xml.in | 21 ++++++++
po/POTFILES.in | 9 +++-
13 files changed, 118 insertions(+), 104 deletions(-)
delete mode 100644 data/oses/macos.xml.in
create mode 100644 data/oses/macos/Makefile.am
create mode 100644 data/oses/macos/macosx10.0.xml.in
create mode 100644 data/oses/macos/macosx10.1.xml.in
create mode 100644 data/oses/macos/macosx10.2.xml.in
create mode 100644 data/oses/macos/macosx10.3.xml.in
create mode 100644 data/oses/macos/macosx10.4.xml.in
create mode 100644 data/oses/macos/macosx10.5.xml.in
create mode 100644 data/oses/macos/macosx10.6.xml.in
create mode 100644 data/oses/macos/macosx10.7.xml.in
diff --git a/configure.ac b/configure.ac
index afdafb8..86af391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AC_CONFIG_FILES([
data/oses/fedora/Makefile
data/oses/freebsd/Makefile
data/oses/gnome/Makefile
+ data/oses/macos/Makefile
data/oses/msdos/Makefile
data/schemas/Makefile
tools/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 44cceec..de3d323 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = \
fedora \
freebsd \
gnome \
+ macos \
msdos \
$(NULL)
@@ -16,7 +17,6 @@ database_in_files = \
mandrake.xml.in \
netbsd.xml.in \
netware.xml.in \
- macos.xml.in \
openbsd.xml.in \
opensuse.xml.in \
rhl.xml.in \
diff --git a/data/oses/macos.xml.in b/data/oses/macos.xml.in
deleted file mode 100644
index 4b4a931..0000000
--- a/data/oses/macos.xml.in
+++ /dev/null
@@ -1,102 +0,0 @@
-<libosinfo version="0.0.1">
-
- <os id="http://apple.com/macosx/10.0">
- <short-id>macosx10.0</short-id>
- <_name>MacOS X Cheetah</_name>
- <version>10.0</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- </os>
-
- <os id="http://apple.com/macosx/10.1">
- <short-id>macosx10.1</short-id>
- <_name>MacOS X Puma</_name>
- <version>10.1</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.0" />
- </os>
-
- <os id="http://apple.com/macosx/10.2">
- <short-id>macosx10.2</short-id>
- <_name>MacOS X Jaguar</_name>
- <version>10.2</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.1" />
- </os>
-
- <os id="http://apple.com/macosx/10.3">
- <short-id>macosx10.3</short-id>
- <_name>MacOS X Panther</_name>
- <version>10.3</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.2" />
- </os>
-
- <os id="http://apple.com/macosx/10.4">
- <short-id>macosx10.4</short-id>
- <_name>MacOS X Tiger</_name>
- <version>10.4</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.3" />
- </os>
-
- <os id="http://apple.com/macosx/10.5">
- <short-id>macosx10.5</short-id>
- <_name>MacOS X Leopard</_name>
- <version>10.5</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.4" />
- </os>
-
- <os id="http://apple.com/macosx/10.6">
- <short-id>macosx10.6</short-id>
- <_name>MacOS X Snow Leopard</_name>
- <version>10.6</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.5" />
-
- <resources arch="all">
- <minimum>
- <n-cpus>2</n-cpus>
- <cpu>1600000000</cpu>
- <ram>2147483648</ram>
- <storage>7516192768</storage>
- </minimum>
- </resources>
-
- </os>
-
- <os id="http://apple.com/macosx/10.7">
- <short-id>macosx10.7</short-id>
- <_name>MacOS X Lion</_name>
- <version>10.7</version>
- <_vendor>Apple Inc.</_vendor>
- <family>darwin</family>
- <distro>osx</distro>
- <upgrades id="http://apple.com/macosx/10.6" />
-
- <resources arch="all">
- <minimum>
- <n-cpus>2</n-cpus>
- <cpu>1600000000</cpu>
- <ram>2147483648</ram>
- <storage>7516192768</storage>
- </minimum>
- </resources>
-
- </os>
-
-</libosinfo>
diff --git a/data/oses/macos/Makefile.am b/data/oses/macos/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/macos/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/macos/macosx10.0.xml.in b/data/oses/macos/macosx10.0.xml.in
new file mode 100644
index 0000000..7c4f4e4
--- /dev/null
+++ b/data/oses/macos/macosx10.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.0">
+ <short-id>macosx10.0</short-id>
+ <_name>MacOS X Cheetah</_name>
+ <version>10.0</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.1.xml.in b/data/oses/macos/macosx10.1.xml.in
new file mode 100644
index 0000000..6bf7ab6
--- /dev/null
+++ b/data/oses/macos/macosx10.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.1">
+ <short-id>macosx10.1</short-id>
+ <_name>MacOS X Puma</_name>
+ <version>10.1</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.0" />
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.2.xml.in b/data/oses/macos/macosx10.2.xml.in
new file mode 100644
index 0000000..09f9a1b
--- /dev/null
+++ b/data/oses/macos/macosx10.2.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.2">
+ <short-id>macosx10.2</short-id>
+ <_name>MacOS X Jaguar</_name>
+ <version>10.2</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.1" />
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.3.xml.in b/data/oses/macos/macosx10.3.xml.in
new file mode 100644
index 0000000..12683a1
--- /dev/null
+++ b/data/oses/macos/macosx10.3.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.3">
+ <short-id>macosx10.3</short-id>
+ <_name>MacOS X Panther</_name>
+ <version>10.3</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.2" />
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.4.xml.in b/data/oses/macos/macosx10.4.xml.in
new file mode 100644
index 0000000..ffefae0
--- /dev/null
+++ b/data/oses/macos/macosx10.4.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.4">
+ <short-id>macosx10.4</short-id>
+ <_name>MacOS X Tiger</_name>
+ <version>10.4</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.3" />
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.5.xml.in b/data/oses/macos/macosx10.5.xml.in
new file mode 100644
index 0000000..c869b89
--- /dev/null
+++ b/data/oses/macos/macosx10.5.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.5">
+ <short-id>macosx10.5</short-id>
+ <_name>MacOS X Leopard</_name>
+ <version>10.5</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.4" />
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.6.xml.in b/data/oses/macos/macosx10.6.xml.in
new file mode 100644
index 0000000..b34f531
--- /dev/null
+++ b/data/oses/macos/macosx10.6.xml.in
@@ -0,0 +1,21 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.6">
+ <short-id>macosx10.6</short-id>
+ <_name>MacOS X Snow Leopard</_name>
+ <version>10.6</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.5" />
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>2</n-cpus>
+ <cpu>1600000000</cpu>
+ <ram>2147483648</ram>
+ <storage>7516192768</storage>
+ </minimum>
+ </resources>
+
+ </os>
+</libosinfo>
diff --git a/data/oses/macos/macosx10.7.xml.in b/data/oses/macos/macosx10.7.xml.in
new file mode 100644
index 0000000..f20c9c2
--- /dev/null
+++ b/data/oses/macos/macosx10.7.xml.in
@@ -0,0 +1,21 @@
+<libosinfo version="0.0.1">
+ <os id="http://apple.com/macosx/10.7">
+ <short-id>macosx10.7</short-id>
+ <_name>MacOS X Lion</_name>
+ <version>10.7</version>
+ <_vendor>Apple Inc.</_vendor>
+ <family>darwin</family>
+ <distro>osx</distro>
+ <upgrades id="http://apple.com/macosx/10.6" />
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>2</n-cpus>
+ <cpu>1600000000</cpu>
+ <ram>2147483648</ram>
+ <storage>7516192768</storage>
+ </minimum>
+ </resources>
+
+ </os>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e51115..bb77fe5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -103,6 +103,14 @@ data/oses/gnome/gnome3.8.xml.in
data/oses/gnome/gnome-continuous-3.10.xml.in
data/oses/gnome/gnome-continuous-3.12.xml.in
data/oses/gnome/gnome-continuous-3.14.xml.in
+data/oses/macos/macosx10.0.xml.in
+data/oses/macos/macosx10.1.xml.in
+data/oses/macos/macosx10.2.xml.in
+data/oses/macos/macosx10.3.xml.in
+data/oses/macos/macosx10.4.xml.in
+data/oses/macos/macosx10.5.xml.in
+data/oses/macos/macosx10.6.xml.in
+data/oses/macos/macosx10.7.xml.in
data/oses/msdos/msdos6.22.xml.in
data/oses/netware.xml.in
data/oses/solaris.xml.in
@@ -113,7 +121,6 @@ data/oses/suse.xml.in
data/oses/rhel.xml.in
data/oses/windows.xml.in
data/oses/opensuse.xml.in
-data/oses/macos.xml.in
data/oses/ubuntu.xml.in
data/oses/openbsd.xml.in
data/oses/rhl.xml.in
--
2.4.3
More information about the Libosinfo
mailing list