diff mbox series

[oe,meta-oe,3/3] openocd: Upgrade to latest tip of master

Message ID 20180601045815.15819-3-raj.khem@gmail.com
State Accepted
Commit 5500ca6a45f10deb2f5d736ba7c0ae9ed6ed08a5
Headers show
Series [oe,meta-oe,1/3] fwts: Upgrade to V18.05.00 | expand

Commit Message

Khem Raj June 1, 2018, 4:58 a.m. UTC 
Fix build with new libusb and gcc8

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...2-deprecated-libusb_set_debug-with-l.patch | 39 +++++++++++++++++++
 .../recipes-devtools/openocd/openocd_git.bb   |  5 ++-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

-- 
2.17.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Martin Jansa July 26, 2018, 11:21 a.m. UTC | #1 
It probably isn't caused by this upgrade, but openocd is using git
submodules which are checked out during do_configure:

http://repo.or.cz/openocd.git/blob/refs/heads/master:/bootstrap#l37

Would it make sense to call bootstrap with nosubmodule?

It seems to be used by internal_jimtcl
http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l574
and internal_libjaylink
http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l679

I don't use openocd, I've just noticed random build failure:

Makefile.am:23: installing './texinfo.tex'
Setting up submodules
Submodule 'jimtcl' (http://repo.or.cz/r/jimtcl.git) registered for path
'jimtcl'
Submodule 'src/jtag/drivers/libjaylink' (http://repo.or.cz/r/libjaylink.git)
registered for path 'src/jtag/drivers/libjaylink'
Submodule 'tools/git2cl' (http://repo.or.cz/r/git2cl.git) registered for
path 'tools/git2cl'
Cloning into 'jimtcl'...
fatal: unable to access 'http://repo.or.cz/r/jimtcl.git/': Could not
resolve host: repo.or.cz
Clone of 'http://repo.or.cz/r/jimtcl.git' into submodule path 'jimtcl'
failed
WARNING: exit code 1 from a shell command.

On Fri, Jun 1, 2018 at 6:58 AM Khem Raj <raj.khem@gmail.com> wrote:

> Fix build with new libusb and gcc8

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  ...2-deprecated-libusb_set_debug-with-l.patch | 39 +++++++++++++++++++

>  .../recipes-devtools/openocd/openocd_git.bb   |  5 ++-

>  2 files changed, 42 insertions(+), 2 deletions(-)

>  create mode 100644

> meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

>

> 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

> new file mode 100644

> index 0000000000..c5b9083dca

> --- /dev/null

> +++

> b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

> @@ -0,0 +1,39 @@

> +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 67abeede93..84727bf970 100644

> --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb

> +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb

> @@ -5,8 +5,9 @@ DEPENDS = "libusb-compat libftdi"

>  RDEPENDS_${PN} = "libusb1"

>

>  SRC_URI = "git://repo.or.cz/openocd.git \

> -"

> -SRCREV = "3737dd69e73816d186ba418d7b833462a8041079"

> +

>  file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \

> +          "

> +SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe"

>

>  PV = "0.10+gitr${SRCPV}"

>  S = "${WORKDIR}/git"

> --

> 2.17.1

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj July 26, 2018, 2:20 p.m. UTC | #2 
On Thu, Jul 26, 2018 at 4:21 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>

> It probably isn't caused by this upgrade, but openocd is using git submodules which are checked out during do_configure:

>

> http://repo.or.cz/openocd.git/blob/refs/heads/master:/bootstrap#l37

>

> Would it make sense to call bootstrap with nosubmodule?


I think so, we can explicily fetch the submodiule and place it where its needed.

>

> It seems to be used by internal_jimtcl

> http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l574

> and internal_libjaylink

> http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l679

>

> I don't use openocd, I've just noticed random build failure:

>

> Makefile.am:23: installing './texinfo.tex'

> Setting up submodules

> Submodule 'jimtcl' (http://repo.or.cz/r/jimtcl.git) registered for path 'jimtcl'

> Submodule 'src/jtag/drivers/libjaylink' (http://repo.or.cz/r/libjaylink.git) registered for path 'src/jtag/drivers/libjaylink'

> Submodule 'tools/git2cl' (http://repo.or.cz/r/git2cl.git) registered for path 'tools/git2cl'

> Cloning into 'jimtcl'...

> fatal: unable to access 'http://repo.or.cz/r/jimtcl.git/': Could not resolve host: repo.or.cz

> Clone of 'http://repo.or.cz/r/jimtcl.git' into submodule path 'jimtcl' failed

> WARNING: exit code 1 from a shell command.

>

> On Fri, Jun 1, 2018 at 6:58 AM Khem Raj <raj.khem@gmail.com> wrote:

>>

>> Fix build with new libusb and gcc8

>>

>> Signed-off-by: Khem Raj <raj.khem@gmail.com>

>> ---

>>  ...2-deprecated-libusb_set_debug-with-l.patch | 39 +++++++++++++++++++

>>  .../recipes-devtools/openocd/openocd_git.bb   |  5 ++-

>>  2 files changed, 42 insertions(+), 2 deletions(-)

>>  create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

>>

>> 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

>> new file mode 100644

>> index 0000000000..c5b9083dca

>> --- /dev/null

>> +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

>> @@ -0,0 +1,39 @@

>> +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 67abeede93..84727bf970 100644

>> --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb

>> +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb

>> @@ -5,8 +5,9 @@ DEPENDS = "libusb-compat libftdi"

>>  RDEPENDS_${PN} = "libusb1"

>>

>>  SRC_URI = "git://repo.or.cz/openocd.git \

>> -"

>> -SRCREV = "3737dd69e73816d186ba418d7b833462a8041079"

>> +           file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \

>> +          "

>> +SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe"

>>

>>  PV = "0.10+gitr${SRCPV}"

>>  S = "${WORKDIR}/git"

>> --

>> 2.17.1

>>

>> --

>> _______________________________________________

>> Openembedded-devel mailing list

>> Openembedded-devel@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Martin Jansa July 26, 2018, 2:23 p.m. UTC | #3 
I'm testing the change which just disables them, I'll send it after few
more builds with it. I'll leave enabling them to someone actually using
openocd.

On Thu, Jul 26, 2018 at 4:21 PM Khem Raj <raj.khem@gmail.com> wrote:

> On Thu, Jul 26, 2018 at 4:21 AM Martin Jansa <martin.jansa@gmail.com>

> wrote:

> >

> > It probably isn't caused by this upgrade, but openocd is using git

> submodules which are checked out during do_configure:

> >

> > http://repo.or.cz/openocd.git/blob/refs/heads/master:/bootstrap#l37

> >

> > Would it make sense to call bootstrap with nosubmodule?

>

> I think so, we can explicily fetch the submodiule and place it where its

> needed.

>

> >

> > It seems to be used by internal_jimtcl

> > http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l574

> > and internal_libjaylink

> > http://repo.or.cz/openocd.git/blob/refs/heads/master:/configure.ac#l679

> >

> > I don't use openocd, I've just noticed random build failure:

> >

> > Makefile.am:23: installing './texinfo.tex'

> > Setting up submodules

> > Submodule 'jimtcl' (http://repo.or.cz/r/jimtcl.git) registered for path

> 'jimtcl'

> > Submodule 'src/jtag/drivers/libjaylink' (

> http://repo.or.cz/r/libjaylink.git) registered for path

> 'src/jtag/drivers/libjaylink'

> > Submodule 'tools/git2cl' (http://repo.or.cz/r/git2cl.git) registered

> for path 'tools/git2cl'

> > Cloning into 'jimtcl'...

> > fatal: unable to access 'http://repo.or.cz/r/jimtcl.git/': Could not

> resolve host: repo.or.cz

> > Clone of 'http://repo.or.cz/r/jimtcl.git' into submodule path 'jimtcl'

> failed

> > WARNING: exit code 1 from a shell command.

> >

> > On Fri, Jun 1, 2018 at 6:58 AM Khem Raj <raj.khem@gmail.com> wrote:

> >>

> >> Fix build with new libusb and gcc8

> >>

> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> >> ---

> >>  ...2-deprecated-libusb_set_debug-with-l.patch | 39 +++++++++++++++++++

> >>  .../recipes-devtools/openocd/openocd_git.bb   |  5 ++-

> >>  2 files changed, 42 insertions(+), 2 deletions(-)

> >>  create mode 100644

> meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

> >>

> >> 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

> >> new file mode 100644

> >> index 0000000000..c5b9083dca

> >> --- /dev/null

> >> +++

> b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch

> >> @@ -0,0 +1,39 @@

> >> +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 67abeede93..84727bf970 100644

> >> --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb

> >> +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb

> >> @@ -5,8 +5,9 @@ DEPENDS = "libusb-compat libftdi"

> >>  RDEPENDS_${PN} = "libusb1"

> >>

> >>  SRC_URI = "git://repo.or.cz/openocd.git \

> >> -"

> >> -SRCREV = "3737dd69e73816d186ba418d7b833462a8041079"

> >> +

>  file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \

> >> +          "

> >> +SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe"

> >>

> >>  PV = "0.10+gitr${SRCPV}"

> >>  S = "${WORKDIR}/git"

> >> --

> >> 2.17.1

> >>

> >> --

> >> _______________________________________________

> >> Openembedded-devel mailing list

> >> Openembedded-devel@lists.openembedded.org

> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

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
new file mode 100644
index 0000000000..c5b9083dca
--- /dev/null
+++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch
@@ -0,0 +1,39 @@ 
+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 67abeede93..84727bf970 100644
--- a/meta-oe/recipes-devtools/openocd/openocd_git.bb
+++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb
@@ -5,8 +5,9 @@  DEPENDS = "libusb-compat libftdi"
 RDEPENDS_${PN} = "libusb1"
 
 SRC_URI = "git://repo.or.cz/openocd.git \
-"
-SRCREV = "3737dd69e73816d186ba418d7b833462a8041079"
+           file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \
+          "
+SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe"
 
 PV = "0.10+gitr${SRCPV}"
 S = "${WORKDIR}/git"