[oe-commits] Mike Westerhof : ftpd-topfield: add patch for 2.6.23 kernel headers

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0faec81b54ed7bee58647c14ba18ed28200bef39
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0faec81b54ed7bee58647c14ba18ed28200bef39

Author: Mike Westerhof <mwester at dls.net>
Date:   Fri Dec 26 23:30:28 2008 -0600

ftpd-topfield: add patch for 2.6.23 kernel headers

---

 .../files/usb-header-name-2-6-23.patch             |   15 +++++++++++++++
 packages/ftpd-topfield/ftpd-topfield_0.7.5.bb      |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/packages/ftpd-topfield/files/usb-header-name-2-6-23.patch b/packages/ftpd-topfield/files/usb-header-name-2-6-23.patch
new file mode 100644
index 0000000..fd695d8
--- /dev/null
+++ b/packages/ftpd-topfield/files/usb-header-name-2-6-23.patch
@@ -0,0 +1,15 @@
+--- libtopfield/usb_io.h.orig	2008-12-26 23:11:08.000000000 -0600
++++ libtopfield/usb_io.h	2008-12-26 23:24:02.000000000 -0600
+@@ -36,7 +36,12 @@
+ 
+ /* linux/usb_ch9.h wasn't separated out until 2.4.23 */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
++/* and then moved to linux/usb/ch9.h at 2.6.23. */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++#include <linux/usb/ch9.h>
++#else
+ #include <linux/usb_ch9.h>
++#endif
+ #else
+ #include <linux/usb.h>
+ #endif
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
index 74a3743..9719ed7 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb
@@ -3,11 +3,12 @@ DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
 HOMEPAGE = "http://sourceforge.net/projects/puppy"
 SECTION = "net"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \
 	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \
 	   file://syslog.patch;patch=1 \
+	   file://usb-header-name-2-6-23.patch;patch=1 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name