[Libosinfo] [PATCH v2 18/52] data: split centos into one file per OS

Daniel P. Berrange berrange at redhat.com
Mon Oct 5 15:31:22 UTC 2015


Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                           |   1 +
 data/oses/Makefile.am                  |   2 +-
 data/oses/centos.org/Makefile.am       |   1 +
 data/oses/centos.org/centos-6.0.xml.in |  48 +++++
 data/oses/centos.org/centos-6.1.xml.in |  47 +++++
 data/oses/centos.org/centos-6.2.xml.in |  47 +++++
 data/oses/centos.org/centos-6.3.xml.in |  55 ++++++
 data/oses/centos.org/centos-6.4.xml.in |  47 +++++
 data/oses/centos.org/centos-6.5.xml.in |  47 +++++
 data/oses/centos.org/centos-7.0.xml.in |  41 +++++
 data/oses/centos.xml.in                | 328 ---------------------------------
 po/POTFILES.in                         |   8 +-
 12 files changed, 342 insertions(+), 330 deletions(-)
 create mode 100644 data/oses/centos.org/Makefile.am
 create mode 100644 data/oses/centos.org/centos-6.0.xml.in
 create mode 100644 data/oses/centos.org/centos-6.1.xml.in
 create mode 100644 data/oses/centos.org/centos-6.2.xml.in
 create mode 100644 data/oses/centos.org/centos-6.3.xml.in
 create mode 100644 data/oses/centos.org/centos-6.4.xml.in
 create mode 100644 data/oses/centos.org/centos-6.5.xml.in
 create mode 100644 data/oses/centos.org/centos-7.0.xml.in
 delete mode 100644 data/oses/centos.xml.in

diff --git a/configure.ac b/configure.ac
index b3a9297..a91265c 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/centos.org/Makefile
 	data/schemas/Makefile
 	tools/Makefile
 	test/Makefile
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 9195755..13b18cf 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,11 +1,11 @@
 
 SUBDIRS = \
 	altlinux.org \
+	centos.org \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/oses/
 database_in_files =	\
-	centos.xml.in   \
 	debian.xml.in   \
 	dos.xml.in      \
 	fedora.xml.in   \
