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

diff --git a/packages/puppy/files/.mtn2git_empty b/packages/puppy/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/puppy/files/usb-header.patch b/packages/puppy/files/usb-header.patch
new file mode 100644 (file)
index 0000000..3768ff8
--- /dev/null
+++ b/packages/puppy/files/usb-header.patch
@@ -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"

diff --git a/packages/puppy/puppy_1.11.bb b/packages/puppy/puppy_1.11.bb
index 94e90d2..ee9254b 100644 (file)
--- a/packages/puppy/puppy_1.11.bb
+++ b/packages/puppy/puppy_1.11.bb
@@ -3,9 +3,10 @@ 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