From 2bf78a1187fefd0ce53acf9a082a7296034703ddda6b7ae438f0aa2f0fa33ce8 Mon Sep 17 00:00:00 2001 From: Matwey Kornilov Date: Tue, 23 Mar 2021 17:52:05 +0000 Subject: [PATCH] Accepting request 880714 from home:phiwag:branches:hardware - Update to upstream version 0.11.0. The list of changes is massive, see https://sourceforge.net/p/openocd/code/ci/master/tree/NEWS-0.11.0 for details. - libjaylink 0.2.0 is now required. - Removed 0001-bitbang-Fix-FTBFS-with-GCC-10.patch patch. - Use a source service to download sources. OBS-URL: https://build.opensuse.org/request/show/880714 OBS-URL: https://build.opensuse.org/package/show/hardware/openocd?expand=0&rev=26 --- 0001-bitbang-Fix-FTBFS-with-GCC-10.patch | 34 ----------------------- _service | 3 ++ openocd-0.10.0.tar.bz2 | 3 -- openocd-0.10.0.tar.bz2.sha1 | 1 - openocd-0.10.0.tar.bz2.sig | Bin 95 -> 0 bytes openocd-0.11.0.tar.bz2 | 3 ++ openocd-0.11.0.tar.bz2.sha1 | 12 ++++++++ openocd-0.11.0.tar.bz2.sig | Bin 0 -> 95 bytes openocd.changes | 11 ++++++++ openocd.spec | 12 ++++---- 10 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 0001-bitbang-Fix-FTBFS-with-GCC-10.patch create mode 100644 _service delete mode 100644 openocd-0.10.0.tar.bz2 delete mode 100644 openocd-0.10.0.tar.bz2.sha1 delete mode 100644 openocd-0.10.0.tar.bz2.sig create mode 100644 openocd-0.11.0.tar.bz2 create mode 100644 openocd-0.11.0.tar.bz2.sha1 create mode 100644 openocd-0.11.0.tar.bz2.sig diff --git a/0001-bitbang-Fix-FTBFS-with-GCC-10.patch b/0001-bitbang-Fix-FTBFS-with-GCC-10.patch deleted file mode 100644 index 0ed274d..0000000 --- a/0001-bitbang-Fix-FTBFS-with-GCC-10.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 -From: Andreas Fritiofson -Date: Fri, 17 Apr 2020 13:49:28 +0200 -Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 - -GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd -struct between bitbang drivers due to a missing extern. - -Change-Id: I2b4122f7939cec91a72284006748f99a23548324 -Signed-off-by: Andreas Fritiofson -Reviewed-on: http://openocd.zylin.com/5592 -Tested-by: jenkins -Reviewed-by: Antonio Borneo -Reviewed-by: Jonathan McDowell ---- - src/jtag/drivers/bitbang.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h -index edb779ca..bbbc693d 100644 ---- a/src/jtag/drivers/bitbang.h -+++ b/src/jtag/drivers/bitbang.h -@@ -56,7 +56,7 @@ struct bitbang_interface { - void (*swdio_drive)(bool on); - }; - --const struct swd_driver bitbang_swd; -+extern const struct swd_driver bitbang_swd; - - extern bool swd_mode; - --- -2.25.0 - diff --git a/_service b/_service new file mode 100644 index 0000000..e6be0cf --- /dev/null +++ b/_service @@ -0,0 +1,3 @@ + + + diff --git a/openocd-0.10.0.tar.bz2 b/openocd-0.10.0.tar.bz2 deleted file mode 100644 index b7df526..0000000 --- a/openocd-0.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7312e7d680752ac088b8b8f2b5ba3ff0d30e0a78139531847be4b75c101316ae -size 4792636 diff --git a/openocd-0.10.0.tar.bz2.sha1 b/openocd-0.10.0.tar.bz2.sha1 deleted file mode 100644 index 45e1c7f..0000000 --- a/openocd-0.10.0.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a openocd-0.10.0.tar.bz2 diff --git a/openocd-0.10.0.tar.bz2.sig b/openocd-0.10.0.tar.bz2.sig deleted file mode 100644 index 3db4727090ea7ecf780e3bc7f903a9237fa57214a3b75584d7040be899210514..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WU=e@R$Fyv?m`X@wc=H}ht@6qd^?PlDWX*_n1PE^04CC>%P@ya vV7jB^Jb@RH(?c$l6~z=xSiR>i!-8%r+Y1MuUa$ObJ7u}%bUz6@uJ?xlaz-a9 diff --git a/openocd-0.11.0.tar.bz2 b/openocd-0.11.0.tar.bz2 new file mode 100644 index 0000000..42ad12c --- /dev/null +++ b/openocd-0.11.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d +size 5699972 diff --git a/openocd-0.11.0.tar.bz2.sha1 b/openocd-0.11.0.tar.bz2.sha1 new file mode 100644 index 0000000..6b3ff88 --- /dev/null +++ b/openocd-0.11.0.tar.bz2.sha1 @@ -0,0 +1,12 @@ + + + 404 Not Found + + +