diff --git a/data/oses/centos.org/Makefile.am b/data/oses/centos.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/oses/centos.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/oses/centos.org/centos-6.0.xml.in b/data/oses/centos.org/centos-6.0.xml.in
new file mode 100644
index 0000000..3de8d90
--- /dev/null
+++ b/data/oses/centos.org/centos-6.0.xml.in
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.0">
+    <short-id>centos6.0</short-id>
+    <_name>CentOS 6.0</_name>
+    <version>6.0</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <clones id="http://redhat.com/rhel/6.0"/>
+
+    <!-- there is no obvious difference between x86 and x86_64 isos,
+         maybe we can lookup files on the iso to decide which arch it is? -->
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.0_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.0_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-6.1.xml.in b/data/oses/centos.org/centos-6.1.xml.in
new file mode 100644
index 0000000..b407875
--- /dev/null
+++ b/data/oses/centos.org/centos-6.1.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.1">
+    <short-id>centos6.1</short-id>
+    <_name>CentOS 6.1</_name>
+    <version>6.1</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.0"/>
+    <clones id="http://redhat.com/rhel/6.1"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.1_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.1_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-6.2.xml.in b/data/oses/centos.org/centos-6.2.xml.in
new file mode 100644
index 0000000..0a578e2
--- /dev/null
+++ b/data/oses/centos.org/centos-6.2.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.2">
+    <short-id>centos6.2</short-id>
+    <_name>CentOS 6.2</_name>
+    <version>6.2</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.1"/>
+    <clones id="http://redhat.com/rhel/6.2"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.2_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.2_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-6.3.xml.in b/data/oses/centos.org/centos-6.3.xml.in
new file mode 100644
index 0000000..db10952
--- /dev/null
+++ b/data/oses/centos.org/centos-6.3.xml.in
@@ -0,0 +1,55 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.3">
+    <short-id>centos6.3</short-id>
+    <_name>CentOS 6.3</_name>
+    <version>6.3</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.2"/>
+    <clones id="http://redhat.com/rhel/6.3"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.3_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.3_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64" live="true">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-6.3-x86_64-LiveDVD</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-6.4.xml.in b/data/oses/centos.org/centos-6.4.xml.in
new file mode 100644
index 0000000..3532f1b
--- /dev/null
+++ b/data/oses/centos.org/centos-6.4.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.4">
+    <short-id>centos6.4</short-id>
+    <_name>CentOS 6.4</_name>
+    <version>6.4</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.3"/>
+    <clones id="http://redhat.com/rhel/6.4"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.4_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.4_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-6.5.xml.in b/data/oses/centos.org/centos-6.5.xml.in
new file mode 100644
index 0000000..0972527
--- /dev/null
+++ b/data/oses/centos.org/centos-6.5.xml.in
@@ -0,0 +1,47 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/6.5">
+    <short-id>centos6.5</short-id>
+    <_name>CentOS 6.5</_name>
+    <version>6.5</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.4"/>
+    <clones id="http://redhat.com/rhel/6.5"/>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.5_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS_6.5_Final</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.org/centos-7.0.xml.in b/data/oses/centos.org/centos-7.0.xml.in
new file mode 100644
index 0000000..6c7d1ec
--- /dev/null
+++ b/data/oses/centos.org/centos-7.0.xml.in
@@ -0,0 +1,41 @@
+<libosinfo version="0.0.1">
+  <os id="http://centos.org/centos/7.0">
+    <short-id>centos7.0</short-id>
+    <_name>CentOS 7.0</_name>
+    <version>7.0</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.5"/>
+    <clones id="http://redhat.com/rhel/7.0"/>
+
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*CentOS 7 x86_64.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
deleted file mode 100644
index 15d9895..0000000
--- a/data/oses/centos.xml.in
+++ /dev/null
@@ -1,328 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://centos.org/centos/6.0">
-    <short-id>centos6.0</short-id>
-    <_name>CentOS 6.0</_name>
-    <version>6.0</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <clones id="http://redhat.com/rhel/6.0"/>
-
-    <!-- there is no obvious difference between x86 and x86_64 isos,
-         maybe we can lookup files on the iso to decide which arch it is? -->
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.0_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.0_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/6.1">
-    <short-id>centos6.1</short-id>
-    <_name>CentOS 6.1</_name>
-    <version>6.1</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.0"/>
-    <clones id="http://redhat.com/rhel/6.1"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.1_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.1_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/6.2">
-    <short-id>centos6.2</short-id>
-    <_name>CentOS 6.2</_name>
-    <version>6.2</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.1"/>
-    <clones id="http://redhat.com/rhel/6.2"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.2_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.2_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/6.3">
-    <short-id>centos6.3</short-id>
-    <_name>CentOS 6.3</_name>
-    <version>6.3</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.2"/>
-    <clones id="http://redhat.com/rhel/6.3"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.3_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.3_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64" live="true">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS-6.3-x86_64-LiveDVD</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/6.4">
-    <short-id>centos6.4</short-id>
-    <_name>CentOS 6.4</_name>
-    <version>6.4</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.3"/>
-    <clones id="http://redhat.com/rhel/6.4"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.4_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.4_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/6.5">
-    <short-id>centos6.5</short-id>
-    <_name>CentOS 6.5</_name>
-    <version>6.5</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.4"/>
-    <clones id="http://redhat.com/rhel/6.5"/>
-
-    <media arch="i686">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.5_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>CentOS_6.5_Final</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <ram>536870912</ram>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-  <os id="http://centos.org/centos/7.0">
-    <short-id>centos7.0</short-id>
-    <_name>CentOS 7.0</_name>
-    <version>7.0</version>
-    <_vendor>CentOS</_vendor>
-    <family>linux</family>
-    <distro>centos</distro>
-    <upgrades id="http://centos.org/centos/6.5"/>
-    <clones id="http://redhat.com/rhel/7.0"/>
-
-    <media arch="x86_64">
-      <iso>
-        <system-id>LINUX</system-id>
-        <volume-id>.*CentOS 7 x86_64.*</volume-id>
-      </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
-    </media>
-
-    <resources arch="all">
-      <minimum>
-        <n-cpus>1</n-cpus>
-        <cpu>1000000000</cpu>
-        <ram>1073741824</ram>
-        <storage>10737418240</storage>
-      </minimum>
-
-      <recommended>
-        <cpu>400000000</cpu>
-        <ram>1073741824</ram>
-        <storage>9663676416</storage>
-      </recommended>
-    </resources>
-
-    <installer>
-      <script id='http://redhat.com/scripts/rhel/jeos'/>
-      <script id='http://redhat.com/scripts/rhel/desktop'/>
-    </installer>
-  </os>
-
-</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 24e8119..581cde3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,13 @@ 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/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
+data/oses/centos.org/centos-6.3.xml.in
+data/oses/centos.org/centos-6.4.xml.in
+data/oses/centos.org/centos-6.5.xml.in
+data/oses/centos.org/centos-7.0.xml.in
 data/oses/netware.xml.in
 data/oses/solaris.xml.in
 data/oses/dos.xml.in
@@ -23,7 +30,6 @@ data/oses/opensuse.xml.in
 data/oses/macos.xml.in
 data/oses/debian.xml.in
 data/oses/ubuntu.xml.in
-data/oses/centos.xml.in
 data/oses/openbsd.xml.in
 data/oses/freebsd.xml.in
 data/oses/rhl.xml.in
-- 
2.4.3




More information about the Libosinfo mailing list