from:"Dan Sheppard"

Bug#353771: License of your discover-updater.pl script?

2006-08-15 Thread Dan Sheppard


Petter Reinholdtsen wrote:

Hi

I am taking over maintainence of the discover-data package in Debian,
and came across your script discover-updater.pl in bug #353771.  I
would like to include it in the discover-data source distribution.  To
do that, I need to know the license of the script.

The scripts currently in discover-data is licensed using GNU GPL and a
BSD-variant.  I would prefer it if the script was licensed using one
of the already used licenses, to avoid adding extra load on those
having to evaluate the license of the disocover-data package.


Hi,

I'm not sure the script is really of merchantable quality (it was mainly a use 
once and throw away type thing), but you are welcome to use it and licence it in 
whatever way you see fit, if you think it's worth it. To make things easy, I'll 
declare now that it's in the public domain.


Thanks,
Dan.


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#352815: Patch resubmission

2006-02-20 Thread Dan Sheppard


Resubmission of patch with better header lines.

Dan.
--- pci-device.xml	2005-02-13 18:30:32.0 +
+++ pci-device.xml	2006-02-13 16:29:04.0 +
@@ -19054,11 +19054,14 @@
   /device
   device model='2482' vendor='8086' model_name='82801CA/CAM USB (Hub #1)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2482' model_name='82801CA/CAM USB (Hub #1)' subsystem_name='ThinkPad A/T/X Series' subvendor='1014' vendor='8086' subdevice='0220'/
@@ -19074,11 +19077,14 @@
   device model='2483' model_name='82801CA/CAM SMBus Controller' subsystem_name='vpr Matrix 170B4' subvendor='8086' vendor='8086' subdevice='1958'/
   device model='2484' vendor='8086' model_name='82801CA/CAM USB (Hub #2)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2484' model_name='82801CA/CAM USB (Hub #2)' subsystem_name='ThinkPad A/T/X Series' subvendor='1014' vendor='8086' subdevice='0220'/
@@ -19123,11 +19129,14 @@
   device model='2486' model_name=82801CA/CAM AC'97 Modem Controller subsystem_name='MD56ORD V.92 MDC Modem' subvendor='14f1' vendor='8086' subdevice='5421'/
   device model='2487' vendor='8086' model_name='82801CA/CAM USB (Hub #3)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2487' model_name='82801CA/CAM USB (Hub #3)' subsystem_name='ThinkPad A/T/X Series' subvendor='1014' vendor='8086' subdevice='0220'/
@@ -19180,9 +19189,14 @@
   device model='24c1' vendor='8086' model_name='82801DBL (ICH4-L) IDE Controller'/
   device model='24c2' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='24c2' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1' subsystem_name='NetVista A30p' subvendor='1014' vendor='8086' subdevice='0267'/
@@ -19203,9 +19217,14 @@
   device model='24c3' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller' subsystem_name='Cx9 / Vx9 mainboard' subvendor='4c53' vendor='8086' subdevice='1090'/
   device model='24c4' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='24c4' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2' subsystem_name='NetVista A30p' subvendor='1014' vendor='8086' subdevice='0267'/
@@ -19240,9 +19259,14 @@
   device model='24c6' model_name=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller subsystem_name='MIM2000' subvendor='1071' vendor='8086' subdevice='8160'/
   device model='24c7' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data

Bug#352815: Discover reports wrong linux/module/name for USB hcds in kernel 2.6 for some devices

2006-02-14 Thread Dan Sheppard


Package: discover-data
Version: 2.2005.02.13-1

The name of the usb HCD kerne; modules changed between kernel versions 
2.4 and 2.6.


This means that linux/module/name needs to return different values, 
based on the kernel version, for devices requiring these modules.


In pci-devices.xml this can be represented by a version attribute on 
data elements.


