hal: Branch 'master'

David Zeuthen david at kemper.freedesktop.org
Mon Mar 26 17:21:55 PDT 2007


 configure.in             |    2 +-
 fdi/preprobe/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a3d88893a5086926711c98df101a0a6981c2f46a (from 312459e63b1e515b35ecf4800e609b38928c138f)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 20:21:55 2007 -0400

    rename fdi/preprobe/10freedesktop to fdi/preprobe/10osvendor

diff --git a/configure.in b/configure.in
index f9eb4e9..55fa853 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ fdi/information/Makefile
 fdi/information/10freedesktop/Makefile
 fdi/information/20thirdparty/Makefile
 fdi/preprobe/Makefile
-fdi/preprobe/10freedesktop/Makefile
+fdi/preprobe/10osvendor/Makefile
 fdi/preprobe/20thirdparty/Makefile
 ])
 
diff --git a/fdi/preprobe/10freedesktop/10-ide-drives.fdi b/fdi/preprobe/10freedesktop/10-ide-drives.fdi
deleted file mode 100644
index 0749499..0000000
--- a/fdi/preprobe/10freedesktop/10-ide-drives.fdi
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <device>
-    <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
-    <match key="storage.bus" string="ide">
-      <match key="storage.drive_type" string="disk">
-	<!-- IOMEGA Zip Drive -->
-	<match key="storage.model" contains_ncase="ZIP">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-	
-	<!-- IOMEGA CLIK! Drive -->
-	<match key="storage.model" contains_ncase="CLIK">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-	
-	<!-- Jaz -->
-	<match key="storage.model" contains_ncase="JAZ">
-          <merge key="storage.drive_type" type="string">jaz</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-      </match>
-    </match>
-
-    <match key="storage.bus" string="ide">
-      <match key="storage.drive_type" string="floppy">
-	<!-- IOMEGA Zip Drive -->
-	<match key="storage.model" contains_ncase="ZIP">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-	
-	<!-- IOMEGA CLIK! Drive -->
-	<match key="storage.model" contains_ncase="CLIK">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-	
-	<!-- Jaz -->
-	<match key="storage.model" contains_ncase="JAZ">
-          <merge key="storage.drive_type" type="string">jaz</merge>
-          <merge key="storage.no_partitions_hint" type="bool">true</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-          <!-- treat as floppy and data at partition 4; adjust device file -->
-	  <append key="block.device" type="string">4</append>
-	</match>
-      </match>
-    </match>
-
-    <match key="storage.bus" string="scsi">
-      <match key="storage.drive_type" string="disk">
-	<!-- IOMEGA Zip Drive -->
-	<match key="storage.model" contains_ncase="ZIP">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-	</match>
-	
-	<!-- IOMEGA CLIK! Drive -->
-	<match key="storage.model" contains_ncase="CLIK">
-          <merge key="storage.drive_type" type="string">zip</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-	</match>
-	
-	<!-- Jaz -->
-	<match key="storage.model" contains_ncase="JAZ">
-          <merge key="storage.drive_type" type="string">jaz</merge>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-	</match>
-      </match>
-    </match>
-
-      
-  </device>
-</deviceinfo>
diff --git a/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi b/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
deleted file mode 100644
index 0d14053..0000000
--- a/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-  <device>
-
-    <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
-	 Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
-    <match key="storage.bus" string="usb">
-      <match key="storage.drive_type" string="cdrom">
-	<match key="storage.lun" int="1">
-          <match key="storage.vendor" string="SanDisk">
-            <match key="storage.model" string="U3 Cruzer Micro">
-	      <merge key="info.ignore" type="bool">true</merge>
-	    </match>
-	  </match>
-	</match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/fdi/preprobe/10freedesktop/Makefile.am b/fdi/preprobe/10freedesktop/Makefile.am
deleted file mode 100644
index 03da3e9..0000000
--- a/fdi/preprobe/10freedesktop/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
-
-dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
-
-check:
-	for f in $(dist_fdi_DATA); do \
-            echo -n "Validate XML in $$f : "; \
-            xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
-            if test -s xmllint.error; \
-              then \
-                echo failed; \
-                cat xmllint.error; \
-                rm -f xmllint.error; \
-                exit 1; \
-            else \
-                echo ok; \
-                rm -f xmllint.error; \
-            fi; \
-        done;
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
new file mode 100644
index 0000000..0749499
--- /dev/null
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
+    <match key="storage.bus" string="ide">
+      <match key="storage.drive_type" string="disk">
+	<!-- IOMEGA Zip Drive -->
+	<match key="storage.model" contains_ncase="ZIP">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- IOMEGA CLIK! Drive -->
+	<match key="storage.model" contains_ncase="CLIK">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- Jaz -->
+	<match key="storage.model" contains_ncase="JAZ">
+          <merge key="storage.drive_type" type="string">jaz</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+      </match>
+    </match>
+
+    <match key="storage.bus" string="ide">
+      <match key="storage.drive_type" string="floppy">
+	<!-- IOMEGA Zip Drive -->
+	<match key="storage.model" contains_ncase="ZIP">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- IOMEGA CLIK! Drive -->
+	<match key="storage.model" contains_ncase="CLIK">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+	
+	<!-- Jaz -->
+	<match key="storage.model" contains_ncase="JAZ">
+          <merge key="storage.drive_type" type="string">jaz</merge>
+          <merge key="storage.no_partitions_hint" type="bool">true</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- treat as floppy and data at partition 4; adjust device file -->
+	  <append key="block.device" type="string">4</append>
+	</match>
+      </match>
+    </match>
+
+    <match key="storage.bus" string="scsi">
+      <match key="storage.drive_type" string="disk">
+	<!-- IOMEGA Zip Drive -->
+	<match key="storage.model" contains_ncase="ZIP">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+	
+	<!-- IOMEGA CLIK! Drive -->
+	<match key="storage.model" contains_ncase="CLIK">
+          <merge key="storage.drive_type" type="string">zip</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+	
+	<!-- Jaz -->
+	<match key="storage.model" contains_ncase="JAZ">
+          <merge key="storage.drive_type" type="string">jaz</merge>
+          <merge key="storage.requires_eject" type="bool">true</merge>
+	</match>
+      </match>
+    </match>
+
+      
+  </device>
+</deviceinfo>
diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
new file mode 100644
index 0000000..0d14053
--- /dev/null
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
+	 Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
+    <match key="storage.bus" string="usb">
+      <match key="storage.drive_type" string="cdrom">
+	<match key="storage.lun" int="1">
+          <match key="storage.vendor" string="SanDisk">
+            <match key="storage.model" string="U3 Cruzer Micro">
+	      <merge key="info.ignore" type="bool">true</merge>
+	    </match>
+	  </match>
+	</match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/fdi/preprobe/10osvendor/Makefile.am b/fdi/preprobe/10osvendor/Makefile.am
new file mode 100644
index 0000000..03da3e9
--- /dev/null
+++ b/fdi/preprobe/10osvendor/Makefile.am
@@ -0,0 +1,20 @@
+
+fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
+
+dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
+
+check:
+	for f in $(dist_fdi_DATA); do \
+            echo -n "Validate XML in $$f : "; \
+            xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
+            if test -s xmllint.error; \
+              then \
+                echo failed; \
+                cat xmllint.error; \
+                rm -f xmllint.error; \
+                exit 1; \
+            else \
+                echo ok; \
+                rm -f xmllint.error; \
+            fi; \
+        done;
diff --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
index 74273d3..36cf6e7 100644
--- a/fdi/preprobe/Makefile.am
+++ b/fdi/preprobe/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = 10freedesktop 20thirdparty
+SUBDIRS = 10osvendor 20thirdparty
 


More information about the hal-commit mailing list