r2328 - in trunk/oe/packages/openocd: . files openocd

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-06-22 12:29:46 +0200 (Fri, 22 Jun 2007)
New Revision: 2328

Added:
   trunk/oe/packages/openocd/files/
   trunk/oe/packages/openocd/files/openocd-link-static.patch
Removed:
   trunk/oe/packages/openocd/openocd/openocd-link-static.patch
Modified:
   trunk/oe/packages/openocd/openocd_svn.bb
Log:
oe/openocd: repair oe-sync breakage


Copied: trunk/oe/packages/openocd/files/openocd-link-static.patch (from rev 2326, trunk/oe/packages/openocd/openocd/openocd-link-static.patch)

Deleted: trunk/oe/packages/openocd/openocd/openocd-link-static.patch
===================================================================
--- trunk/oe/packages/openocd/openocd/openocd-link-static.patch	2007-06-22 10:25:45 UTC (rev 2327)
+++ trunk/oe/packages/openocd/openocd/openocd-link-static.patch	2007-06-22 10:29:46 UTC (rev 2328)
@@ -1,20 +0,0 @@
---- 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

Modified: trunk/oe/packages/openocd/openocd_svn.bb
===================================================================
--- trunk/oe/packages/openocd/openocd_svn.bb	2007-06-22 10:25:45 UTC (rev 2327)
+++ trunk/oe/packages/openocd/openocd_svn.bb	2007-06-22 10:29:46 UTC (rev 2328)
@@ -2,10 +2,11 @@
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
+PR = "r1"
 
 inherit autotools
 
-SRC_URI = "svn://svn.berlios.de/;module=openocd/trunk \
+SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"