packages: kernel-vanilla/kernel-vanilla.spec, kernel-vanilla/kernel-vanilla...

[mmazur]

Author: mmazur                       Date: Fri Nov 12 17:44:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- add ommitted modules
- small patch for missing usbids in one driver (nothing else, just IDs)

---- Files affected:
packages/kernel-vanilla:
   kernel-vanilla.spec (1.228 -> 1.229) , kernel-vanilla-usbnet-plusb-pl2501.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel-vanilla/kernel-vanilla.spec
diff -u packages/kernel-vanilla/kernel-vanilla.spec:1.228 packages/kernel-vanilla/kernel-vanilla.spec:1.229
--- packages/kernel-vanilla/kernel-vanilla.spec:1.228	Fri Nov 12 12:57:17 2010
+++ packages/kernel-vanilla/kernel-vanilla.spec	Fri Nov 12 18:44:52 2010
@@ -56,7 +56,7 @@
 
 %define		basever	2.6.36
 %define		postver	%{nil}
-%define		rel		1
+%define		rel		2
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -83,6 +83,7 @@
 Source7:	kernel-vanilla-multiarch.conf
 Source8:	kernel-vanilla-preempt-nort.config
 Source9:	kernel-vanilla-no-preempt-nort.config
+Patch0:		kernel-vanilla-usbnet-plusb-pl2501.patch
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
 %ifarch sparc sparc64
@@ -421,6 +422,9 @@
 %{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
 %endif
 
+#new usb ids
+%patch0 -p1
+
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}_%{alt_kernel}#g' Makefile
 
@@ -690,6 +694,7 @@
 %dir /lib/modules/%{kernel_release}
 %dir /lib/modules/%{kernel_release}/kernel
 /lib/modules/%{kernel_release}/kernel/arch
+/lib/modules/%{kernel_release}/kernel/block
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
 %if %{have_drm}
@@ -1012,6 +1017,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.229  2010/11/12 17:44:52  mmazur
+- rel 2
+- add ommitted modules
+- small patch for missing usbids in one driver (nothing else, just IDs)
+
 Revision 1.228  2010/11/12 11:57:17  mmazur
 - up to 2.6.36; rel 1
 - includes a (hopefully) working config, at least for i386

================================================================
Index: packages/kernel-vanilla/kernel-vanilla-usbnet-plusb-pl2501.patch
diff -u /dev/null packages/kernel-vanilla/kernel-vanilla-usbnet-plusb-pl2501.patch:1.1
--- /dev/null	Fri Nov 12 18:44:57 2010
+++ packages/kernel-vanilla/kernel-vanilla-usbnet-plusb-pl2501.patch	Fri Nov 12 18:44:52 2010
@@ -0,0 +1,52 @@
+--- linux-2.6.36/drivers/net/usb/plusb.c.orig	2010-11-12 18:14:48.000000000 +0100
++++ linux-2.6.36/drivers/net/usb/plusb.c	2010-11-12 18:16:30.000000000 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * PL-2301/2302 USB host-to-host link cables
++ * PL-2301/2302/2501 USB host-to-host link cables
+  * Copyright (C) 2000-2005 by David Brownell
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -32,7 +32,7 @@
+ 
+ 
+ /*
+- * Prolific PL-2301/PL-2302 driver ... http://www.prolifictech.com
++ * Prolific PL-2301/PL-2302/PLD-2501 driver ... http://www.prolifictech.com
+  *
+  * The protocol and handshaking used here should be bug-compatible
+  * with the Linux 2.2 "plusb" driver, by Deti Fliegl.
+@@ -45,6 +45,7 @@
+  * seems to get wedged under load.  Prolific docs are weak, and
+  * don't identify differences between PL2301 and PL2302, much less
+  * anything to explain the different PL2302 versions observed.
++ * New PL2501 seem to use same code as PL2301/PL2302.
+  */
+ 
+ /*
+@@ -95,7 +96,7 @@
+ }
+ 
+ static const struct driver_info	prolific_info = {
+-	.description =	"Prolific PL-2301/PL-2302",
++	.description =	"Prolific PL-2301/PL-2302/PL-2501",
+ 	.flags =	FLAG_NO_SETINT,
+ 		/* some PL-2302 versions seem to fail usb_set_interface() */
+ 	.reset =	pl_reset,
+@@ -117,6 +118,9 @@
+ }, {
+ 	USB_DEVICE(0x067b, 0x0001),	// PL-2302
+ 	.driver_info =	(unsigned long) &prolific_info,
++}, {
++	USB_DEVICE(0x067b, 0x2501),     // PL-2501
++	.driver_info =  (unsigned long) &prolific_info,
+ },
+ 
+ 	{ },		// END
+@@ -145,5 +149,5 @@
+ module_exit(plusb_exit);
+ 
+ MODULE_AUTHOR("David Brownell");
+-MODULE_DESCRIPTION("Prolific PL-2301/2302 USB Host to Host Link Driver");
++MODULE_DESCRIPTION("Prolific PL-2301/2302/2501 USB Host to Host Link Driver");
+ MODULE_LICENSE("GPL");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla.spec?r1=1.228&r2=1.229&f=u