hal: Branch 'origin'

David Zeuthen david at kemper.freedesktop.org
Mon Mar 5 11:37:05 PST 2007


 configure.in                                        |    6 +
 fdi/Makefile.am                                     |    2 
 fdi/preprobe/10freedesktop/10-ide-drives.fdi        |   93 ++++++++++++++++++++
 fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi |   20 ++++
 fdi/preprobe/10freedesktop/Makefile.am              |   20 ++++
 fdi/preprobe/20thirdparty/Makefile.am               |    7 +
 fdi/preprobe/30user/Makefile.am                     |    7 +
 fdi/preprobe/Makefile.am                            |    3 
 8 files changed, 156 insertions(+), 2 deletions(-)

New commits:
diff-tree 302840ec67441f55ba07cae9991538e6c91f7fdc (from 2130ae571cbadb02c223fcd948b989649f33323c)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Feb 28 21:56:34 2007 -0500

    move preprobe fdi to hal-info and add workaround for Sandisk U3 Cruzer Micro
    
    See
    
     https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=208521
    
    for more information about the SanDisk unit.

diff --git a/configure.in b/configure.in
index 91cf24f..6ba0fb3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-AC_INIT(hal-info, 20070206, david at fubar.dk)
+AC_INIT(hal-info, 20070228, david at fubar.dk)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
@@ -34,6 +34,10 @@ fdi/information/Makefile
 fdi/information/10freedesktop/Makefile
 fdi/information/20thirdparty/Makefile
 fdi/information/30user/Makefile
+fdi/preprobe/Makefile
+fdi/preprobe/10freedesktop/Makefile
+fdi/preprobe/20thirdparty/Makefile
+fdi/preprobe/30user/Makefile
 ])
 
 dnl ==========================================================================
diff --git a/fdi/Makefile.am b/fdi/Makefile.am
index 7649b76..de65b16 100644
--- a/fdi/Makefile.am
+++ b/fdi/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = information
+SUBDIRS = information preprobe
 
 EXTRA_DIST = fdi.dtd
diff --git a/fdi/preprobe/10freedesktop/10-ide-drives.fdi b/fdi/preprobe/10freedesktop/10-ide-drives.fdi
new file mode 100644
index 0000000..0749499
--- /dev/null
+++ b/fdi/preprobe/10freedesktop/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/10freedesktop/20-broken-usb-sticks.fdi b/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
new file mode 100644
index 0000000..0d14053
--- /dev/null
+++ b/fdi/preprobe/10freedesktop/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/10freedesktop/Makefile.am b/fdi/preprobe/10freedesktop/Makefile.am
new file mode 100644
index 0000000..03da3e9
--- /dev/null
+++ b/fdi/preprobe/10freedesktop/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/20thirdparty/Makefile.am b/fdi/preprobe/20thirdparty/Makefile.am
new file mode 100644
index 0000000..88f2f05
--- /dev/null
+++ b/fdi/preprobe/20thirdparty/Makefile.am
@@ -0,0 +1,7 @@
+
+fdidir = $(datadir)/hal/fdi/preprobe/20thirdparty
+
+dist_fdi_DATA =
+
+
+
diff --git a/fdi/preprobe/30user/Makefile.am b/fdi/preprobe/30user/Makefile.am
new file mode 100644
index 0000000..da04d3e
--- /dev/null
+++ b/fdi/preprobe/30user/Makefile.am
@@ -0,0 +1,7 @@
+
+fdidir = $(sysconfdir)/hal/fdi/preprobe
+
+dist_fdi_DATA =
+
+
+
diff --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
new file mode 100644
index 0000000..40ff1e5
--- /dev/null
+++ b/fdi/preprobe/Makefile.am
@@ -0,0 +1,3 @@
+
+SUBDIRS = 10freedesktop 20thirdparty 30user
+


More information about the hal-commit mailing list