buildroot.busybox.net archive mirror
 help / color / mirror / Atom feed
From: Roman Passler <roman.passler@gmail.com>
To: buildroot@buildroot.org
Cc: Roman Passler <roman.passler@gmail.com>,
	yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com
Subject: [Buildroot] [PATCH v4 1/1] package/openocd: bump to 0.12.0
Date: Fri, 17 Mar 2023 09:05:35 +0100	[thread overview]
Message-ID: <20230317080535.24818-1-roman.passler@gmail.com> (raw)
In-Reply-To: <20230317070301.20327-1-roman.passler@gmail.com>

- 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

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

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..c747817b5d 100644
--- a/package/openocd/openocd.hash
+++ b/package/openocd/openocd.hash
@@ -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
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 37a06ca848..c515225b76 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -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"
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2023-03-17  8:06 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-13 18:32 [Buildroot] [PATCH 1/1] package/openocd: bump to 0.12.0 Roman Passler
2023-03-13 21:54 ` Thomas Petazzoni via buildroot
2023-03-14  7:25   ` roman
2023-03-14  7:38     ` Thomas Petazzoni via buildroot
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
2023-03-17  7:03   ` [Buildroot] [PATCH v3 " Roman Passler
2023-03-17  8:05     ` Roman Passler [this message]
2023-04-23  9:45       ` [Buildroot] [PATCH v4 " Yann E. MORIN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230317080535.24818-1-roman.passler@gmail.com \
    --to=roman.passler@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=yann.morin.1998@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).