Attachment 306554 Details for Bug 280251 – patch updating hal config to match upstream hal

[patch] patch updating hal config to match upstream hal

pilot-link-0.12.2-20-krp.patch (text/plain), 30.77 KB, created by Kevin R. Page on 2008-05-23 23:22:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin R. Page

Created: 2008-05-23 23:22:20 UTC

Size: 30.77 KB

patch

obsolete

>diff -urN pilot-link.orig/F-8/10-usb-pda-palm.fdi pilot-link/F-8/10-usb-pda-palm.fdi
>--- pilot-link.orig/F-8/10-usb-pda-palm.fdi	1970-01-01 01:00:00.000000000 +0100
>+++ pilot-link/F-8/10-usb-pda-palm.fdi	2008-05-23 21:15:25.000000000 +0200
>@@ -0,0 +1,286 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<deviceinfo version="0.2">
>+
>+  <device>
>+
>+    
>+    <match key="info.bus" string="usb_device">
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x054c">
>+        
>+        <match key="usb_device.product_id" int="0x000a">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0038">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0066">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0095">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x009a">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x00da">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x00e9">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0144">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0169">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x082d">
>+        
>+        <match key="usb_device.product_id" int="0x0100">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0200">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0300">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x0830">
>+        
>+        <match key="usb_device.product_id" int="0x0001">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0002">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0003">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0010">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0011">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0020">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0030">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0031">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0040">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0050">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0051">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0052">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0053">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0060">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0061">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0062">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0063">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0070">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0071">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0x0080">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0099">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        <match key="usb_device.product_id" int="0x0100">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x04e8">
>+        
>+        <match key="usb_device.product_id" int="0x8001">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x091e">
>+        
>+        <match key="usb_device.product_id" int="0x0004">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x0c88">
>+        
>+        <match key="usb_device.product_id" int="0x0021">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+        
>+        <match key="usb_device.product_id" int="0xa226">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x12ef">
>+        
>+        <match key="usb_device.product_id" int="0x0100">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+      
>+      <match key="usb_device.vendor_id" int="0x4766">
>+        
>+        <match key="usb_device.product_id" int="0x0001">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+   
>+      
>+      <match key="usb_device.vendor_id" int="0x081e">
>+        
>+        <match key="usb_device.product_id" int="0xdf00">
>+          <append key="info.capabilities" type="strlist">pda</append>
>+          <merge key="pda.platform" type="string">palm</merge>
>+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
>+        </match>
>+      </match>
>+
>+    </match>
>+
>+  </device>
>+  
>+</deviceinfo>
>diff -urN pilot-link.orig/F-8/19-palm-acl-management.fdi pilot-link/F-8/19-palm-acl-management.fdi
>--- pilot-link.orig/F-8/19-palm-acl-management.fdi	1970-01-01 01:00:00.000000000 +0100
>+++ pilot-link/F-8/19-palm-acl-management.fdi	2008-05-23 21:18:43.000000000 +0200
>@@ -0,0 +1,17 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<deviceinfo version="0.2">
>+
>+  <device>
>+
>+    <match key="info.capabilities" contains="pda">
>+      <match key="pda.platform" string="palm">
>+        <append key="info.capabilities" type="strlist">access_control</append>
>+        <merge key="access_control.type" type="string">pda</merge>
>+        <merge key="access_control.file" type="copy_property">pda.palm.hotsync_interface</merge>
>+      </match>
>+    </match>
>+
>+  </device>
>+</deviceinfo>
>+
>diff -urN pilot-link.orig/F-8/19-pam-acl-management.fdi pilot-link/F-8/19-pam-acl-management.fdi
>--- pilot-link.orig/F-8/19-pam-acl-management.fdi	2008-02-12 15:04:10.000000000 +0100
>+++ pilot-link/F-8/19-pam-acl-management.fdi	1970-01-01 01:00:00.000000000 +0100
>@@ -1,241 +0,0 @@
>-<?xml version="1.0" encoding="UTF-8"?>
>-
>-<deviceinfo version="0.2">
>-
>-  <device>
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x054c">
>-      
>-      <match key="usb_device.product_id" int="0x000a">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0038">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
>-      </match>
>-       
>-      <match key="usb_device.product_id" int="0x0066">
>-          <append key="info.capabilities" type="strlist">access_control</append>
>-          <merge key="access_control.type" type="string">pda</merge>
>-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0095">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x009a">
>-          <append key="info.capabilities" type="strlist">access_control</append>
>-          <merge key="access_control.type" type="string">pda</merge>
>-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x00da">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x00e9">
>-          <append key="info.capabilities" type="strlist">access_control</append>
>-          <merge key="access_control.type" type="string">pda</merge>
>-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0144">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0169">
>-          <append key="info.capabilities" type="strlist">access_control</append>
>-          <merge key="access_control.type" type="string">pda</merge>
>-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x082d">
>-      
>-      <match key="usb_device.product_id" int="0x0100">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0200">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0300">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
>-      </match>
>-
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x0830">
>-      
>-      <match key="usb_device.product_id" int="0x0001">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0002">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0003">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0020">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0030">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-                                        
>-      <match key="usb_device.product_id" int="0x0031">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0040">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0050">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0060">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0061">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0070">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x0080">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x04e8">
>-
>-      <match key="usb_device.product_id" int="0x6601">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0x8001">
>-         <append key="info.capabilities" type="strlist">access_control</append>
>-         <merge key="access_control.type" type="string">pda</merge>
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
>-      </match>
>-
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x091e">
>-      
>-      <match key="usb_device.product_id" int="0x0004">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x0c88">
>-      
>-      <match key="usb_device.product_id" int="0x0021">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-      
>-      <match key="usb_device.product_id" int="0xa226"> 
>-         <append key="info.capabilities" type="strlist">access_control</append> 
>-         <merge key="access_control.type" type="string">pda</merge> 
>-         <merge key="access_control.file" type="copy_property">linux.device_file</merge> 
>-      </match>
>-                                    
>-   </match>
>-
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x12ef">
>-      
>-      <match key="usb_device.product_id" int="0x0100">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-
>-   </match>
>-
>-   
>-   <match key="usb_device.vendor_id" int="0x4766">
>-      
>-      <match key="usb_device.product_id" int="0x0001">
>-        <append key="info.capabilities" type="strlist">access_control</append>
>-        <merge key="access_control.type" type="string">pda</merge>
>-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
>-      </match>
>-
>-   </match>
>-   
>-
>-  </device>
>-</deviceinfo>
>diff -urN pilot-link.orig/F-8/pilot-link.spec pilot-link/F-8/pilot-link.spec
>--- pilot-link.orig/F-8/pilot-link.spec	2008-05-23 20:39:13.000000000 +0200
>+++ pilot-link/F-8/pilot-link.spec	2008-05-24 01:07:55.000000000 +0200
>@@ -3,7 +3,7 @@
> 
> Name: pilot-link
> Version: 0.12.2
>-Release: 19%{?dist}
>+Release: 20%{?dist}
> Epoch: 2
> License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
> Group: Applications/Communications
>@@ -11,12 +11,14 @@
> URL: http://www.pilot-link.org/
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Source0: pilot-link-%{version}.tar.bz2
>-Source1: 19-pam-acl-management.fdi
>-Source2: pilot-device-file.policy
>-Source3: blacklist-visor
>-Source4: README.fedora
>-Source5: 60-pilot.perms
>-Source6: 60-pilot.rules
>+# Source1 through Source3 can be dropped if/when hal is updated to 0.5.11
>+Source1: 10-usb-pda-palm.fdi
>+Source2: 19-palm-acl-management.fdi
>+Source3: pilot-device-file.policy
>+Source4: blacklist-visor
>+Source5: README.fedora
>+Source6: 60-pilot.perms
>+Source7: 60-pilot.rules
> 
> ExcludeArch: s390 s390x
> #Patch1: pilot-link-0.11.0-perlmd5.patch  # May be still applied
>@@ -141,24 +143,26 @@
> # remove broken prog
> rm -f %{buildroot}%{_bindir}/pilot-prc
> 
>-# Install hal rules file.
>+# Install hal rules files
>+mkdir -p %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/
>+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi
> mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
>-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
>+install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi
> 
> # Install PolicyKit
> mkdir -p %{buildroot}%{_datadir}/PolicyKit/policy
>-install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy
>+install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy
> 
> # Put visor to blacklist
> mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
>-install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
>+install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
> 
> # put README.fedora into tree
>-cp %{SOURCE4} README.fedora
>+cp %{SOURCE5} README.fedora
> 
> # install visor configs to share/udev
>-install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev
> install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev
>+install -p -m644 %{SOURCE7} %{buildroot}%{_datadir}/pilot-link/udev
> 
> %post -p /sbin/ldconfig
> 
>@@ -178,7 +182,8 @@
> %{_bindir}/*
> %{_datadir}/pilot-link
> %{_mandir}/man?/*
>-%{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
>+%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi
>+%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi
> %{_datadir}/PolicyKit/policy/pilot-device-file.policy
> %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
> 
>@@ -191,6 +196,13 @@
> %{_datadir}/aclocal/*.m4
> 
> %changelog
>+* Fri May 23 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.2-20
>+- Resolves: #280251
>+  change hal rules to subsitute for pending hal-0.5.11
>+  config parity with hal-0.5.11 (for Palms) but added verbosity to workaround #435093
>+- Correct filename from 19-pam-acl-management.fdi to 19-palm-acl-management.fdi
>+- A post-install reboot may be required to circumvent #431377
>+
> * Tue Feb 12 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-19
> - change hal rules 
>   usb structure name was changed to usb_device

Actions: View | Diff

Attachments on bug 280251: 284421 | 294103 | 294520 | 294521 | 295803 | 306554 | 308517 | 309418