[oe-commits] org.oe.dev openocd[-native] update recipe, add link-static patch, put into deploy directory (from openmoko)

[mickeyl commit]

openocd[-native] update recipe, add link-static patch, put into deploy directory (from openmoko)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: aa2d27a29e7b0a04f2d22c6d15f31229951f3d1a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aa2d27a29e7b0a04f2d22c6d15f31229951f3d1a
Files:
1
packages/openocd/files
packages/openocd/files/openocd-link-static.patch
packages/openocd/openocd-native_svn.bb
packages/openocd/openocd_svn.bb
Diffs:

#
# mt diff -rfe6e384f0c2f7164e87c9bef15a6ba4666827e05 -raa2d27a29e7b0a04f2d22c6d15f31229951f3d1a
#
# 
# 
# add_dir "packages/openocd/files"
# 
# add_file "packages/openocd/files/openocd-link-static.patch"
#  content [6d79715a25d82a8f072733a55322b9adadff0989]
# 
# patch "packages/openocd/openocd-native_svn.bb"
#  from [7707b077956b6bbee315e898e7bfc57fed20648a]
#    to [b8df1c3c4be21f505f7af19f6847682f34a5d9c1]
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [ace5e5434883004092e4c718ed6c79d1f05bfe9c]
#    to [db913b69369bbce05c7db34eda5b089de8836bfe]
# 
============================================================
--- packages/openocd/files/openocd-link-static.patch	6d79715a25d82a8f072733a55322b9adadff0989
+++ packages/openocd/files/openocd-link-static.patch	6d79715a25d82a8f072733a55322b9adadff0989
@@ -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
============================================================
--- packages/openocd/openocd-native_svn.bb	7707b077956b6bbee315e898e7bfc57fed20648a
+++ packages/openocd/openocd-native_svn.bb	b8df1c3c4be21f505f7af19f6847682f34a5d9c1
@@ -1,10 +1,17 @@ DEPENDS = "libftdi-native"
 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
============================================================
--- packages/openocd/openocd_svn.bb	ace5e5434883004092e4c718ed6c79d1f05bfe9c
+++ packages/openocd/openocd_svn.bb	db913b69369bbce05c7db34eda5b089de8836bfe
@@ -1,14 +1,12 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
 
-DEPENDS = "libftdi"
+inherit autotools
 
-SRC_URI = "svn://svn.berlios.de/;module=openocd"
+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"  
-S = "${WORKDIR}/openocd/trunk"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-ft2232_libftdi --enable-parport-ppdev"