diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-23 01:20:31 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-23 01:20:31 +0000 |
| commit | fb53a3a3963caa5604cca530737c46879acb6f54 (patch) | |
| tree | adbf16a4b1160011abe93e38bccc516bec08fa2f | |
| parent | eba840e6b8f471eb497a8b21fb64b8ca724648b4 (diff) | |
puppy: Added patch to handle usb header location change in recent kernels
| -rw-r--r-- | packages/puppy/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/puppy/files/usb-header.patch | 20 | ||||
| -rw-r--r-- | packages/puppy/puppy_1.11.bb | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/packages/puppy/files/.mtn2git_empty b/packages/puppy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/puppy/files/.mtn2git_empty diff --git a/packages/puppy/files/usb-header.patch b/packages/puppy/files/usb-header.patch new file mode 100644 index 0000000000..3768ff8ff6 --- /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 94e90d216d..ee9254bd01 100644 --- 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 |