4 files changed, 33 insertions, 8 deletions
diff --git a/packages/openocd/files/.mtn2git_empty b/packages/openocd/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openocd/files/.mtn2git_empty
diff --git a/packages/openocd/files/openocd-link-static.patch b/packages/openocd/files/openocd-link-static.patch
new file mode 100644
index 0000000000..8a686efe5d
--- /dev/null
+++ b/packages/openocd/files/openocd-link-static.patch
@@ -0,0 +1,20 @@
+--- openocd/src/Makefile.am.orig	2007-03-01 11:51:41.000000000 -0300
++++ openocd/src/Makefile.am	2007-03-01 11:58:08.000000000 -0300
+@@ -7,7 +7,7 @@
+ 	-I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
+ 
+ # the library search path.
+-openocd_LDFLAGS = $(all_libraries) 
++openocd_LDFLAGS = -static $(all_libraries)
+ SUBDIRS = helper jtag xsvf target server flash pld
+ 
+ if IS_MINGW
+@@ -17,7 +17,7 @@
+ endif
+ 
+ if FT2232_LIBFTDI
+-FTDI2232LIB = -lftdi
++FTDI2232LIB = -lftdi -lusb
+ else
+ FTDI2232LIB =
+ endif
diff --git a/packages/openocd/openocd-native_svn.bb b/packages/openocd/openocd-native_svn.bb
index 5e77400671..4ab1d37fe2 100644
--- a/packages/openocd/openocd-native_svn.bb
+++ b/packages/openocd/openocd-native_svn.bb
@@ -3,8 +3,15 @@ require openocd_${PV}.bb
 inherit native
 
 DEPENDS = "libftdi-native"
+EXTRA_OECONF = "--enable-ft2232_libftdi --enable-parport-ppdev"
 
 do_stage() {
-    install -m 0755 src/openocd ${STAGING_BINDIR}
+    install -m 0755 src/openocd ${STAGING_BINDIR_NATIVE}
 }
 
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
+}
+
+addtask deploy before do_package after do_install
diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb
index ccbf8951fb..ebe234aca5 100644
--- a/packages/openocd/openocd_svn.bb
+++ b/packages/openocd/openocd_svn.bb
@@ -3,12 +3,10 @@ HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
 
-DEPENDS = "libftdi"
-
-SRC_URI = "svn://svn.berlios.de/;module=openocd"
-
-S = "${WORKDIR}/openocd/trunk"
-
 inherit autotools
 
-EXTRA_OECONF = "--enable-ft2232_libftdi --enable-parport-ppdev"
+SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
+           file://openocd-link-static.patch;patch=1"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"