For most devices this has indeed been done. Discover retruns the correct 
module name, depending on kernel version, if it is supplied to discover 
supplying the output of uname -r as the value of the --data-version 
option to discover, and this mechanism is used in, for example, 
discover-modprobe.


  module_details=$(${discover} --data-path=linux/module/name \
  --data-path=linux/module/options --format=%s %s \
  --data-version=`uname -r` ${types} | grep -E -v '^ *$')

This is because the corresponding device tag in pci-devices.xml contains 
a snippet like the following.


data class='linux'
  data version='[2.6,inf)' class='module'
data class='name'uhci-hcd/data
  /data
  data version='[2.2,2.6)' class='module'
data class='name'usb-uhci/data
  /data
  data class='last-updated'2004-04-08/data
  data class='last-updated-by'[EMAIL PROTECTED]/data
/data

However, for a few devices this versioning has not been applied, and 
discover returns the wrong answer for 2.6 kernels. That is because their 
 device element contains only the following.


data class='linux'
  data class='module'
data class='name'usb-uhci/data
  /data
  data class='last-updated'2004-08-31/data
  data class='last-updated-by'[EMAIL PROTECTED]/data
/data

With such an entry without versioning, discover will return the correct 
value for 2.4 kernels but not for 2.6.


It seems to me that the correct fix would be to replace entries which 
look like the latter snippet with one which looks like the former. I 
cannot envisage likely situations where this will cause any problems to 
existing setups, and will cause these devices to function correctly with 
discover on 2.6 kernels.


I have encountered this problem, in practice, on a modern machine with 
such a device running under 2.6. Discover failed, I applied a patch, as 
described above, and it now works.


I attach the patch for your consideration.

Dan.
--- /lib/discover/pci-device.xml2005-02-13 18:30:32.0 +
+++ /root/initrd-nfs/lib/discover/pci-device.xml2006-02-13 
16:29:04.0 +
@@ -19054,11 +19054,14 @@
   /device
   device model='2482' vendor='8086' model_name='82801CA/CAM USB (Hub #1)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2482' model_name='82801CA/CAM USB (Hub #1)' 
subsystem_name='ThinkPad A/T/X Series' subvendor='1014' vendor='8086' 
subdevice='0220'/
@@ -19074,11 +19077,14 @@
   device model='2483' model_name='82801CA/CAM SMBus Controller' 
subsystem_name='vpr Matrix 170B4' subvendor='8086' vendor='8086' 
subdevice='1958'/
   device model='2484' vendor='8086' model_name='82801CA/CAM USB (Hub #2)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2484' model_name='82801CA/CAM USB (Hub #2)' 
subsystem_name='ThinkPad A/T/X Series' subvendor='1014' vendor='8086' 
subdevice='0220'/
@@ -19123,11 +19129,14 @@
   device model='2486' model_name=82801CA/CAM AC'97 Modem Controller 
subsystem_name='MD56ORD V.92 MDC Modem' subvendor='14f1' vendor='8086' 
subdevice='5421'/
   device model='2487' vendor='8086' model_name='82801CA/CAM USB (Hub #3)'
 data class='linux'
-  data class='module'
+  data version='[2.6,inf)' class='module'
+data class='name'uhci-hcd/data
+  /data
+  data version='[2.2,2.6)' class='module'
 data class='name'usb-uhci/data
   /data
-  data class='last-updated'2004-08-31/data
-  data class='last-updated-by'[EMAIL PROTECTED]/data
+  data class='last-updated'2006-02-13/data
+  data class='last-updated-by'[EMAIL PROTECTED]/data
 /data
   /device
   device model='2487' model_name='82801CA/CAM USB (Hub #3)' 
subsystem_name='ThinkPad A/T/X Series'

Bug#353771: License of your discover-updater.pl script?

Bug#352815: Patch resubmission

Bug#352815: Discover reports wrong linux/module/name for USB hcds in kernel 2.6 for some devices

3 matches

Site Navigation

Mail list logo

Footer information