support/hosttools: update for poky 5

Updates needed to make those recipes work with poky 5.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

meta-zephyr-sdk/recipes-hosttools/bossa/bossa_git.bb

@@ -6,14 +6,14 @@ HOMEPAGE = "https://github.com/shumatech/BOSSA"
 #     sudo apt-get install wx2.8-headers libwxgtk2.8-0 libwxgtk2.8-dev
 #
 
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bcf9399f7b9b96149837290bcdc3ad39"
 
 DEPENDS = "readline"
 
 PR = "r0"
 SRCREV = "3532de82efd28fadbabc2b258d84dddf14298107"
-SRC_URI = "git://github.com/shumatech/BOSSA.git;protocol=https \
+SRC_URI = "git://github.com/shumatech/BOSSA.git;protocol=https;branch=master \
 	   file://0001-Wait-for-EEFC-flash-to-complete-operations-before-re.patch \
 	   file://0001-Flash.h-Add-flash-override-samba-error.patch \
 	   file://0002-CalwFlash-Add-SAM4L-Flashcalw-controller.patch \

meta-zephyr-sdk/recipes-hosttools/hosttools/hosttools-tarball.bb

@@ -6,23 +6,23 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 TOOLCHAIN_TARGET_TASK ?= ""
 
 TOOLCHAIN_HOST_TASK ?= "\
-    nativesdk-arc-qemu \
-    nativesdk-zephyr-qemu \
-    nativesdk-xilinx-qemu \
-    nativesdk-openocd \
     nativesdk-bossa \
+    nativesdk-openocd \
     nativesdk-dtc \
+    nativesdk-arc-qemu \
+    nativesdk-legacy-qemu \
+    nativesdk-qemu-zephyr \
     "
 
 TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${SDKMACHINE}-hosttools-standalone-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
 
-inherit meta
+#inherit meta
 inherit populate_sdk
 inherit toolchain-scripts
 
-create_sdk_files_append () {
+create_sdk_files:append () {
 	rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
 	rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
 	rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*

meta-zephyr-sdk/recipes-hosttools/openocd/openocd_git.bb

@@ -1,20 +1,20 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSES/preferred/GPL-2.0;md5=71ce3767d42ca42cd575f91c56eefe79"
-DEPENDS = "libusb-compat hidapi libftdi"
+DEPENDS = "hidapi libftdi"
 RDEPENDS_${PN} = "libusb1 hidapi"
 
 SRC_URI = " \
-	git://github.com/zephyrproject-rtos/openocd.git;protocol=https;nobranch=1 \
+	gitsm://github.com/zephyrproject-rtos/openocd.git;protocol=https;nobranch=1 \
 	"
-SRCREV = "b6f95a16c1360e347a06faf91befd122c0d15864"
+SRCREV = "51dbf7050b34a40f28c3fc7b5f4e49326c3e3aa6"
 
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools gettext
 
 BBCLASSEXTEND += "nativesdk"
 
-EXTRA_OECONF = "--enable-ftdi --enable-cmsis-dap --enable-jlink --enable-stlink --disable-doxygen-html "
+EXTRA_OECONF = "--enable-ftdi --enable-cmsis-dap --enable-jlink --enable-stlink --disable-doxygen-html --disable-git-update"
 
 do_configure() {
     cd ${S}

meta-zephyr-sdk/recipes-support/hidapi/hidapi_git.bb

@@ -12,7 +12,7 @@ BBCLASSEXTEND += " native nativesdk"
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https"
-PV = "0.9.0"
-SRCREV = "7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f"
+SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master"
+PV = "0.14.0"
+SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4"
 S = "${WORKDIR}/git"

meta-zephyr-sdk/recipes-support/libpcre/libpcre2_%.bbappend

@@ -1,4 +1,4 @@
 # Override the source URL for libpcre2 since the old mirror specified in the
 # meta layer is no longer available.
 
-SRC_URI_prepend = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2 "
+SRC_URI:prepend = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2 "

meta-zephyr-sdk/recipes-support/libpcre/libpcre_%.bbappend

@@ -1,4 +1,4 @@
 # Override the source URL for libpcre since the old mirror specified in the
 # meta layer is no longer available.
 
-SRC_URI_prepend = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 "
+SRC_URI:prepend = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 "

meta-zephyr-sdk/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch

@@ -1,24 +1,9 @@
-From 840795dcb48214b74cfde75e7ce5e8a1a6c64a46 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 2 Apr 2015 19:18:45 -0700
-Subject: [PATCH] usb.h: Include sys/types.h
-
-We need the definitions for things like u_intX_t
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-
----
- libusb/usb.h | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/libusb/usb.h b/libusb/usb.h
-index fa0e6c6..4e88eb8 100644
+index ea62543..4f1752d 100644
 --- a/libusb/usb.h
 +++ b/libusb/usb.h
-@@ -45,6 +45,8 @@ typedef unsigned __int32  uint32_t;
- #include <stdint.h>
+@@ -51,6 +51,8 @@ typedef unsigned __int32  uint32_t;
+ #include <linux/limits.h>
  #endif
 
 +#include <sys/types.h>

meta-zephyr-sdk/recipes-support/libusb/libusb-compat_0.1.7.bb renamed to meta-zephyr-sdk/recipes-support/libusb/libusb-compat_0.1.8.bb

@@ -19,10 +19,10 @@ BBCLASSEXTEND = "native nativesdk"
 PE = "1"
 
 SRC_URI = " \
-    git://github.com/libusb/libusb-compat-0.1.git;protocol=https \
+    git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \
     file://0001-usb.h-Include-sys-types.h.patch \
 "
-SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef"
+SRCREV = "3e8a88d296b5405902c22d2ada61937bd9a89415"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases"
@@ -33,7 +33,7 @@ inherit autotools pkgconfig binconfig-disabled lib_package
 
 EXTRA_OECONF = "--libdir=${base_libdir}"
 
-do_install_append() {
+do_install:append() {
 	install -d ${D}${libdir}
 	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
 		mv ${D}${base_libdir}/pkgconfig ${D}${libdir}