* [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
@ 2023-04-11 20:39 Dario Binacchi
2023-04-15 13:29 ` Yann E. MORIN
2023-04-23 9:38 ` Peter Korsgaard
0 siblings, 2 replies; 8+ messages in thread
From: Dario Binacchi @ 2023-04-11 20:39 UTC (permalink / raw)
To: buildroot; +Cc: Dario Binacchi
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.
The new version moves the GPL-2.0 license from COPYING to the subfolder
"preferred", adding the header required by spdxcheck.py. A minimalist
COPYING is added in the top directory, as required by automake, pointing
to the files in LICENSES.
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes in v2:
- Explain in the commit message why the license hash changed.
- Add all license files and updates their tags and hashes accordingly.
...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 -------
...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 -------------------
package/openocd/openocd.hash | 18 +++-
package/openocd/openocd.mk | 16 +++-
4 files changed, 27 insertions(+), 128 deletions(-)
delete mode 100644 package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
delete mode 100644 package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
deleted file mode 100644
index ecb716b6fa0f..000000000000
--- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 6 Oct 2021 17:43:16 +0200
-Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70
-
-Fix the following build failure raised with openocd and autoconf >= 2.70
-due to
-http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf:
-
->>> openocd 0.11.0 Autoreconfiguring
-autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script?
-
-Fixes:
- - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/msteveb/jimtcl/pull/209]
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac
-index b70b5d8..8c45114 100644
---- a/jimtcl/configure.ac
-+++ b/jimtcl/configure.ac
-@@ -1 +1,3 @@
- # Dummy configure.ac to make automake happy
-+AC_INIT([jimtcl], [0.80])
-+AC_OUTPUT
---
-2.33.0
-
diff --git a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch b/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
deleted file mode 100644
index 776816892b30..000000000000
--- a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001
-From: Antonio Borneo <borneo.antonio@gmail.com>
-Date: Wed, 23 Jun 2021 16:52:16 +0200
-Subject: [PATCH] stlink: fix SIGSEGV with libusb v1.0.24-33-g32a2206 (11618)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The stlink driver incorrectly uses a NULL pointer for libusb's
-struct libusb_context.
-The correct value to be used is local in libusb_helper.c.
-
-Move in the helper file, in a wrapper function, the only call that
-requires the above value, and let stlink driver to use this
-wrapper.
-
-This issue has not triggered any visible problem until a code
-refactoring [1] in libusb has made OpenOCD crashing on Windows and
-on MacOS.
-
-Change-Id: Id1818c8af7cf0d4d17dfa1d22aad079da01ef740
-Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
-Fixes: https://sourceforge.net/p/openocd/tickets/308/
-Fixes: https://github.com/libusb/libusb/issues/928/
-Fixes: 42d8fa899c6a ("stlink_usb: Submit multiple USB URBs at once to improve performance")
-Link: [1] https://github.com/libusb/libusb/commit/32a22069428c
-Reported-by: Andrzej Sierżęga <asier70@gmail.com>
-Co-developed-by: Andrzej Sierżęga <asier70@gmail.com>
-Co-developed-by: Xiaofan Chen <xiaofanc@gmail.com>
-Reviewed-on: http://openocd.zylin.com/6331
-Tested-by: jenkins
-Reviewed-by: Marc Schink <dev@zapb.de>
-Reviewed-by: Xiaofan <xiaofanc@gmail.com>
-Reviewed-by: Andrzej Sierżęga <asier70@gmail.com>
-Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
-Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
----
- src/jtag/drivers/libusb_helper.c | 5 +++++
- src/jtag/drivers/libusb_helper.h | 1 +
- src/jtag/drivers/stlink_usb.c | 7 +------
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c
-index f0122d534..18fe4bad4 100644
---- a/src/jtag/drivers/libusb_helper.c
-+++ b/src/jtag/drivers/libusb_helper.c
-@@ -363,3 +363,8 @@ int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid)
-
- return ERROR_FAIL;
- }
-+
-+int jtag_libusb_handle_events_completed(int *completed)
-+{
-+ return libusb_handle_events_completed(jtag_libusb_context, completed);
-+}
-diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h
-index fa7d06e28..3e77865d6 100644
---- a/src/jtag/drivers/libusb_helper.h
-+++ b/src/jtag/drivers/libusb_helper.h
-@@ -60,5 +60,6 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh,
- unsigned int *usb_write_ep,
- int bclass, int subclass, int protocol, int trans_type);
- int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid);
-+int jtag_libusb_handle_events_completed(int *completed);
-
- #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */
-diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
-index c68bbb3ca..7b1932b9f 100644
---- a/src/jtag/drivers/stlink_usb.c
-+++ b/src/jtag/drivers/stlink_usb.c
-@@ -497,13 +497,8 @@ static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer)
- {
- int r, *completed = transfer->user_data;
-
-- /* Assuming a single libusb context exists. There no existing interface into this
-- * module to pass a libusb context.
-- */
-- struct libusb_context *ctx = NULL;
--
- while (!*completed) {
-- r = libusb_handle_events_completed(ctx, completed);
-+ r = jtag_libusb_handle_events_completed(completed);
- if (r < 0) {
- if (r == LIBUSB_ERROR_INTERRUPTED)
- continue;
---
-2.35.1
-
diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
index 91eb56d930ea..938711d86c0f 100644
--- a/package/openocd/openocd.hash
+++ b/package/openocd/openocd.hash
@@ -1,3 +1,15 @@
-# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
-sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/
+sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2
+sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING
+sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0
+sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt
+sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause
+sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause
+sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views
+sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause
+sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code
+sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2
+sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme
+sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0
+sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
+sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 37a06ca848b7..2645f9a02465 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -4,12 +4,20 @@
#
################################################################################
-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+
-OPENOCD_LICENSE_FILES = COPYING
-# 0002-configure-enable-build-on-uclinux.patch patches configure.ac
+OPENOCD_LICENSE = GPL-2.0+ (code), GFDL-1.2-no-invariants-or-later (docs), \
+ GPL-3.0+, (stand-alone code), BSD-1-clause, BSD-2-clause, BSD-3-clause, \
+ MIT, BSD-Source-Code, eCos-exception-2.0
+OPENOCD_LICENSE_FILES = COPYING LICENSES/exceptions/eCos-exception-2.0 \
+ LICENSES/license-rules.txt LICENSES/preferred/BSD-1-Clause \
+ LICENSES/preferred/BSD-2-Clause LICENSES/preferred/BSD-2-Clause-Views \
+ LICENSES/preferred/BSD-3-Clause LICENSES/preferred/BSD-Source-Code \
+ LICENSES/preferred/GFDL-1.2 LICENSES/preferred/gfdl-1.2.texi.readme \
+ LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT \
+ LICENSES/stand-alone/GPL-3.0
+# 0001-configure-enable-build-on-uclinux.patch patches configure.ac
OPENOCD_AUTORECONF = YES
OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
--
2.32.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-04-11 20:39 [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0 Dario Binacchi
@ 2023-04-15 13:29 ` Yann E. MORIN
2023-04-23 9:38 ` Peter Korsgaard
1 sibling, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2023-04-15 13:29 UTC (permalink / raw)
To: Dario Binacchi; +Cc: buildroot
Dario, All,
On 2023-04-11 22:39 +0200, Dario Binacchi spake thusly:
[--SNIP--]
> The new version moves the GPL-2.0 license from COPYING to the subfolder
> "preferred", adding the header required by spdxcheck.py. A minimalist
> COPYING is added in the top directory, as required by automake, pointing
> to the files in LICENSES.
[--SNIP--]
> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
> index 37a06ca848b7..2645f9a02465 100644
> --- a/package/openocd/openocd.mk
> +++ b/package/openocd/openocd.mk
> @@ -4,12 +4,20 @@
> #
> ################################################################################
>
> -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+
> -OPENOCD_LICENSE_FILES = COPYING
> -# 0002-configure-enable-build-on-uclinux.patch patches configure.ac
> +OPENOCD_LICENSE = GPL-2.0+ (code), GFDL-1.2-no-invariants-or-later (docs), \
> + GPL-3.0+, (stand-alone code), BSD-1-clause, BSD-2-clause, BSD-3-clause, \
> + MIT, BSD-Source-Code, eCos-exception-2.0
> +OPENOCD_LICENSE_FILES = COPYING LICENSES/exceptions/eCos-exception-2.0 \
> + LICENSES/license-rules.txt LICENSES/preferred/BSD-1-Clause \
> + LICENSES/preferred/BSD-2-Clause LICENSES/preferred/BSD-2-Clause-Views \
> + LICENSES/preferred/BSD-3-Clause LICENSES/preferred/BSD-Source-Code \
> + LICENSES/preferred/GFDL-1.2 LICENSES/preferred/gfdl-1.2.texi.readme \
> + LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT \
> + LICENSES/stand-alone/GPL-3.0
> +# 0001-configure-enable-build-on-uclinux.patch patches configure.ac
This is a bit difficult to read, so I changed it to one-item per line.
Also, listing the eCos exception by itself was a little weird, so I
looked at the code, and it turns out there a single file that references
that exception:
src/flash/nand/ecc.c
The SPDX identifier for that file is:
SPDX-License-Identifier: GPL-2.0-or-later WITH eCos-exception-2.0
It is part of openocd itself (the executalbe), via libopenocd.la (which
is a convenience library, i.e. a static lib that is not installed).
So, I believe the real licening terms should be:
OPENOCD_LICENSE = \
BSD-1-clause, \
BSD-2-clause, \
BSD-2-Clause-Views, \
BSD-3-clause, \
BSD-Source-Code, \
GFDL-1.2-no-invariants-or-later (docs), \
GPL-2.0+ eith eCos-exception-2.0 (code), \
GPL-3.0+ (stand-alone code), \
MIT
I was about to do so before I pushed, but I'd like a bit of feedback...
Thoughts?
Anyway, as all the licensing details were there, I pushed without the
above issue addressed, so can you please look into sending a follow-up
patch to explain fix it and all the above, please?
Regards,
Yann E. MORIN.
> OPENOCD_AUTORECONF = YES
> OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
>
> --
> 2.32.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-04-11 20:39 [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0 Dario Binacchi
2023-04-15 13:29 ` Yann E. MORIN
@ 2023-04-23 9:38 ` Peter Korsgaard
2023-04-23 9:57 ` Baruch Siach via buildroot
1 sibling, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2023-04-23 9:38 UTC (permalink / raw)
To: Dario Binacchi; +Cc: buildroot
>>>>> "Dario" == Dario Binacchi <dario.binacchi@amarulasolutions.com> writes:
> 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.
> The new version moves the GPL-2.0 license from COPYING to the subfolder
> "preferred", adding the header required by spdxcheck.py. A minimalist
> COPYING is added in the top directory, as required by automake, pointing
> to the files in LICENSES.
> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> Changes in v2:
> - Explain in the commit message why the license hash changed.
> - Add all license files and updates their tags and hashes accordingly.
Committed to 2023.02.x given the fixes, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-04-23 9:38 ` Peter Korsgaard
@ 2023-04-23 9:57 ` Baruch Siach via buildroot
2023-04-23 10:44 ` Peter Korsgaard
0 siblings, 1 reply; 8+ messages in thread
From: Baruch Siach via buildroot @ 2023-04-23 9:57 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: Dario Binacchi, buildroot
Hi Peter,
On Sun, Apr 23 2023, Peter Korsgaard wrote:
>>>>>> "Dario" == Dario Binacchi <dario.binacchi@amarulasolutions.com> writes:
>
> > 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.
>
> > The new version moves the GPL-2.0 license from COPYING to the subfolder
> > "preferred", adding the header required by spdxcheck.py. A minimalist
> > COPYING is added in the top directory, as required by automake, pointing
> > to the files in LICENSES.
>
> > [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> > ---
>
> > Changes in v2:
> > - Explain in the commit message why the license hash changed.
> > - Add all license files and updates their tags and hashes accordingly.
>
>
> Committed to 2023.02.x given the fixes, thanks.
Not in current 2023.02.x branch as of commit cec14f3328bd7
("package/mali-driver: bump to version 2023-04-04").
baruch
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-04-23 9:57 ` Baruch Siach via buildroot
@ 2023-04-23 10:44 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2023-04-23 10:44 UTC (permalink / raw)
To: Baruch Siach; +Cc: Dario Binacchi, buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
Hi,
>> > Changes in v2:
>> > - Explain in the commit message why the license hash changed.
>> > - Add all license files and updates their tags and hashes accordingly.
>>
>>
>> Committed to 2023.02.x given the fixes, thanks.
> Not in current 2023.02.x branch as of commit cec14f3328bd7
> ("package/mali-driver: bump to version 2023-04-04").
Sorry, it is there now. Thanks for the heads up!
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/1] package/openocd: bump to 0.12.0
@ 2023-03-13 18:32 Roman Passler
2023-03-14 12:13 ` [Buildroot] [PATCH v2 " Roman Passler
0 siblings, 1 reply; 8+ messages in thread
From: Roman Passler @ 2023-03-13 18:32 UTC (permalink / raw)
To: buildroot; +Cc: Roman Passler
Change-Id: Ie76a4f365af3f59c80241fe4935129d1098b140d
Signed-off-by: Roman Passler <roman.passler@gmail.com>
---
package/openocd/openocd.hash | 6 +++---
package/openocd/openocd.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
index 91eb56d930..325f55bf04 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
+# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/
+sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2
+sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 37a06ca848..95a7fd3c2a 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+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-03-13 18:32 [Buildroot] [PATCH " Roman Passler
@ 2023-03-14 12:13 ` Roman Passler
2023-03-14 22:33 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 8+ messages in thread
From: Roman Passler @ 2023-03-14 12:13 UTC (permalink / raw)
To: buildroot; +Cc: Roman Passler, thomas.petazzoni
- The hash of the COPYING file has been updated and the hashes of the
files under LICENCES have been added. This is because the license has
been moved and 'license-rules.txt' has been included to comply with
checkpatch requirements:
https://sourceforge.net/p/openocd/code/ci/659e2e9da9a7d570827984cb3afdb2a44c3672e3/
https://sourceforge.net/p/openocd/code/ci/96aaa77f72a721f058f3863f270c2ba3d8d68871/
- removed patch 0002 because it was fixed in jimtcl:
https://github.com/msteveb/jimtcl/commit/7ccf7db0aa24ba0d091070ab1c8e29925548bab4
- removed patch 0003 because it was fixed in openocd:
https://sourceforge.net/p/openocd/code/ci/cff0e417da58adef1ceef9a63a99412c2cc87ff3
Signed-off-by: Roman Passler <roman.passler@gmail.com>
---
Changes v1 -> v2
- removed Change-Id as requested by Thomas
- add explanation in the commit log as requested by Thomas
- add all files from LICENCES/ to the hash file
- deleted fixed & merged patches
...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 -------
...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 -------------------
package/openocd/openocd.hash | 18 +++-
package/openocd/openocd.mk | 2 +-
4 files changed, 16 insertions(+), 125 deletions(-)
delete mode 100644 package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
delete mode 100644 package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
deleted file mode 100644
index ecb716b6fa..0000000000
--- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 6 Oct 2021 17:43:16 +0200
-Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70
-
-Fix the following build failure raised with openocd and autoconf >= 2.70
-due to
-http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf:
-
->>> openocd 0.11.0 Autoreconfiguring
-autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script?
-
-Fixes:
- - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/msteveb/jimtcl/pull/209]
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac
-index b70b5d8..8c45114 100644
---- a/jimtcl/configure.ac
-+++ b/jimtcl/configure.ac
-@@ -1 +1,3 @@
- # Dummy configure.ac to make automake happy
-+AC_INIT([jimtcl], [0.80])
-+AC_OUTPUT
---
-2.33.0
-
diff --git a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch b/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
deleted file mode 100644
index 776816892b..0000000000
--- a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001
-From: Antonio Borneo <borneo.antonio@gmail.com>
-Date: Wed, 23 Jun 2021 16:52:16 +0200
-Subject: [PATCH] stlink: fix SIGSEGV with libusb v1.0.24-33-g32a2206 (11618)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The stlink driver incorrectly uses a NULL pointer for libusb's
-struct libusb_context.
-The correct value to be used is local in libusb_helper.c.
-
-Move in the helper file, in a wrapper function, the only call that
-requires the above value, and let stlink driver to use this
-wrapper.
-
-This issue has not triggered any visible problem until a code
-refactoring [1] in libusb has made OpenOCD crashing on Windows and
-on MacOS.
-
-Change-Id: Id1818c8af7cf0d4d17dfa1d22aad079da01ef740
-Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
-Fixes: https://sourceforge.net/p/openocd/tickets/308/
-Fixes: https://github.com/libusb/libusb/issues/928/
-Fixes: 42d8fa899c6a ("stlink_usb: Submit multiple USB URBs at once to improve performance")
-Link: [1] https://github.com/libusb/libusb/commit/32a22069428c
-Reported-by: Andrzej Sierżęga <asier70@gmail.com>
-Co-developed-by: Andrzej Sierżęga <asier70@gmail.com>
-Co-developed-by: Xiaofan Chen <xiaofanc@gmail.com>
-Reviewed-on: http://openocd.zylin.com/6331
-Tested-by: jenkins
-Reviewed-by: Marc Schink <dev@zapb.de>
-Reviewed-by: Xiaofan <xiaofanc@gmail.com>
-Reviewed-by: Andrzej Sierżęga <asier70@gmail.com>
-Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
-Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
----
- src/jtag/drivers/libusb_helper.c | 5 +++++
- src/jtag/drivers/libusb_helper.h | 1 +
- src/jtag/drivers/stlink_usb.c | 7 +------
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c
-index f0122d534..18fe4bad4 100644
---- a/src/jtag/drivers/libusb_helper.c
-+++ b/src/jtag/drivers/libusb_helper.c
-@@ -363,3 +363,8 @@ int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid)
-
- return ERROR_FAIL;
- }
-+
-+int jtag_libusb_handle_events_completed(int *completed)
-+{
-+ return libusb_handle_events_completed(jtag_libusb_context, completed);
-+}
-diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h
-index fa7d06e28..3e77865d6 100644
---- a/src/jtag/drivers/libusb_helper.h
-+++ b/src/jtag/drivers/libusb_helper.h
-@@ -60,5 +60,6 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh,
- unsigned int *usb_write_ep,
- int bclass, int subclass, int protocol, int trans_type);
- int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid);
-+int jtag_libusb_handle_events_completed(int *completed);
-
- #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */
-diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
-index c68bbb3ca..7b1932b9f 100644
---- a/src/jtag/drivers/stlink_usb.c
-+++ b/src/jtag/drivers/stlink_usb.c
-@@ -497,13 +497,8 @@ static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer)
- {
- int r, *completed = transfer->user_data;
-
-- /* Assuming a single libusb context exists. There no existing interface into this
-- * module to pass a libusb context.
-- */
-- struct libusb_context *ctx = NULL;
--
- while (!*completed) {
-- r = libusb_handle_events_completed(ctx, completed);
-+ r = jtag_libusb_handle_events_completed(completed);
- if (r < 0) {
- if (r == LIBUSB_ERROR_INTERRUPTED)
- continue;
---
-2.35.1
-
diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
index 91eb56d930..7f828172f1 100644
--- a/package/openocd/openocd.hash
+++ b/package/openocd/openocd.hash
@@ -1,3 +1,15 @@
-# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
-sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/
+sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2
+sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING
+sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt
+sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0
+sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause
+sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause
+sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views
+sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause
+sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code
+sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2
+sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme
+sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0
+sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
+sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 37a06ca848..95a7fd3c2a 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+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-03-14 12:13 ` [Buildroot] [PATCH v2 " Roman Passler
@ 2023-03-14 22:33 ` Thomas Petazzoni via buildroot
2023-03-15 20:44 ` Arnout Vandecappelle
0 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-03-14 22:33 UTC (permalink / raw)
To: Roman Passler; +Cc: Yann E. MORIN, buildroot
Hello Roman,
Thanks for this new iteration. I still have some concern about the
licensing, so I've added other maintainers in Cc.
On Tue, 14 Mar 2023 13:13:32 +0100
Roman Passler <roman.passler@gmail.com> wrote:
> diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
> index 91eb56d930..7f828172f1 100644
> --- a/package/openocd/openocd.hash
> +++ b/package/openocd/openocd.hash
> @@ -1,3 +1,15 @@
> -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
> -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2
> -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
> +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/
> +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2
> +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING
> +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt
> +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0
> +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause
> +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause
> +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views
> +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause
> +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code
> +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2
> +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme
> +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0
> +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
> +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0
> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
> index 37a06ca848..95a7fd3c2a 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+
Roman: one thing that isn't good is that you are not adding the new
license files in the OPENOCD_LICENSE_FILES variable, it makes the new
hashes quite useless.
Arnout, Peter, Yann: the COPYING file states that overall the OpenOCD
license is GPL-2.0+.
The doc is GFDL.
There are 3 files in contrib/ (apparently not installed in the
Buildroot context) which are under GPL-3.0+.
So, do we list all license files in <pkg>_LICENSE_FILES ? Even if in
fact we don't install anything that's under GFDL or GPL-3.0+ ? I'm
particularly concerned by the GPL-3.0+ of course, which is seen by some
companies as a red flag (for good or bad reasons, that's not the point
here). If our installation of OpenOCD does not include GPL-3.0+ code, I
think we should not mention that GPL-3.0+ code is distributed.
Your opinion?
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0
2023-03-14 22:33 ` Thomas Petazzoni via buildroot
@ 2023-03-15 20:44 ` Arnout Vandecappelle
0 siblings, 0 replies; 8+ messages in thread
From: Arnout Vandecappelle @ 2023-03-15 20:44 UTC (permalink / raw)
To: Thomas Petazzoni, Roman Passler; +Cc: Yann E. MORIN, buildroot
On 14/03/2023 23:33, Thomas Petazzoni wrote:
> Hello Roman,
>
> Thanks for this new iteration. I still have some concern about the
> licensing, so I've added other maintainers in Cc.
>
> On Tue, 14 Mar 2023 13:13:32 +0100
> Roman Passler <roman.passler@gmail.com> wrote:
>
>> diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
>> index 91eb56d930..7f828172f1 100644
>> --- a/package/openocd/openocd.hash
>> +++ b/package/openocd/openocd.hash
>> @@ -1,3 +1,15 @@
>> -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
>> -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2
>> -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
>> +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/
>> +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2
>> +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING
>> +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt
>> +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0
>> +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause
>> +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause
>> +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views
>> +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause
>> +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code
>> +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2
>> +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme
>> +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0
>> +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT
>> +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0
>> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
>> index 37a06ca848..95a7fd3c2a 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+
>
> Roman: one thing that isn't good is that you are not adding the new
> license files in the OPENOCD_LICENSE_FILES variable, it makes the new
> hashes quite useless.
>
> Arnout, Peter, Yann: the COPYING file states that overall the OpenOCD
> license is GPL-2.0+.
>
> The doc is GFDL.
>
> There are 3 files in contrib/ (apparently not installed in the
> Buildroot context) which are under GPL-3.0+.
>
> So, do we list all license files in <pkg>_LICENSE_FILES ? Even if in
> fact we don't install anything that's under GFDL or GPL-3.0+ ? I'm
> particularly concerned by the GPL-3.0+ of course, which is seen by some
> companies as a red flag (for good or bad reasons, that's not the point
> here). If our installation of OpenOCD does not include GPL-3.0+ code, I
> think we should not mention that GPL-3.0+ code is distributed.
Typically there should be a _LICENSE_FILES for every individual license
mentioned in _LICENSE, plus an overall README-style file that (in broad strokes)
specifies which license applies when. And in _LICENSE, we should only mention
stuff that goes on the target (or in host/staging/images, actually).
So, for this particular case, _LICENSE is still GPL-2.0+ because we don't
install the doc or contrib. And _LICENSE_FILES should have COPYING and
LICENSES/preferred/GPL-2.0 (and possibly LICENSES/license-rules.txt as well, I
don't know what that contains).
Unless the GPL-2.0+ statement is not actually correct and there are source
files that end up on the target that have a different license; those should then
be added to _LICENSE and _LICENSE_FILES as well, of course.
Regards,
Arnout
>
> Your opinion?
>
> Best regards,
>
> Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-04-23 10:44 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-11 20:39 [Buildroot] [PATCH v2 1/1] package/openocd: bump to 0.12.0 Dario Binacchi
2023-04-15 13:29 ` Yann E. MORIN
2023-04-23 9:38 ` Peter Korsgaard
2023-04-23 9:57 ` Baruch Siach via buildroot
2023-04-23 10:44 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2023-03-13 18:32 [Buildroot] [PATCH " Roman Passler
2023-03-14 12:13 ` [Buildroot] [PATCH v2 " Roman Passler
2023-03-14 22:33 ` Thomas Petazzoni via buildroot
2023-03-15 20:44 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).