forked from pool/openocd
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
This commit is contained in:
Matwey Kornilov
Git OBS Bridge
parent
a6bf971f3f
commit
2bf78a1187
@ -1,34 +0,0 @@
|
|||||||
From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
|
|
||||||
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 <andreas.fritiofson@gmail.com>
|
|
||||||
Reviewed-on: http://openocd.zylin.com/5592
|
|
||||||
Tested-by: jenkins
|
|
||||||
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
|
|
||||||
Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
3
_service
Normal file
3
_service
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<services>
|
||||||
|
<service name="download_files" mode="disabled"/>
|
||||||
|
</services>
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7312e7d680752ac088b8b8f2b5ba3ff0d30e0a78139531847be4b75c101316ae
|
|
||||||
size 4792636
|
|
||||||
@ -1 +0,0 @@
|
|||||||
3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a openocd-0.10.0.tar.bz2
|
|
||||||
Binary file not shown.
3
openocd-0.11.0.tar.bz2
Normal file
3
openocd-0.11.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d
|
||||||
|
size 5699972
|
||||||
12
openocd-0.11.0.tar.bz2.sha1
Normal file
12
openocd-0.11.0.tar.bz2.sha1
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>404 Not Found</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>404 Not Found</h1>
|
||||||
|
The resource could not be found.<br /><br />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
BIN
openocd-0.11.0.tar.bz2.sig
Normal file
BIN
openocd-0.11.0.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 23 10:49:12 UTC 2021 - Philipp Wagner <mail@philipp-wagner.com>
|
||||||
|
|
||||||
|
- 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 <matwey.kornilov@gmail.com>
|
Sun Jun 7 08:31:54 UTC 2020 - Matwey Kornilov <matwey.kornilov@gmail.com>
|
||||||
|
|
||||||
|
|||||||
12
openocd.spec
12
openocd.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package openocd
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
%define _udevdir %(pkg-config --variable udevdir udev)
|
%define _udevdir %(pkg-config --variable udevdir udev)
|
||||||
Name: openocd
|
Name: openocd
|
||||||
Version: 0.10.0
|
Version: 0.11.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Debugging, in-system programming and boundary-scan testing for embedded devices
|
Summary: Debugging, in-system programming and boundary-scan testing for embedded devices
|
||||||
License: GPL-2.0-only
|
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
|
Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2.sig
|
||||||
Source2: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2.sha1
|
Source2: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2.sha1
|
||||||
Source3: %name.keyring
|
Source3: %name.keyring
|
||||||
Patch0: 0001-bitbang-Fix-FTBFS-with-GCC-10.patch
|
|
||||||
BuildRequires: autoconf >= 2.64
|
BuildRequires: autoconf >= 2.64
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -46,7 +45,7 @@ BuildRequires: jimtcl-devel
|
|||||||
BuildRequires: libftdi1-devel
|
BuildRequires: libftdi1-devel
|
||||||
BuildRequires: libhidapi-devel
|
BuildRequires: libhidapi-devel
|
||||||
%if %{external_libjaylink}
|
%if %{external_libjaylink}
|
||||||
BuildRequires: libjaylink-devel
|
BuildRequires: libjaylink-devel >= 0.2.0
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: libusb-compat-devel
|
BuildRequires: libusb-compat-devel
|
||||||
@ -58,8 +57,8 @@ BuildRequires: pkgconfig(udev)
|
|||||||
Requires: %{name}-data = %{version}
|
Requires: %{name}-data = %{version}
|
||||||
Requires(post): udev
|
Requires(post): udev
|
||||||
Requires(post): %{install_info_prereq}
|
Requires(post): %{install_info_prereq}
|
||||||
Requires(preun): %{install_info_prereq}
|
Requires(preun):%{install_info_prereq}
|
||||||
Requires(postun): udev
|
Requires(postun):udev
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming
|
The Open On-Chip Debugger (OpenOCD) provides debugging, in-system programming
|
||||||
@ -82,7 +81,6 @@ This package provides hardware description files and documentation.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if !%{external_jimtcl}
|
%if !%{external_jimtcl}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user