404 Not Found

+ The resource could not be found.

+ + + + + \ No newline at end of file diff --git a/openocd-0.11.0.tar.bz2.sig b/openocd-0.11.0.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..70e87ae4d2bc91f07642113f6d902e19b4547246cdb194106fe0d1292161dd94 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WU=e@R$Fyv?m`X@wc=H}ht@6qd^?PlDZ%BWA_Etv08C`pZH5KY wwnfjjG(2=8cw5ZjrGR)y&`tU@5%^|I2?iZ3aulTyJE1;zn0M|Sz%>V!Z literal 0 HcmV?d00001 diff --git a/openocd.changes b/openocd.changes index 34a011d..668da5f 100644 --- a/openocd.changes +++ b/openocd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Mar 23 10:49:12 UTC 2021 - Philipp Wagner + +- Update to upstream version 0.11.0. + The list of changes is massive, see + https://sourceforge.net/p/openocd/code/ci/master/tree/NEWS-0.11.0 + for details. +- libjaylink 0.2.0 is now required. +- Removed 0001-bitbang-Fix-FTBFS-with-GCC-10.patch patch. +- Use a source service to download sources. + ------------------------------------------------------------------- Sun Jun 7 08:31:54 UTC 2020 - Matwey Kornilov diff --git a/openocd.spec b/openocd.spec index 61e6359..fd194ff 100644 --- a/openocd.spec +++ b/openocd.spec @@ -1,7 +1,7 @@ # # spec file for package openocd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %define _udevdir %(pkg-config --variable udevdir udev) Name: openocd -Version: 0.10.0 +Version: 0.11.0 Release: 0 Summary: Debugging, in-system programming and boundary-scan testing for embedded devices License: GPL-2.0-only @@ -36,7 +36,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2.sig Source2: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2.sha1 Source3: %name.keyring -Patch0: 0001-bitbang-Fix-FTBFS-with-GCC-10.patch BuildRequires: autoconf >= 2.64 BuildRequires: automake BuildRequires: fdupes @@ -46,7 +45,7 @@ BuildRequires: jimtcl-devel BuildRequires: libftdi1-devel BuildRequires: libhidapi-devel %if %{external_libjaylink} -BuildRequires: libjaylink-devel +BuildRequires: libjaylink-devel >= 0.2.0 %endif BuildRequires: libtool BuildRequires: libusb-compat-devel @@ -58,8 +57,8 @@ BuildRequires: pkgconfig(udev) Requires: %{name}-data = %{version} Requires(post): udev Requires(post): %{install_info_prereq} -Requires(preun): %{install_info_prereq} -Requires(postun): udev +Requires(preun):%{install_info_prereq} +Requires(postun):udev %description The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming @@ -82,7 +81,6 @@ This package provides hardware description files and documentation. %prep %setup -q -%patch0 -p1 %build %if !%{external_jimtcl}