openocd: update to 0.10.0-rc1

package/libusb/Makefile

@@ -16,15 +16,19 @@ PKG_OPTS:=		dev
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+include ${ADK_TOPDIR}/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBUSB,libusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CPPFLAGS=	-DTIMESPEC_TO_TIMEVAL=
+HOST_CONFIGURE_ARGS+=	--disable-udev
 CONFIGURE_ARGS+=	--disable-udev
 
 libusb-install:
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/openocd/Makefile

@@ -4,11 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		openocd
-PKG_VERSION:=		0.9.0
+PKG_VERSION:=		0.10.0-rc1
 PKG_RELEASE:=		1
-PKG_HASH:=		837042ac9a156b9363cbffa1fcdaf463bfb83a49331addf52e63119642b5f443
+PKG_HASH:=		e1892003b2d992a54b882e1096fbeea80eec742071b4f6402cacd9173d7c6191
 PKG_DESCR:=		jtag flash and debugging utility
 PKG_SECTION:=		dev/tools
+HOST_BUILDDEP:=		libusb-host
 PKG_URL:=		http://openocd.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openocd/}
 

package/openocd/patches/patch-src_flash_nor_sim3x_c

@@ -1,22 +0,0 @@
---- openocd-0.9.0.orig/src/flash/nor/sim3x.c	2015-04-24 17:09:54.000000000 +0200
-+++ openocd-0.9.0/src/flash/nor/sim3x.c	2016-04-24 17:17:47.000000000 +0200
-@@ -864,14 +864,12 @@ static int sim3x_flash_info(struct flash
- 				return ERROR_BUF_TOO_SMALL;
- 
- 			/* Package */
--			if (sim3x_info->device_package) {
--				printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
--				buf += printed;
--				buf_size -= printed;
-+			printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
-+			buf += printed;
-+			buf_size -= printed;
- 
--				if (buf_size <= 0)
--					return ERROR_BUF_TOO_SMALL;
--			}
-+			if (buf_size <= 0)
-+				return ERROR_BUF_TOO_SMALL;
- 		}
- 	}
-