aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 11:28:17 -0700
committerSteffen Sledz <sledz@dresearch-fe.de>2011-04-29 14:08:38 +0200
commitda249b5d38cd175a54e29622ded94a226a00477f (patch)
tree05e5630addf775c909bd666d3bc93c77ea7f890f
parentb9ef48a463f2d156e639b664cc0f2bf1a51a3a5b (diff)
downloadopenembedded-da249b5d38cd175a54e29622ded94a226a00477f.zip
openembedded-da249b5d38cd175a54e29622ded94a226a00477f.tar.gz
openembedded-da249b5d38cd175a54e29622ded94a226a00477f.tar.bz2
ftpd-topfield: Rework usb-header-name-2-6-23.patch
While in here, clean up the recipe a bit. It's not autotools based and if we move the library in with an unpack2 the patch can be applied with striplevel=0. There are other problems with this recipe at present (CFLAGS/LDFLAGS in our env override the Makefile). Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch4
-rwxr-xr-xrecipes/ftpd-topfield/ftpd-topfield_0.7.5.bb9
2 files changed, 8 insertions, 5 deletions
diff --git a/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch b/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch
index 2ab6c4c..fd695d8 100644
--- a/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch
+++ b/recipes/ftpd-topfield/files/usb-header-name-2-6-23.patch
@@ -1,5 +1,5 @@
---- ../../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
+--- 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 */
diff --git a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
index 504f652..b1dee21 100755
--- a/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
+++ b/recipes/ftpd-topfield/ftpd-topfield_0.7.5.bb
@@ -8,7 +8,7 @@ PR = "r3"
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 \
- file://usb-header-name-2-6-23.patch \
+ file://usb-header-name-2-6-23.patch;striplevel=0 \
file://init"
# The source will end up in the subdirectory 'ftpd-topfield' - no release name
@@ -19,9 +19,12 @@ inherit update-rc.d
INITSCRIPT_NAME = "ftpd-topfield"
INITSCRIPT_PARAMS = "defaults"
-# Just the one package at present
+do_unpack2() {
+ cd ${WORKDIR}
+ mv libtopfield ${S}/
+}
-inherit autotools
+addtask unpack2 after do_unpack before do_patch
do_compile() {
oe_runmake