diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-08-13 09:16:13 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-15 08:20:06 -0700 |
commit | 29a51db18a729bcd9b0379eab27ff5e9e863dc79 (patch) | |
tree | 9361985848a218c15fb26b05745fefb0c4cc4ef5 /meta-oe/recipes-devtools | |
parent | f0acce20d44b78e1679060419e280b12c217b01d (diff) | |
download | meta-openembedded-29a51db18a729bcd9b0379eab27ff5e9e863dc79.tar.gz |
openocd: prevent fetching git submodules during do_configure
* I've tried just disabling them with:
--disable-internal-jimtcl --disable-internal-libjaylink
but that still tries to use missing jim.h:
| ./src/helper/jim-nvp.h:47:10: fatal error: jim.h: No such file or directory
| #include <jim.h>
| ^~~~~~~
| compilation terminated.
| Makefile:3619: recipe for target 'src/libopenocd_la-openocd.lo' failed
| make[2]: *** [src/libopenocd_la-openocd.lo] Error 1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/openocd/openocd_git.bb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 84727bf97..21a86de39 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb | |||
@@ -4,10 +4,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
4 | DEPENDS = "libusb-compat libftdi" | 4 | DEPENDS = "libusb-compat libftdi" |
5 | RDEPENDS_${PN} = "libusb1" | 5 | RDEPENDS_${PN} = "libusb1" |
6 | 6 | ||
7 | SRC_URI = "git://repo.or.cz/openocd.git \ | 7 | SRC_URI = " \ |
8 | file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ | 8 | git://repo.or.cz/openocd.git;protocol=http;name=openocd \ |
9 | " | 9 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl \ |
10 | SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe" | 10 | git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ |
11 | git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ | ||
12 | file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ | ||
13 | " | ||
14 | |||
15 | SRCREV_FORMAT = "openocd" | ||
16 | SRCREV_openocd = "cdf1e826eb23c29de1019ce64125f644f01b0afe" | ||
17 | SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" | ||
18 | SRCREV_jimtcl = "a9bf5975fd0f89974d689a2d9ebd0873c8d64787" | ||
19 | SRCREV_libjaylink = "8645845c1abebd004e991ba9a7f808f4fd0c608b" | ||
11 | 20 | ||
12 | PV = "0.10+gitr${SRCPV}" | 21 | PV = "0.10+gitr${SRCPV}" |
13 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
@@ -16,10 +25,10 @@ inherit pkgconfig autotools-brokensep gettext | |||
16 | 25 | ||
17 | BBCLASSEXTEND += "nativesdk" | 26 | BBCLASSEXTEND += "nativesdk" |
18 | 27 | ||
19 | EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html " | 28 | EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html" |
20 | 29 | ||
21 | do_configure() { | 30 | do_configure() { |
22 | ./bootstrap | 31 | ./bootstrap nosubmodule |
23 | oe_runconf ${EXTRA_OECONF} | 32 | oe_runconf ${EXTRA_OECONF} |
24 | } | 33 | } |
25 | 34 | ||