[oe-commits] org.oe.dev puppy: Added patch to handle usb header location change in recent kernels

[rwhitby commit]

puppy: Added patch to handle usb header location change in recent kernels

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 6dc8c4bdc8ddfb0964a302790ce2a8448370e2f9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6dc8c4bdc8ddfb0964a302790ce2a8448370e2f9
Files:
1
packages/puppy/files
packages/puppy/files/usb-header.patch
packages/puppy/puppy_1.11.bb
Diffs:

#
# mt diff -r77135bffae02bbd15a6e1bf5e544e6b54adcb312 -r6dc8c4bdc8ddfb0964a302790ce2a8448370e2f9
#
# 
# 
# add_dir "packages/puppy/files"
# 
# add_file "packages/puppy/files/usb-header.patch"
#  content [1b411842b3a18cb8e9bc36a6a219ff652ccbd707]
# 
# patch "packages/puppy/puppy_1.11.bb"
#  from [dab0819e8dae88cff7bb45c87b39efe63bb6fc7b]
#    to [319f2e2f762716010d45967ba000e58a2c3e3066]
# 
============================================================
--- packages/puppy/files/usb-header.patch	1b411842b3a18cb8e9bc36a6a219ff652ccbd707
+++ packages/puppy/files/usb-header.patch	1b411842b3a18cb8e9bc36a6a219ff652ccbd707
@@ -0,0 +1,20 @@
+--- puppy/usb_io.h.~1.14.~	2007-02-01 16:39:20.000000000 +1030
++++ puppy/usb_io.h	2007-03-23 11:47:21.000000000 +1030
+@@ -30,12 +30,13 @@
+ #include <linux/types.h>
+ #include <linux/version.h>
+ 
+-#include <linux/usb.h>
+-#include <linux/usbdevice_fs.h>
+-
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++/* linux/usb_ch9.h wasn't separated out until 2.4.23 */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
+ #include "usb_ch9.h"
++#else
++#include "usb.h"
+ #endif
++#include <linux/usbdevice_fs.h>
+ 
+ #include "mjd.h"
+ #include "tf_bytes.h"
============================================================
--- packages/puppy/puppy_1.11.bb	dab0819e8dae88cff7bb45c87b39efe63bb6fc7b
+++ packages/puppy/puppy_1.11.bb	319f2e2f762716010d45967ba000e58a2c3e3066
@@ -1,11 +1,12 @@ LICENSE = "GPL"
 DESCRIPTION = "Interface software for the TopField TF5000PVRt"
 SECTION = "network"
 PRIORITY = "optional"
 HOMEPAGE = "http://sf.net/projects/puppy/"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11"
+SRC_URI = "cvs://anonymous:@puppy.cvs.sourceforge.net/cvsroot/puppy;module=puppy;tag=PUPPY_1_11 \
+	   file://usb-header.patch;patch=1"
 S = "${WORKDIR}/puppy"
 
 inherit autotools