diff options
Diffstat (limited to 'meta-oe/recipes-devtools/openocd')
-rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch | 39 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd_git.bb | 37 |
2 files changed, 21 insertions, 55 deletions
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch deleted file mode 100644 index c5b9083dca..0000000000 --- a/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 May 2018 21:06:46 -0700 -Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with - libusb_set_option - -libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace -with equivalent libusb_set_option() API - -see libusb commit for more details - -https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] - src/jtag/drivers/xds110.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c -index 90b699027..9bfe02ea8 100644 ---- a/src/jtag/drivers/xds110.c -+++ b/src/jtag/drivers/xds110.c -@@ -367,8 +367,11 @@ static bool usb_connect(void) - - /* Set libusb to auto detach kernel and disable debug messages */ - (void)libusb_set_auto_detach_kernel_driver(dev, 1); -+#if LIBUSB_API_VERSION >= 0x01000106 -+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); -+#else - libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); -- -+#endif - /* Claim the debug interface on the XDS110 */ - result = libusb_claim_interface(dev, INTERFACE_DEBUG); - } else { --- -2.17.1 - diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 21a86de390..559fe29ff8 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -1,34 +1,35 @@ SUMMARY = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" DEPENDS = "libusb-compat libftdi" -RDEPENDS_${PN} = "libusb1" +RDEPENDS:${PN} = "libusb1" SRC_URI = " \ - git://repo.or.cz/openocd.git;protocol=http;name=openocd \ - git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ - git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ - git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ - file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ + git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ + git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ + git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ " SRCREV_FORMAT = "openocd" -SRCREV_openocd = "cdf1e826eb23c29de1019ce64125f644f01b0afe" +SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" -SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" -SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" +SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" +SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" -PV = "0.10+gitr${SRCPV}" +PV = "0.12+git" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext -BBCLASSEXTEND += "nativesdk" +BBCLASSEXTEND += "native nativesdk" -EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html" +EXTRA_OECONF = "--enable-ftdi --enable-jtag_vpi --enable-buspirate --disable-doxygen-html --disable-werror" do_configure() { ./bootstrap nosubmodule + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/jimtcl/autosetup + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/jimtcl/autosetup oe_runconf ${EXTRA_OECONF} } @@ -45,10 +46,14 @@ do_install() { fi } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/openocd/* \ ${bindir}/openocd \ " PACKAGECONFIG[sysfsgpio] = "--enable-sysfsgpio,--disable-sysfsgpio" -PACKAGECONFIG ??= "sysfsgpio" +PACKAGECONFIG[remote-bitbang] = "--enable-remote-bitbang,--disable-remote-bitbang" +PACKAGECONFIG ??= "sysfsgpio remote-bitbang" + +# Can't be built with ccache +CCACHE_DISABLE = "1" |