[PATCH v3 24/60] data: split macos into one file per OS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 configure.ac                           |   1 +
 data/oses/Makefile.am                  |   2 +-
 data/oses/apple.com/Makefile.am        |   1 +
 data/oses/apple.com/macosx-10.0.xml.in |  10 ++++
 data/oses/apple.com/macosx-10.1.xml.in |  11 ++++
 data/oses/apple.com/macosx-10.2.xml.in |  11 ++++
 data/oses/apple.com/macosx-10.3.xml.in |  11 ++++
 data/oses/apple.com/macosx-10.4.xml.in |  11 ++++
 data/oses/apple.com/macosx-10.5.xml.in |  11 ++++
 data/oses/apple.com/macosx-10.6.xml.in |  21 +++++++
 data/oses/apple.com/macosx-10.7.xml.in |  21 +++++++
 data/oses/macos.xml.in                 | 102 ---------------------------------
 po/POTFILES.in                         |   9 ++-
 13 files changed, 118 insertions(+), 104 deletions(-)
 create mode 100644 data/oses/apple.com/Makefile.am
 create mode 100644 data/oses/apple.com/macosx-10.0.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.1.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.2.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.3.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.4.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.5.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.6.xml.in
 create mode 100644 data/oses/apple.com/macosx-10.7.xml.in
 delete mode 100644 data/oses/macos.xml.in

diff --git a/configure.ac b/configure.ac
index 04ea0e6..1cec28a 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/apple.com/Makefile
 	data/oses/centos.org/Makefile
 	data/oses/debian.org/Makefile
 	data/oses/fedoraproject.org/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index d86dabd..02f482b 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,5 +1,6 @@
 
 SUBDIRS = \
+	apple.com \
 	altlinux.org \
 	centos.org \
 	debian.org \
@@ -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/apple.com/Makefile.am b/data/oses/apple.com/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/apple.com/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/apple.com/macosx-10.0.xml.in b/data/oses/apple.com/macosx-10.0.xml.in
new file mode 100644
index 0000000..7c4f4e4
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.1.xml.in b/data/oses/apple.com/macosx-10.1.xml.in
new file mode 100644
index 0000000..6bf7ab6
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.2.xml.in b/data/oses/apple.com/macosx-10.2.xml.in
new file mode 100644
index 0000000..09f9a1b
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.3.xml.in b/data/oses/apple.com/macosx-10.3.xml.in
new file mode 100644
index 0000000..12683a1
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.4.xml.in b/data/oses/apple.com/macosx-10.4.xml.in
new file mode 100644
index 0000000..ffefae0
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.5.xml.in b/data/oses/apple.com/macosx-10.5.xml.in
new file mode 100644
index 0000000..c869b89
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.6.xml.in b/data/oses/apple.com/macosx-10.6.xml.in
new file mode 100644
index 0000000..b34f531
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/apple.com/macosx-10.7.xml.in b/data/oses/apple.com/macosx-10.7.xml.in
new file mode 100644
index 0000000..f20c9c2
--- /dev/null
+++ b/data/oses/apple.com/macosx-10.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/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/po/POTFILES.in b/po/POTFILES.in
index f929fdc..2139249 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,14 @@ 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/apple.com/macosx-10.0.xml.in
+data/oses/apple.com/macosx-10.1.xml.in
+data/oses/apple.com/macosx-10.2.xml.in
+data/oses/apple.com/macosx-10.3.xml.in
+data/oses/apple.com/macosx-10.4.xml.in
+data/oses/apple.com/macosx-10.5.xml.in
+data/oses/apple.com/macosx-10.6.xml.in
+data/oses/apple.com/macosx-10.7.xml.in
 data/oses/centos.org/centos-6.0.xml.in
 data/oses/centos.org/centos-6.1.xml.in
 data/oses/centos.org/centos-6.2.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

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux