package/openocd: bump to 0.12.0
PATCH 1/1 package/openocd: bump to 0.12.0
--- package/openocd/openocd.hash | 6 +++--- package/openocd/openocd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
package/openocd/openocd.hash +3 -3
@@ -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
package/openocd/openocd.mk +1 -1
@@ -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+
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Roman,
Thanks for your contribution! Some comments below.
Quoted 1 line · On Mon, 13 Mar 2023 19:32:35 +0100 Roman Passler <[email protected]>…
Change-Id: Ie76a4f365af3f59c80241fe4935129d1098b140d
Not a big deal, but we don't need/want a Change-Id in commit logs of Buildroot commits. If you can easily avoid adding one, it would be great.
Quoted 11 lines
Signed-off-by Roman Passler <[email protected]>--- package/openocd/openocd.hash | 6 +++--- package/openocd/openocd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/openocd/openocd.hash +0
-0
package/openocd/openocd.hash line 3
Quoted 6 lines
package/openocd/openocd.hash +3
-3@@ -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
Could you please add an explanation in the commit log about why the hash of the license file is changed?
Indeed, we precisely have such hashes to detect changes in the licensing terms, analyze them and check how they affect the overall licensing of the package. So if the hash is "blindly" changed, having a hash doesn't make sense in the first place. Therefore, we ask to have a short note in the commit log that justifies the change of license file hash.
Could you have a look into this, and send a 2nd version?
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Thomas,
Thank you for your fast respond.
Quoted 9 lines
Could you please add an explanation in the commit log about why the hash of the license file is changed?
Indeed, we precisely have such hashes to detect changes in the licensing terms, analyze them and check how they affect the overall licensing of the package. So if the hash is "blindly" changed, having a hash doesn't make sense in the first place. Therefore, we ask to have a short note in the commit log that justifies the change of license file hash.
The license files have been relocated to the LICENSES/* directory (available at https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/LICENSES/).
The license files have been moved to the LICENSES/* directory, which can be found at https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/LICENSES/.
Should they be added to the hash file, or is the COPYING file at
https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/COPYING sufficient?
Thanks,
Roman
Am Mo., 13. März 2023 um 22:54 Uhr schrieb Thomas Petazzoni < [email protected]>:
Quoted 49 lines
Hello Roman,
Thanks for your contribution! Some comments below.
Quoted 1 line · On Mon, 13 Mar 2023 19:32:35 +0100 Roman Passler <[email protected]>…
Change-Id: Ie76a4f365af3f59c80241fe4935129d1098b140d
Not a big deal, but we don't need/want a Change-Id in commit logs of Buildroot commits. If you can easily avoid adding one, it would be great.
package/openocd/openocd.hash line 2
Quoted 13 lines
Signed-off-by Roman Passler <[email protected]>--- package/openocd/openocd.hash | 6 +++--- package/openocd/openocd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/openocd/openocd.hash +0
-2@@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ -sha256
43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7dopenocd-0.11.0.tar.bz2package/openocd/openocd.hash line 3
Quoted 1 line
package/openocd/openocd.hash +0
-1-sha256
8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643COPYINGpackage/openocd/openocd.hash line 2
Quoted 2 lines
package/openocd/openocd.hash +2
-0+# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/ +sha256
af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afaopenocd-0.12.0.tar.bz2package/openocd/openocd.hash line 3
Quoted 1 line
package/openocd/openocd.hash +1
-0+sha256
1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419COPYINGCould you please add an explanation in the commit log about why the hash of the license file is changed?
Indeed, we precisely have such hashes to detect changes in the licensing terms, analyze them and check how they affect the overall licensing of the package. So if the hash is "blindly" changed, having a hash doesn't make sense in the first place. Therefore, we ask to have a short note in the commit log that justifies the change of license file hash.
Could you have a look into this, and send a 2nd version?
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Roman,
Quoted 6 lines · On Tue, 14 Mar 2023 08:25:27 +0100 roman <[email protected]> wrote:
The license files have been relocated to the
LICENSES/*directory (available at https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/LICENSES/).
The license files have been moved to theLICENSES/*directory, which can be found at https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/LICENSES/.
Should they be added to the hash file, or is the COPYING file at
https://sourceforge.net/p/openocd/code/ci/v0.12.0/tree/COPYING sufficient?
Yes, it would be good to add the files in LICENSES/ in the OPENOCD_LICENSE variable, and therefore in the hash file as well;
Thanks a lot!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/1 package/openocd: bump to 0.12.0
In reply to Roman Passler- 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
---
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
package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -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 <[email protected]> -[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 -
package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted +0 -89
89 lines not on this page · raw message
package/openocd/openocd.hash +15 -3
@@ -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
package/openocd/openocd.mk +1 -1
@@ -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+
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Roman,
Thanks for this new iteration. I still have some concern about the licensing, so I've added other maintainers in Cc.
Quoted 28 lines · On Tue, 14 Mar 2023 13:13:32 +0100 Roman Passler <[email protected]>…
package/openocd/openocd.hash +15
-3@@ -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.0package/openocd/openocd.mk +0
-0
package/openocd/openocd.mk line 10
Quoted 8 lines
package/openocd/openocd.mk +1
-1@@ -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
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 57 lines · Thomas Petazzoni
Hello Roman,
Thanks for this new iteration. I still have some concern about the licensing, so I've added other maintainers in Cc.
Quoted 28 lines · On Tue, 14 Mar 2023 13:13:32 +0100 Roman Passler <[email protected]>…
package/openocd/openocd.hash +15
-3@@ -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.0package/openocd/openocd.mk +0
-0package/openocd/openocd.mk line 10
Quoted 8 lines
package/openocd/openocd.mk +1
-1@@ -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_FILESvariable, 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+.
Quoted 6 lines
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
Quoted 6 lines
Your opinion?
Best regards,
Thomas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 1/1 package/openocd: bump to 0.12.0
In reply to Roman Passler- The hash of the COPYING file has been updated and the hashes of the files LICENSES/preferred/GPL-2.0 and license-rules.txt 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
---
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
Changes v2 -> v3
- remove the following files from the hashfile as per Arnout's request:
* LICENSES/preferred/GPL-2.0 and license-rules.txt
* LICENSES/exceptions/eCos-exception-2.0
* 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/MIT
* LICENSES/stand-alone/GPL-3.0
- add LICENSES/preferred/GPL-2.0 and license-rules.txt to the OPENOCD_LICENSE variable, as requested by Thomas
...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 ------- ...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 ------------------- package/openocd/openocd.hash | 9 +- package/openocd/openocd.mk | 7 +- 4 files changed, 11 insertions(+), 126 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
package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -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 <[email protected]> -[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 -
package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted +0 -89
89 lines not on this page · raw message
package/openocd/openocd.hash +6 -3
@@ -1,3 +1,6 @@ -# 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 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0 +
package/openocd/openocd.mk +5 -2
@@ -4,11 +4,14 @@ # ################################################################################ -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 +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/preferred/GPL-2.0 # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v4 1/1 package/openocd: bump to 0.12.0
- The hash of the COPYING file has been updated and the hashes of the files LICENSES/preferred/GPL-2.0 and license-rules.txt 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
---
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
Changes v2 -> v3
- remove the following files from the hashfile as per Arnout's request:
* LICENSES/preferred/GPL-2.0 and license-rules.txt
* LICENSES/exceptions/eCos-exception-2.0
* 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/MIT
* LICENSES/stand-alone/GPL-3.0
- add LICENSES/preferred/GPL-2.0 and license-rules.txt to the OPENOCD_LICENSE variable, as requested by Thomas
Changes v3 -> v4
- remove empty line at end of the hash file
...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 ------- ...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 ------------------- package/openocd/openocd.hash | 8 +- package/openocd/openocd.mk | 7 +- 4 files changed, 10 insertions(+), 126 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
package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -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 <[email protected]> -[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 -
package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted +0 -89
89 lines not on this page · raw message
package/openocd/openocd.hash +5 -3
@@ -1,3 +1,5 @@ -# 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 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0
package/openocd/openocd.mk +5 -2
@@ -4,11 +4,14 @@ # ################################################################################ -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 +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/preferred/GPL-2.0 # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Roman, All,
On 2023-03-17 09:05 +0100, Roman Passler spake thusly:
Quoted 11 lines
- The hash of the COPYING file has been updated and the hashes of the files
LICENSES/preferred/GPL-2.0and license-rules.txt 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
Thanks for this patch. However, I eventually applied (a few days ago and today) patches from Dario, as their change was more exhaustive wrt the licensing changes.
Regards,
Yann E. MORIN.
Quoted 207 lines
Signed-off-by Roman Passler <[email protected]>---
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
Changes v2 -> v3
- remove the following files from the hashfile as per Arnout's request:
*LICENSES/preferred/GPL-2.0and license-rules.txt
*LICENSES/exceptions/eCos-exception-2.0
*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/MIT
*LICENSES/stand-alone/GPL-3.0
- addLICENSES/preferred/GPL-2.0and license-rules.txt to theOPENOCD_LICENSEvariable, as requested by Thomas
Changes v3 -> v4
- remove empty line at end of the hash file...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 ------- ...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 ------------------- package/openocd/openocd.hash | 8 +- package/openocd/openocd.mk | 7 +- 4 files changed, 10 insertions(+), 126 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.patchpackage/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted +0
-32@@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -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 <[email protected]> -[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 -package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted +0
-89@@ -1,89 +0,0 @@ -From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001 -From: Antonio Borneo <[email protected]> -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 <[email protected]> -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 <[email protected]> -Co-developed-by: Andrzej Sierżęga <[email protected]> -Co-developed-by: Xiaofan Chen <[email protected]> -Reviewed-on: http://openocd.zylin.com/6331 -Tested-by: jenkins -Reviewed-by: Marc Schink <[email protected]> -Reviewed-by: Xiaofan <[email protected]> -Reviewed-by: Andrzej Sierżęga <[email protected]> -Reviewed-by: Oleksij Rempel <[email protected]> -Reviewed-by: Andreas Fritiofson <[email protected]> -Signed-off-by: Yannick Brosseau <[email protected]> ---- - 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 -package/openocd/openocd.hash +5
-3@@ -1,3 +1,5 @@ -# 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 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0package/openocd/openocd.mk +5
-2@@ -4,11 +4,14 @@ # ################################################################################ -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 +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/preferred/GPL-2.0 # 0002-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | 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 [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot