[Buildroot] [PATCH 1/1] package/openocd: bump to 0.12.0

[Arnout Vandecappelle]

On 08/04/2023 15:51, Dario Binacchi wrote:
> As reported by [1], version 0.12.0 fixes these errors:
> 
> Error executing event examine-end on target stm32f7x.cpu:
> buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression"
> in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103
> at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37
> Info : starting gdb server for stm32f7x.cpu on 3333
> Info : Listening on port 3333 for gdb connections
> Info : Unable to match requested speed 2000 kHz, using 1800 kHz
> Info : Unable to match requested speed 2000 kHz, using 1800 kHz
> Error executing event examine-end on target stm32f7x.cpu:
> buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression"
> in procedure 'ocd_process_reset'
> in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288
> in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103
> at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37
> target halted due to debug-request, current mode: Thread
> xPSR: 0x01000000 pc: 0x080003fc msp: 0x20050000
> Error executing event reset-init on target stm32f7x.cpu:
> buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression"
> in procedure 'ocd_process_reset'
> in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288
> in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/board/stm32f769i-disco.cfg", line 71
> at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37
> 
> Remove upstream patches.
> 
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849
> Signed-off-by: Dario Binacchi <dario.binacchi at amarulasolutions.com>

[snip]

> diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
> index 91eb56d930ea..b605eb7aa463 100644
> --- a/package/openocd/openocd.hash
> +++ b/package/openocd/openocd.hash
> @@ -1,3 +1,3 @@
>   # From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
> -sha256  43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d  openocd-0.11.0.tar.bz2
> -sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
> +sha256  af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa  openocd-0.12.0.tar.bz2
> +sha256  1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419  COPYING

  If the license hash changes, you _have_ to explain why in the commit message. 
In this case, it's because the license file moved from COPYING to 
LICENSES/preferred/GPL-2.0, and another file was added to explain the licenses. 
So we now need 3 license files: COPYING, LICENSES/preferred/GPL-2.0 and 
LICENSES/license-rules.txt. While you're at it, check the latter file to verify 
if maybe our GPL-2.0+ tag was not entirely correct.

  Marked as Changes Requested.

  Regards,
  Arnout

> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
> index 37a06ca848b7..95a7fd3c2a2c 100644
> --- a/package/openocd/openocd.mk
> +++ b/package/openocd/openocd.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -OPENOCD_VERSION = 0.11.0
> +OPENOCD_VERSION = 0.12.0
>   OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
>   OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
>   OPENOCD_LICENSE = GPL-2.0+