[virt-tools-list] [PATCH libosinfo 08/10] Remove 'generic-linux' which are not an OS distro entries

Daniel P. Berrange berrange at redhat.com
Thu Mar 22 11:30:24 UTC 2012


From: "Daniel P. Berrange" <berrange at redhat.com>

The 'generic-linux.xml'  file was only present because virt-install
had some generic entries. Compatibility for virt-install does not
need to be in libosinfo itself.
---
 data/oses/Makefile.am       |    1 -
 data/oses/generic-linux.xml |   60 -------------------------------------------
 2 files changed, 0 insertions(+), 61 deletions(-)
 delete mode 100644 data/oses/generic-linux.xml

diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 343119f..98fa47c 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -6,7 +6,6 @@ database_DATA =     \
   dos.xml           \
   fedora.xml        \
   freebsd.xml	    \
-  generic-linux.xml \
   mandriva.xml      \
   mandrake.xml      \
   netbsd.xml	    \
diff --git a/data/oses/generic-linux.xml b/data/oses/generic-linux.xml
deleted file mode 100644
index 48b92b3..0000000
--- a/data/oses/generic-linux.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://kernel.org/linux/24">
-    <short-id>linux24</short-id>
-    <name>Generic 2.4.x kernel</name>
-    <version>2.4</version>
-    <vendor>Linux Kernel Developers</vendor>
-    <family>linux</family>
-  </os>
-
-  <os id="http://kernel.org/linux/26">
-    <short-id>linux26</short-id>
-    <name>Generic 2.6.x kernel</name>
-    <version>2.6</version>
-    <vendor>Linux Kernel Developers</vendor>
-  </os>
-
-  <os id="http://kernel.org/linux/virtio/26">
-    <short-id>linuxvirtio26</short-id>
-    <name>Generic 2.6.25 or later kernel with virtio</name>
-    <version>2.6</version>
-    <vendor>Linux Kernel Developers</vendor>
-    <family>linux</family>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
-    </devices>
-  </os>
-
-  <!-- Following clones only exists for backwards compatiblity reasons -->
-
-  <os id="http://kernel.org/generic/24">
-    <short-id>generic24</short-id>
-    <name>Generic 2.4.x kernel</name>
-    <version>2.4</version>
-    <vendor>Linux Kernel Developers</vendor>
-    <family>linux</family>
-    <clones id="http://kernel.org/linux/24"/>
-  </os>
-
-  <os id="http://kernel.org/generic/26">
-    <short-id>generic26</short-id>
-    <name>Generic 2.6.x kernel</name>
-    <version>2.6</version>
-    <vendor>Linux Kernel Developers</vendor>
-    <family>linux</family>
-    <clones id="http://kernel.org/linux/26"/>
-  </os>
-
-  <os id="http://kernel.org/virtio/26">
-    <short-id>virtio26</short-id>
-    <name>Generic 2.6.25 or later kernel with virtio</name>
-    <version>2.6</version>
-    <vendor>Linux Kernel Developers</vendor>
-    <family>linux</family>
-    <clones id="http://kernel.org/linux/virtio/26"/>
-  </os>
-
-</libosinfo>
-- 
1.7.7.6




More information about the virt-tools-list mailing list