[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 44b41380cdce4547c864c407fd6fe1f5ba44989d Author: David Seifert gentoo org> AuthorDate: Mon Dec 25 18:44:20 2017 + Commit: David Seifert gentoo org> CommitDate: Mon Dec 25 19:16:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b41380 dev-embedded/openocd: [QA] Port to git-r3 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-embedded/openocd/openocd-0.10.0.ebuild | 7 +++ dev-embedded/openocd/openocd-0.5.0.ebuild| 11 +-- dev-embedded/openocd/openocd-0.6.1.ebuild| 11 +-- dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 10 -- dev-embedded/openocd/openocd-0.8.0.ebuild| 7 +++ dev-embedded/openocd/openocd-0.9.0.ebuild| 7 +++ dev-embedded/openocd/openocd-.ebuild | 7 +++ 7 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index 2fee2af1d44..57ba7a8c69e 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -6,10 +6,9 @@ EAPI="5" inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all -if [[ ${PV} == "" ]] ; then - inherit autotools git-2 - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - EGIT_PROJECT="${PN}" +if [[ ${PV} == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild index 5704e4db3ef..aae09088d93 100644 --- a/dev-embedded/openocd/openocd-0.5.0.ebuild +++ b/dev-embedded/openocd/openocd-0.5.0.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" inherit eutils multilib -if [[ ${PV} == "" ]] ; then - inherit autotools git-2 - KEYWORDS="" - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - EGIT_PROJECT="${PN}" + +if [[ ${PV} == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild index f53195d0c7d..d065bac6e8d 100644 --- a/dev-embedded/openocd/openocd-0.6.1.ebuild +++ b/dev-embedded/openocd/openocd-0.6.1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" inherit eutils multilib flag-o-matic toolchain-funcs -if [[ ${PV} == "" ]] ; then - inherit autotools git-2 - KEYWORDS="" - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - EGIT_PROJECT="${PN}" + +if [[ ${PV} == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild index cbe0594cec5..6ea9209b57f 100644 --- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -6,11 +6,9 @@ EAPI="5" inherit eutils multilib flag-o-matic toolchain-funcs # One ebuild to rule them all -if [[ ${PV} == "" ]] ; then - inherit autotools git-2 - KEYWORDS="" - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - EGIT_PROJECT="${PN}" +if [[ ${PV} == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild index 362bf3eecd2..637aac7abd1 100644 --- a/dev-embedded/openocd/openocd-0.8.0.ebuild +++ b/dev-embedded/openocd/openocd-0.8.0.ebuild @@ -6,10 +6,9 @@ EAPI="5" inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all -if [[ ${PV} == "" ]] ; then - inherit autotools git-2 - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - EGIT_PROJECT="${PN}" +if [[ ${PV} == * ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" diff --git a/dev-embedded/openocd
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 50d92a09f2ac32641eac3c481bc4009796d023ee Author: Sven Wegener gentoo org> AuthorDate: Sat Jan 9 09:26:17 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 09:30:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d92a09 dev-embedded/openocd: Add libjaylink dependency to live ebuild Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 891324d..4328bb9 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -28,6 +28,7 @@ IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=">=dev-lang/jimtcl-0.76 + dev-embedded/libjaylink cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 @@ -53,6 +54,7 @@ src_configure() { --enable-buspirate --disable-werror --disable-internal-jimtcl + --disable-internal-libjaylink --enable-amtjtagaccel --enable-ep93xx --enable-at91rm9200
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 978090ce77ae6f9b2003495134ead4715287025c Author: Sven Wegener gentoo org> AuthorDate: Sun Jan 10 09:23:53 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 09:30:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978090ce dev-embedded/openocd: Add SLOT dep on libftdi Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.5.0.ebuild| 4 ++-- dev-embedded/openocd/openocd-0.6.1.ebuild| 4 ++-- dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 2 +- dev-embedded/openocd/openocd-0.8.0.ebuild| 2 +- dev-embedded/openocd/openocd-0.9.0.ebuild| 2 +- dev-embedded/openocd/openocd-.ebuild | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild index 9f5c5cd..19d7e75 100644 --- a/dev-embedded/openocd/openocd-0.5.0.ebuild +++ b/dev-embedded/openocd/openocd-0.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -27,7 +27,7 @@ DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 511400da261027e414c5b84769ca043d5c9b189b Author: Sven Wegener gentoo org> AuthorDate: Sun Jan 10 09:07:28 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 09:30:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511400da dev-embedded/openocd: Fix quoting issue from repoman Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.8.0.ebuild | 2 +- dev-embedded/openocd/openocd-0.9.0.ebuild | 2 +- dev-embedded/openocd/openocd-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild index c782b06..d7f400c 100644 --- a/dev-embedded/openocd/openocd-0.8.0.ebuild +++ b/dev-embedded/openocd/openocd-0.8.0.ebuild @@ -129,5 +129,5 @@ src_configure() { src_install() { default env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) - udev_dorules ${D}/usr/share/${PN}/contrib/*.rules + udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index cd3ed19..a851ed1 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -125,5 +125,5 @@ src_configure() { src_install() { default env -uRESTRICT prepstrip "${ED}"/usr/bin - udev_dorules ${D}/usr/share/${PN}/contrib/*.rules + udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 4328bb9..1c865e4 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -128,5 +128,5 @@ src_configure() { src_install() { default env -uRESTRICT prepstrip "${ED}"/usr/bin - udev_dorules ${D}/usr/share/${PN}/contrib/*.rules + udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules }
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 04b8bc8e0f533ba7ff86e392d73c03c2baeed400 Author: Sven Wegener gentoo org> AuthorDate: Sat Jan 9 09:25:22 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 09:30:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b8bc8e dev-embedded/openocd: Use EGIT_PROJECT to avoid collision Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 3 ++- dev-embedded/openocd/openocd-0.8.0.ebuild| 3 ++- dev-embedded/openocd/openocd-0.9.0.ebuild| 3 ++- dev-embedded/openocd/openocd-.ebuild | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild index a8eca85..6233f91 100644 --- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,6 +11,7 @@ if [[ ${PV} == "" ]] ; then inherit autotools git-2 KEYWORDS="" EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild index f77d313..c782b06 100644 --- a/dev-embedded/openocd/openocd-0.8.0.ebuild +++ b/dev-embedded/openocd/openocd-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,6 +10,7 @@ inherit eutils multilib flag-o-matic toolchain-funcs udev if [[ ${PV} == "" ]] ; then inherit autotools git-2 EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index c61aec8..cd3ed19 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,6 +10,7 @@ inherit eutils multilib flag-o-matic toolchain-funcs udev if [[ ${PV} == "" ]] ; then inherit autotools git-2 EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 513405c..891324d 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,6 +10,7 @@ inherit eutils multilib flag-o-matic toolchain-funcs udev if [[ ${PV} == "" ]] ; then inherit autotools git-2 EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 827e04796294103251449be7d35467ac22ce03d2 Author: Sven Wegener gentoo org> AuthorDate: Sun Jan 10 10:13:21 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Jan 10 11:17:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827e0479 dev-embedded/openocd: Lower libftdi SLOT dep restriction There's actually compat code inside the ebuild. Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.6.1.ebuild| 4 ++-- dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild index f1b3898..4b08ad20 100644 --- a/dev-embedded/openocd/openocd-0.6.1.ebuild +++ b/dev-embedded/openocd/openocd-0.6.1.ebuild @@ -27,7 +27,7 @@ DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) - ftdi? ( dev-embedded/libftdi:0 )" + ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" @@ -44,7 +44,7 @@ src_prepare() { configure || die if use ftdi ; then - local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)" # Use libftdi-1 paths #460916 local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) sed -i \ diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild index 1f05725..b300c69 100644 --- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild @@ -30,7 +30,7 @@ DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) - ftdi? ( dev-embedded/libftdi:0 )" + ftdi? ( dev-embedded/libftdi:= )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" @@ -49,7 +49,7 @@ src_prepare() { configure || die if use ftdi ; then - local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)" # Use libftdi-1 paths #460916 local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) sed -i \
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 9d88f56b758fe8864adb369953c1e1ad2ca41bdb Author: Sven Wegener gentoo org> AuthorDate: Mon Oct 3 11:16:46 2016 + Commit: Sven Wegener gentoo org> CommitDate: Sun Oct 30 20:04:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d88f56b dev-embedded/openocd: Update SourceForge GIT URLs Package-Manager: portage-2.3.0 dev-embedded/openocd/openocd-0.5.0.ebuild | 3 ++- dev-embedded/openocd/openocd-0.6.1.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild index 19d7e75..c038950 100644 --- a/dev-embedded/openocd/openocd-0.5.0.ebuild +++ b/dev-embedded/openocd/openocd-0.5.0.ebuild @@ -8,7 +8,8 @@ inherit eutils multilib if [[ ${PV} == "" ]] ; then inherit autotools git-2 KEYWORDS="" - EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild index 4b08ad20..2a805d5 100644 --- a/dev-embedded/openocd/openocd-0.6.1.ebuild +++ b/dev-embedded/openocd/openocd-0.6.1.ebuild @@ -8,7 +8,8 @@ inherit eutils multilib flag-o-matic toolchain-funcs if [[ ${PV} == "" ]] ; then inherit autotools git-2 KEYWORDS="" - EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" + EGIT_PROJECT="${PN}" else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 69392ed13cd3cf6c6b5bf9aeb4dc4ab3ad847322 Author: Zero_Chaos gentoo org> AuthorDate: Tue Jan 24 16:53:02 2017 + Commit: Richard Farina gentoo org> CommitDate: Tue Jan 24 16:53:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69392ed1 dev-embedded/openocd: bug #603120 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-embedded/openocd/openocd-0.8.0.ebuild | 10 +- dev-embedded/openocd/openocd-0.9.0.ebuild | 10 +- dev-embedded/openocd/openocd-.ebuild | 10 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild index 87040a3..f6e8edb 100644 --- a/dev-embedded/openocd/openocd-0.8.0.ebuild +++ b/dev-embedded/openocd/openocd-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,6 +38,10 @@ RDEPEND=">=dev-lang/jimtcl-0.75 DEPEND="${RDEPEND} virtual/pkgconfig" +pkg_setup() { + enewgroup plugdev +} + src_prepare() { epatch_user @@ -131,3 +135,7 @@ src_install() { env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } + +pkg_postinst() { + elog "To access openocd devices as user you must be in the plugdev group" +} diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index 948e353..c0d5354 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,6 +38,10 @@ RDEPEND=">=dev-lang/jimtcl-0.76 DEPEND="${RDEPEND} virtual/pkgconfig" +pkg_setup() { + enewgroup plugdev +} + src_prepare() { epatch_user @@ -127,3 +131,7 @@ src_install() { env -uRESTRICT prepstrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } + +pkg_postinst() { + elog "To access openocd devices as user you must be in the plugdev group" +} diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index a101020..54bd4c2 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -40,6 +40,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +pkg_setup() { + enewgroup plugdev +} + src_prepare() { epatch_user @@ -130,3 +134,7 @@ src_install() { env -uRESTRICT prepstrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } + +pkg_postinst() { + elog "To access openocd devices as user you must be in the plugdev group" +}
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 512d00ca1fbb0b5d7601c8d2a993e67ac0b684ff Author: Zero_Chaos gentoo org> AuthorDate: Tue Jan 24 20:27:14 2017 + Commit: Richard Farina gentoo org> CommitDate: Tue Jan 24 20:27:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512d00ca dev-embedded/openocd: update live ebuild per upstream and bug #589954 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-embedded/openocd/metadata.xml| 1 + dev-embedded/openocd/openocd-.ebuild | 29 ++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index 305f9c4..78e604f 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -14,6 +14,7 @@ Enable support for Altera USE-Blaster Support for CMSIS-DAP compliant adapters Build the dummy port driver +Build the SEGGER J-Link driver Build the dummy minidriver Enable support for USB FTDI chips via dev-embedded/libftd2xx Enable support for USB FTDI chips via dev-embedded/libftdi diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 54bd4c2..f18b1f1 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -24,12 +24,12 @@ HOMEPAGE="http://openocd.sourceforge.net"; LICENSE="GPL-2+" SLOT="0" -IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" +IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=">=dev-lang/jimtcl-0.76 - dev-embedded/libjaylink cmsis-dap? ( dev-libs/hidapi ) + jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 @@ -63,7 +63,6 @@ src_configure() { --enable-ep93xx --enable-at91rm9200 --enable-gw16012 - --enable-oocd_trace --enable-arm-jtag-ew --enable-sysfsgpio --enable-bcm2835gpio @@ -80,7 +79,6 @@ src_configure() { --enable-osbdm --enable-opendous --enable-usbprog - --enable-jlink --enable-rlink --enable-stlink --enable-vsllink @@ -98,7 +96,6 @@ src_configure() { --disable-osbdm --disable-opendous --disable-usbprog - --disable-jlink --disable-rlink --disable-stlink --disable-vsllink @@ -106,17 +103,27 @@ src_configure() { ) fi + if use jlink; then + myconf+=( + --enable-jlink + ) + else + myconf+=( + --disable-jlink + ) + fi + if use ftdi; then myconf+=( - --enable-usb_blaster_libftdi - --enable-openjtag_ftdi - --enable-presto_libftdi + --enable-usb-blaster + --enable-openjtag + --enable-presto ) else myconf+=( - --disable-openjtag_ftdi - --disable-presto_libftdi - --disable-usb_blaster_libftdi + --disable-openjtag + --disable-presto + --disable-usb-blaster ) fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: fd67c1110eddfa176c595c7637ca810fe4526e1c Author: Zero_Chaos gentoo org> AuthorDate: Tue Jan 24 21:53:32 2017 + Commit: Richard Farina gentoo org> CommitDate: Tue Jan 24 21:54:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd67c111 dev-embedded/openocd: fix missing user inherit. bump to 0.10.0 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-embedded/openocd/Manifest | 1 + dev-embedded/openocd/{openocd-.ebuild => openocd-0.10.0.ebuild} | 2 +- dev-embedded/openocd/openocd-0.8.0.ebuild | 2 +- dev-embedded/openocd/openocd-0.9.0.ebuild | 2 +- dev-embedded/openocd/openocd-.ebuild| 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 7a2c63b..fa3d004 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,3 +1,4 @@ +DIST openocd-0.10.0.tar.gz 6124274 SHA256 eda3b03919cc0ffb70e7de9c877092a03114e1532937e9f86ac1863fe526 SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a WHIRLPOOL 535fd53cc2a6b9e2f8fe5705806cad39832d3b7911f97a705c968ddf27981d000bfa0f707110645739aa2d792b2fbb46e6adf12dcbff394a07f9fb7376b37259 DIST openocd-0.5.0.tar.bz2 2228655 SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d SHA512 8e2e168a35bf3f753683115fd5f4d4c79e54cd0fe5d072921475d43880619e5b4ab60f28d97a4a595d4b77938b9218e689013f66a925ee8007e6499f5b42448c WHIRLPOOL 84b6a4a9089542904865400ede82be00c4417519f0c9fc42cbb25ae671f621651e9b27f57c2a1e7f37102d53095bcb8e37601e8ed47ddf1ea82b76676b35e7aa DIST openocd-0.6.1.tar.bz2 3431071 SHA256 f4c4cc7445ad79cfba1bb24208e79c66edf9dc0c46b3c8fca391f4e41c942f2b SHA512 59f35750f761d3f2ce7a32ffdc5028d053fda2bd9424cc4497f528ec628ac1f022662d9f226dd2b04a8cd682a5cd056a09de14d50e1090426a816bb602f98250 WHIRLPOOL 81d43ce9866960edb7fdaefc5ec088852aaa79e86add67ea9682f26eb5f5d3e7c7523fde0729e15949af165470b44ded45b9d79662f651db56fd109db5074cad DIST openocd-0.7.0.tar.bz2 3493924 SHA256 52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63 SHA512 bfba267e5cda558b347f6fab1a286353b97d81093c0457ac044667baa369f5cd47a07b3ce6a1ceb66e7992c2e4224765458dd859d0a6fa748ad8e6f80ea541ad WHIRLPOOL eb83e201becb22a72ad954bdd5e66e61e587b42856244e4fdce59af5d263a2879cb8e0d89e10bcff515cff199580997c1c6635064601ad31a803b19dd9c99702 diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild similarity index 97% copy from dev-embedded/openocd/openocd-.ebuild copy to dev-embedded/openocd/openocd-0.10.0.ebuild index f18b1f1..7c88bdd 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all if [[ ${PV} == "" ]] ; then diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild index f6e8edb..2fa14b5 100644 --- a/dev-embedded/openocd/openocd-0.8.0.ebuild +++ b/dev-embedded/openocd/openocd-0.8.0.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all if [[ ${PV} == "" ]] ; then diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index c0d5354..acfe5c0 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all if [[ ${PV} == "" ]] ; then diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index f18b1f1..7c88bdd 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit eutils multilib flag-o-matic toolchain-funcs udev user # One ebuild to rule them all if [[ ${PV} == "" ]] ; then
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: dc37c459689824c2d03df7b353bba84c362e6b87 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Feb 18 09:05:12 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Feb 18 09:08:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc37c459 dev-embedded/openocd: update to EAPI=7 A few changes: - add a subslot depend on jimtcl - switch to dostrip Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> .../openocd/{openocd-.ebuild => openocd-0.10.0-r1.ebuild} | 10 +- dev-embedded/openocd/openocd-.ebuild | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild similarity index 95% copy from dev-embedded/openocd/openocd-.ebuild copy to dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 57ba7a8c69e..ce0f6e7381b 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" inherit eutils multilib flag-o-matic toolchain-funcs udev user @@ -25,7 +25,7 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=">=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -43,7 +43,7 @@ pkg_setup() { } src_prepare() { - epatch_user + default if [[ ${PV} == "" ]] ; then AT_NO_RECURSIVE=yes eautoreconf @@ -136,7 +136,7 @@ src_configure() { src_install() { default - env -uRESTRICT prepstrip "${ED}"/usr/bin + dostrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 57ba7a8c69e..ce0f6e7381b 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" inherit eutils multilib flag-o-matic toolchain-funcs udev user @@ -25,7 +25,7 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=">=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -43,7 +43,7 @@ pkg_setup() { } src_prepare() { - epatch_user + default if [[ ${PV} == "" ]] ; then AT_NO_RECURSIVE=yes eautoreconf @@ -136,7 +136,7 @@ src_configure() { src_install() { default - env -uRESTRICT prepstrip "${ED}"/usr/bin + dostrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules }
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 17d57dfd9387077096e3238fd82252c2f6360e89 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Feb 18 09:06:34 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Feb 18 09:08:16 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d57dfd dev-embedded/openocd: drop prepstrip Newer ebuilds use 'dostrip', older ebuilds will install unstripped binaries. Closes: https://bugs.gentoo.org/587308 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> dev-embedded/openocd/openocd-0.10.0.ebuild | 3 +-- dev-embedded/openocd/openocd-0.9.0.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index 44c2c20d537..72a0bbe07a5 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -136,7 +136,6 @@ src_configure() { src_install() { default - env -uRESTRICT prepstrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index 7a694fd3a84..d6d36ec4b0a 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -126,7 +126,6 @@ src_configure() { src_install() { default - env -uRESTRICT prepstrip "${ED}"/usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules }
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: a8ad04bcbc8ab4f754cf60f9dc2a700a0a9b04c3 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue May 29 12:36:10 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue May 29 12:40:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ad04bc dev-embedded/openocd: x86 stable (bug #633398) Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-embedded/openocd/openocd-0.10.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index 57ba7a8c69e..d4d0660495b 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -13,7 +13,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 494ba8e294a03af5d991da925164274b40cd41b4 Author: Jason Zaman gentoo org> AuthorDate: Wed May 30 11:26:22 2018 + Commit: Jason Zaman gentoo org> CommitDate: Wed May 30 11:26:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494ba8e2 dev-embedded/openocd: amd64 stable Gentoo-bug: 633398 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-embedded/openocd/openocd-0.10.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index d4d0660495b..44c2c20d537 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -13,7 +13,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm x86" + KEYWORDS="amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 2e3b162d22b809545e1eddfbba1e1fd73140dbf7 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Aug 31 12:16:03 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Aug 31 12:16:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3b162d dev-embedded/openocd: fix dostrip argument (drop ${ED}) Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich gentoo.org> dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 2 +- dev-embedded/openocd/openocd-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index ce0f6e7381b..3afa1fad8b4 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -136,7 +136,7 @@ src_configure() { src_install() { default - dostrip "${ED}"/usr/bin + dostrip /usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules } diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index ce0f6e7381b..3afa1fad8b4 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -136,7 +136,7 @@ src_configure() { src_install() { default - dostrip "${ED}"/usr/bin + dostrip /usr/bin udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules }
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: b977185e928d09d6f5dc994e54855a5dc0d09d28 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 13 12:16:01 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 13 12:42:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b977185e dev-embedded/openocd: Use acct-group/plugdev Signed-off-by: Michał Górny gentoo.org> dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 10 -- dev-embedded/openocd/openocd-0.10.0.ebuild| 10 -- dev-embedded/openocd/openocd-0.9.0.ebuild | 10 -- dev-embedded/openocd/openocd-.ebuild | 10 -- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 3afa1fad8b4..168fc249956 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == * ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76:0= +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { default diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild index 72a0bbe07a5..671c16ab48f 100644 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == * ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { epatch_user diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild index d6d36ec4b0a..c7878693cd0 100644 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ b/dev-embedded/openocd/openocd-0.9.0.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == * ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76 +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 @@ -36,10 +38,6 @@ RDEPEND=">=dev-lang/jimtcl-0.76 DEPEND="${RDEPEND} virtual/pkgconfig" -pkg_setup() { - enewgroup plugdev -} - src_prepare() { epatch_user diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 3afa1fad8b4..168fc249956 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils multilib flag-o-matic toolchain-funcs udev user +inherit eutils multilib flag-o-matic toolchain-funcs udev # One ebuild to rule them all if [[ ${PV} == * ]] ; then @@ -25,7 +25,9 @@ SLOT="0" IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries -RDEPEND=">=dev-lang/jimtcl-0.76:0= +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( @@ -38,10 +40,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 -pkg_setup() { - enewgroup plugdev -} - src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 891ce071efaa646eb0f13a28e960086d083ab443 Author: Göktürk Yüksek gentoo org> AuthorDate: Sat Nov 16 21:41:27 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Jan 15 21:01:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891ce071 dev-embedded/openocd: depend on >=libjaylink-0.2 The live ebuild fails with: checking for libjaylink >= 0.2... no configure: error: libjaylink-0.2 is required for the SEGGER J-Link Programmer I see no release for libjaylink-0.2 but libjaylink- works Package-Manager: Portage-2.3.79, Repoman-2.3.18 Closes: https://github.com/gentoo/gentoo/pull/13677 Acked-by: Mikle Kolyada gentoo.org> Signed-off-by: Göktürk Yüksek gentoo.org> dev-embedded/openocd/openocd-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 168fc249956..61f5947f9e6 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -29,7 +29,7 @@ RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) - jlink? ( dev-embedded/libjaylink ) + jlink? ( >=dev-embedded/libjaylink-0.2 ) usb? ( virtual/libusb:0 virtual/libusb:1
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 7d021522d0507d4666027c2218228fda2299ff77 Author: Sven Wegener gentoo org> AuthorDate: Sat Apr 23 19:21:22 2022 + Commit: Sven Wegener gentoo org> CommitDate: Sat Apr 23 19:37:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d021522 dev-embedded/openocd: Require newer/older jimtcl Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/openocd-0.11.0.ebuild | 5 +++-- dev-embedded/openocd/openocd-.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild index 263017ff35fa..1d898dd89d7c 100644 --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ b/dev-embedded/openocd/openocd-0.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,8 @@ RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev - >=dev-lang/jimtcl-0.76:0= + >=dev-lang/jimtcl-0.76:= + =dev-embedded/libjaylink-0.2.0 ) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index f7d5c4b834cb..4212ec037aeb 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev - >=dev-lang/jimtcl-0.76:0= + >=dev-lang/jimtcl-0.80:= cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? (
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: b1a93db7880accf3647a52f75468adde7168ea00 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 27 06:35:25 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 27 06:35:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a93db7 dev-embedded/openocd: amd64 stable wrt bug #815499 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-embedded/openocd/openocd-0.11.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild index 7f476f17dfe..c4b93b83078 100644 --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ b/dev-embedded/openocd/openocd-0.11.0.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: f613635c378a6a04c41aee1bb146ceb35e202c3a Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 27 06:36:48 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 27 06:36:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613635c dev-embedded/openocd: x86 stable wrt bug #815499 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-embedded/openocd/openocd-0.11.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild index c4b93b83078..263017ff35f 100644 --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ b/dev-embedded/openocd/openocd-0.11.0.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 9f8d69f372492b1db79b397873675a7756e776ab Author: Sam James gentoo org> AuthorDate: Thu Feb 11 07:54:23 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 11 07:54:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8d69f3 dev-embedded/openocd: Stabilize 0.10.0-r1 amd64, #763855 Signed-off-by: Sam James gentoo.org> dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 14fbf084e90..cfa9cca2205 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: f7d42ada70894da52b9e2801ae87cab8b9b836d5 Author: Sam James gentoo org> AuthorDate: Thu Feb 11 09:31:43 2021 + Commit: Sam James gentoo org> CommitDate: Thu Feb 11 09:31:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d42ada dev-embedded/openocd: Stabilize 0.10.0-r1 x86, #763855 Signed-off-by: Sam James gentoo.org> dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index cfa9cca2205..ac8942db0b0 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 34cbe5e67c3a40424c1753cc54beb7acc2686b51 Author: Yixun Lan gentoo org> AuthorDate: Wed Mar 10 05:58:43 2021 + Commit: Yixun Lan gentoo org> CommitDate: Wed Mar 10 06:07:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cbe5e6 dev-embedded/openocd: version bump, 0.11.0 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/Manifest | 2 +- .../openocd/{openocd-0.11.0_rc2.ebuild => openocd-0.11.0.ebuild}| 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index b0539404eeb..8c2977737e2 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1,2 @@ DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a -DIST openocd-0.11.0-rc2.tar.gz 7232180 BLAKE2B 7631b9b85d28472a4f445c304091173350bc5084f0a29b22d1ffd9b92f23c5041218c5aa9c19957c6e25f5a516f6e8d579a9d6c4f9c2bad7e3350dee58faba41 SHA512 b49f631272852dec5a45023a702f2a8446aa386c38eb4ba8ae4b4bf6c84fdd69082f8ae09b5beaa176538644b304b61dfbb8f3da31b7053e02228a5c2dbf1714 +DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b diff --git a/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild similarity index 100% rename from dev-embedded/openocd/openocd-0.11.0_rc2.ebuild rename to dev-embedded/openocd/openocd-0.11.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: db56903c52922dee404e9eac71c7a6ed96dc4bd0 Author: Yixun Lan gentoo org> AuthorDate: Wed Mar 10 06:07:13 2021 + Commit: Yixun Lan gentoo org> CommitDate: Wed Mar 10 06:07:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db56903c dev-embedded/openocd: add myself to maintainer list Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index 2931185a0a9..270c6290d4b 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -9,6 +9,10 @@ fercer...@gmail.com Paul Fertser + + d...@gentoo.org + Yixun Lan + Use dev-libs/capstone for disassembly support Support for CMSIS-DAP compliant adapters
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 1ef1c901db4dd336ff3725d44ca520d05660f38b Author: Jannis Achstetter kripserver net> AuthorDate: Fri Jan 1 16:35:53 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 15:10:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef1c901 dev-embedded/openocd: Add version 0.11.0_rc2 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Jannis Achstetter kripserver.net> Closes: https://github.com/gentoo/gentoo/pull/18899 Signed-off-by: Sam James gentoo.org> dev-embedded/openocd/Manifest | 1 + dev-embedded/openocd/metadata.xml | 1 + dev-embedded/openocd/openocd-0.11.0_rc2.ebuild | 98 ++ 3 files changed, 100 insertions(+) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 58dcefd9717..b0539404eeb 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1 +1,2 @@ DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a +DIST openocd-0.11.0-rc2.tar.gz 7232180 BLAKE2B 7631b9b85d28472a4f445c304091173350bc5084f0a29b22d1ffd9b92f23c5041218c5aa9c19957c6e25f5a516f6e8d579a9d6c4f9c2bad7e3350dee58faba41 SHA512 b49f631272852dec5a45023a702f2a8446aa386c38eb4ba8ae4b4bf6c84fdd69082f8ae09b5beaa176538644b304b61dfbb8f3da31b7053e02228a5c2dbf1714 diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index 13ad31053b9..2931185a0a9 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -10,6 +10,7 @@ Paul Fertser + Use dev-libs/capstone for disassembly support Support for CMSIS-DAP compliant adapters Build the dummy port driver Build the SEGGER J-Link driver diff --git a/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild new file mode 100644 index 000..7f476f17dfe --- /dev/null +++ b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools udev + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; +else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + S="${WORKDIR}"/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" +fi + +DESCRIPTION="OpenOCD - Open On-Chip Debugger" +HOMEPAGE="http://openocd.sourceforge.net"; + +LICENSE="GPL-2+" +SLOT="0" +IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +RESTRICT="strip" # includes non-native binaries + +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= + capstone? ( dev-libs/capstone ) + cmsis-dap? ( dev-libs/hidapi ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) + usb? ( + virtual/libusb:0 + virtual/libusb:1 + ) + ftdi? ( dev-embedded/libftdi:= )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + AT_NO_RECURSIVE=yes eautoreconf +} + +src_configure() { + local myconf=( + --enable-amtjtagaccel + --enable-arm-jtag-ew + --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx + --enable-gw16012 + --enable-sysfsgpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_with capstone) + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) +
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 762b5f10768e1f04aacffcff5363ab446842fdd9 Author: Jakov Smolic sartura hr> AuthorDate: Sat Feb 13 10:14:29 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 13 10:14:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762b5f10 dev-embedded/openocd: Remove old Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-embedded/openocd/openocd-0.10.0.ebuild | 142 - 1 file changed, 142 deletions(-) diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild deleted file mode 100644 index 671c16ab48f..000 --- a/dev-embedded/openocd/openocd-0.10.0.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib flag-o-matic toolchain-funcs udev - -# One ebuild to rule them all -if [[ ${PV} == * ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76 - cmsis-dap? ( dev-libs/hidapi ) - jlink? ( dev-embedded/libjaylink ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" -[[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 - -src_prepare() { - epatch_user - - if [[ ${PV} == "" ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - # Here are some defaults - local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink - --enable-amtjtagaccel - --enable-ep93xx - --enable-at91rm9200 - --enable-gw16012 - --enable-arm-jtag-ew - --enable-sysfsgpio - --enable-bcm2835gpio - ) - - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" -} - -src_install() { - default - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - elog "To access openocd devices as user you must be in the plugdev group
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 267abe757295fc32d3e343a2d449217b9b69ec49 Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 14:15:34 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Dec 28 14:15:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267abe75 dev-embedded/openocd: Drop old EAPI 5 ebuild Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-embedded/openocd/Manifest | 1 - dev-embedded/openocd/openocd-0.9.0.ebuild | 132 -- 2 files changed, 133 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index d245d5b1033..58dcefd9717 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1 @@ DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a -DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227 diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild deleted file mode 100644 index c7878693cd0..000 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib flag-o-matic toolchain-funcs udev - -# One ebuild to rule them all -if [[ ${PV} == * ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76 - cmsis-dap? ( dev-libs/hidapi ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch_user - - if [[ ${PV} == "" ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - # Here are some defaults - local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --enable-amtjtagaccel - --enable-ep93xx - --enable-at91rm9200 - --enable-gw16012 - --enable-oocd_trace - --enable-arm-jtag-ew - --enable-sysfsgpio - --enable-bcm2835gpio - ) - - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-jlink - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-jlink - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb_blaster_libftdi - --enable-openjtag_ftdi - --enable-presto_libftdi -
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 7c920a1be3f8f839262ecd9ae17054671f9b443e Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 14:15:35 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Dec 28 14:15:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c920a1b dev-embedded/openocd: Sync live ebuild Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-embedded/openocd/openocd-.ebuild | 123 ++- 1 file changed, 40 insertions(+), 83 deletions(-) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 99592e57a11..f7d5c4b834c 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == * ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; + EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -29,113 +28,71 @@ RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2 ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo virtual/pkgconfig" -[[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 src_prepare() { default - if [[ ${PV} == "" ]] ; then + if [[ ${PV} == * ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink -
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: cfa4333f5a78f9b4462fcd84779b734f261bf3d3 Author: Jannis Achstetter kripserver net> AuthorDate: Wed Jun 29 20:09:33 2022 + Commit: Yixun Lan gentoo org> CommitDate: Fri Aug 12 20:36:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa4333f dev-embedded/openocd: Add calls to udev_reload Closes: https://bugs.gentoo.org/842093 Closes: https://github.com/gentoo/gentoo/pull/26154 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jannis Achstetter kripserver.net> Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/openocd-0.11.0.ebuild | 6 ++ dev-embedded/openocd/openocd-.ebuild | 6 ++ 2 files changed, 12 insertions(+) diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild index 1d898dd89d7c..a9c78e5c1ea0 100644 --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ b/dev-embedded/openocd/openocd-0.11.0.ebuild @@ -95,5 +95,11 @@ src_install() { } pkg_postinst() { + udev_reload + elog "To access openocd devices as user you must be in the plugdev group" } + +pkg_postrm() { + udev_reload +} diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 4212ec037aeb..569c77f75c26 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -96,5 +96,11 @@ src_install() { } pkg_postinst() { + udev_reload + elog "To access openocd devices as user you must be in the plugdev group" } + +pkg_postrm() { + udev_reload +}
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 9ec1edb1acb503243d4f3ea1474298b0b39f7d51 Author: Yixun Lan gentoo org> AuthorDate: Sat Feb 17 02:09:57 2024 + Commit: Yixun Lan gentoo org> CommitDate: Sat Feb 17 02:12:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec1edb1 dev-embedded/openocd: make libgpiod optional Closes: https://bugs.gentoo.org/917547 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/metadata.xml | 1 + .../openocd/{openocd-.ebuild => openocd-0.12.0-r2.ebuild} | 11 --- dev-embedded/openocd/openocd-.ebuild | 7 --- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index b9dbe67059b7..358a9c0a93c5 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -17,6 +17,7 @@ Use dev-libs/capstone for disassembly support Support for CMSIS-DAP compliant adapters Build the dummy port driver + Enable Linux GPIO bitbang support via libgpiod Build the SEGGER J-Link driver Enable support for USB FTDI chips via dev-embedded/libftdi Enable support for parport JTAG devices diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild similarity index 90% copy from dev-embedded/openocd/openocd-.ebuild copy to dev-embedded/openocd/openocd-0.12.0-r2.ebuild index 669feebd09f8..698978b49848 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io"; LICENSE="GPL-2+" SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= - dev-libs/libgpiod:0/2 + gpiod? ( dev-libs/libgpiod:0/2 ) capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) @@ -37,6 +37,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch" +) + src_prepare() { default @@ -66,6 +70,7 @@ src_configure() { $(use_enable ftdi openjtag) $(use_enable ftdi presto) $(use_enable ftdi usb-blaster) + $(use_enable gpiod linuxgpiod) $(use_enable jlink) $(use_enable parport) $(use_enable parport parport_ppdev) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 669feebd09f8..bf5127f94e2c 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io"; LICENSE="GPL-2+" SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= - dev-libs/libgpiod:0/2 + gpiod? ( dev-libs/libgpiod:0/2 ) capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) @@ -66,6 +66,7 @@ src_configure() { $(use_enable ftdi openjtag) $(use_enable ftdi presto) $(use_enable ftdi usb-blaster) + $(use_enable gpiod linuxgpiod) $(use_enable jlink) $(use_enable parport) $(use_enable parport parport_ppdev)
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: af2e23d49b7b3541c54b2403feff0221e73497c8 Author: Yixun Lan gentoo org> AuthorDate: Fri Jan 20 11:47:59 2023 + Commit: Yixun Lan gentoo org> CommitDate: Fri Jan 20 11:48:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2e23d4 dev-embedded/openocd: add 0.12.0, drop 0.12.0_rc3 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/Manifest | 2 +- .../openocd/{openocd-0.12.0_rc3.ebuild => openocd-0.12.0.ebuild}| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 91f68d53f912..df295ecbf137 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1,2 @@ DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b -DIST openocd-0.12.0-rc3.tar.gz 8444782 BLAKE2B 04daf4865ff6cb5102f037ae9e0436eac80eaa5a78aa3ee31c7bb7b51acc879d9076c816dc797f9d9b474502b6d216c064cffae46cf17663f7d6887ea6ccf958 SHA512 62a2a5316be6fa10ed424f57fa784c0774ae325bfa27a8e5a7ddc19841dbd55c7c1bb335aa9b8ffefebdf0ffcb3638dad20c191ade75b5b804d8be76b483fba4 +DIST openocd-0.12.0.tar.gz 8445833 BLAKE2B 82616ed1bf51588d2a19c56fab6a6944ac5fa22e07bc5f83962ff8fecd88faeceb33e2104acb3cd08710f7f96d578ccd4ef6282372ae9d206ab469b3ac70fff8 SHA512 2b95d30eb10316b5cf1b329e0214b8d9f3fbf1fda5fa5568acc8cb16cdc25aa58c211f17f9883d8e4b93bcda3f296e511c279b44d24db9303c26e6c6640540b0 diff --git a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild b/dev-embedded/openocd/openocd-0.12.0.ebuild similarity index 98% rename from dev-embedded/openocd/openocd-0.12.0_rc3.ebuild rename to dev-embedded/openocd/openocd-0.12.0.ebuild index 031ef6803e37..aa36f5378531 100644 --- a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="https://openocd.sourceforge.net"; +HOMEPAGE="https://openocd.sourceforge.io"; LICENSE="GPL-2+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 4731731d4af17fc08f2ce920c8d1370ccfdfd102 Author: Yongxiang Liang gmail com> AuthorDate: Mon Nov 13 15:33:33 2023 + Commit: Yixun Lan gentoo org> CommitDate: Tue Nov 14 11:12:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4731731d dev-embedded/openocd: add libgpiod subslot dep the openocd doesn't support new APIs for libpgiod-2.* so let's force it to depend on libgpiod-1.6.* Link: https://sourceforge.net/p/openocd/mailman/message/37389960/ Closes: https://bugs.gentoo.org/915709 Signed-off-by: Yongxiang Liang gmail.com> Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/{openocd-0.12.0.ebuild => openocd-0.12.0-r1.ebuild} | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-embedded/openocd/openocd-0.12.0.ebuild b/dev-embedded/openocd/openocd-0.12.0-r1.ebuild similarity index 99% rename from dev-embedded/openocd/openocd-0.12.0.ebuild rename to dev-embedded/openocd/openocd-0.12.0-r1.ebuild index 51b608736e5a..37a77f103946 100644 --- a/dev-embedded/openocd/openocd-0.12.0.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0-r1.ebuild @@ -27,6 +27,7 @@ RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= + dev-libs/libgpiod:0/2 capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 )
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 6bca241108e5ffd18a91bda015f36d4a87af813f Author: Yixun Lan gentoo org> AuthorDate: Tue Nov 14 03:25:01 2023 + Commit: Yixun Lan gentoo org> CommitDate: Tue Nov 14 11:12:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bca2411 dev-embedded/openocd: update HOMEPAGE & dep Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/openocd-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 57562d0c8fc5..669feebd09f8 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="https://openocd.sourceforge.net"; +HOMEPAGE="https://openocd.sourceforge.io"; LICENSE="GPL-2+" SLOT="0" @@ -27,6 +27,7 @@ RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= + dev-libs/libgpiod:0/2 capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 )
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 1885c0dda025801ec1194e6cc19a413e7f112161 Author: Yixun Lan gentoo org> AuthorDate: Wed Jan 4 00:37:20 2023 + Commit: Yixun Lan gentoo org> CommitDate: Wed Jan 4 00:37:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1885c0dd dev-embedded/openocd: drop 0.12.0_rc2 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/Manifest | 1 - dev-embedded/openocd/openocd-0.12.0_rc2.ebuild | 105 - 2 files changed, 106 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 84e732a17be4..91f68d53f912 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,3 +1,2 @@ DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b -DIST openocd-0.12.0-rc2.tar.gz 8437679 BLAKE2B 3d1ec6fc758ace9d975956ecb2a4152a067e8be9a2e03a4c69c1020b4dbe752d52bb7be626ec78028953ba5d918b4ca9bf0a38ae0d83bf86d06ac12cb29ac5b3 SHA512 1b20f2cc8e511d02beb60b191b0b66d0ef53ab1dfb966773ddd8e72570eddc295768b3b8a340f70c9cc7bb061a25e649061435b844307b3bdd9177866f4e2f4a DIST openocd-0.12.0-rc3.tar.gz 8444782 BLAKE2B 04daf4865ff6cb5102f037ae9e0436eac80eaa5a78aa3ee31c7bb7b51acc879d9076c816dc797f9d9b474502b6d216c064cffae46cf17663f7d6887ea6ccf958 SHA512 62a2a5316be6fa10ed424f57fa784c0774ae325bfa27a8e5a7ddc19841dbd55c7c1bb335aa9b8ffefebdf0ffcb3638dad20c191ade75b5b804d8be76b483fba4 diff --git a/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild deleted file mode 100644 index 42d4b587893e.. --- a/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools udev - -if [[ ${PV} == * ]] ; then - inherit git-r3 - EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.81:= - capstone? ( dev-libs/capstone ) - cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2.0 ) - usb? ( virtual/libusb:1 ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - AT_NO_RECURSIVE=yes eautoreconf -} - -src_configure() { - local myconf=( - --enable-amtjtagaccel - --enable-am335xgpio - --enable-arm-jtag-ew - --enable-at91rm9200 - --enable-bcm2835gpio - --enable-buspirate - --enable-ep93xx - --enable-gw16012 - --enable-jtag_dpi - --enable-sysfsgpio - --enable-vdebug - --disable-internal-jimtcl - --disable-internal-libjaylink - --disable-parport-giveio - --disable-werror - $(use_with capstone) - $(use_enable cmsis-dap) - $(use_enable dummy) - $(use_enable ftdi openjtag) - $(use_enable ftdi presto) - $(use_enable ftdi usb-blaster) - $(use_enable jlink) - $(use_enable parport) - $(use_enable parport parport_ppdev) - $(use_enable usb aice) - $(use_enable usb armjtagew) - $(use_enable usb ftdi) - $(use_enable usb osbdm) - $(use_enable usb opendous) - $(use_enable usb rlink) - $(use_enable usb stlink) - $(use_enable usb ti-icdi) - $(use_enable usb usbprog) - $(use_enable usb usb-blaster-2) - $(use_enable usb ulink) - $(use_enable usb vsllink) - $(use_enable verbose-io verbose-jtag-io) - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - dostrip /usr/bin - udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - udev_reload - - elog "To access openocd devices as user you must be in the plugdev group" -} - -p
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: c0b48651402f01f35f76522b94a2151dcfd934e8 Author: Yixun Lan gentoo org> AuthorDate: Wed Jan 4 00:35:18 2023 + Commit: Yixun Lan gentoo org> CommitDate: Wed Jan 4 00:37:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b48651 dev-embedded/openocd: add 0.12.0_rc3 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/Manifest | 1 + dev-embedded/openocd/openocd-0.12.0_rc3.ebuild | 105 + 2 files changed, 106 insertions(+) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 9f1da9c3dd38..84e732a17be4 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1,3 @@ DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b DIST openocd-0.12.0-rc2.tar.gz 8437679 BLAKE2B 3d1ec6fc758ace9d975956ecb2a4152a067e8be9a2e03a4c69c1020b4dbe752d52bb7be626ec78028953ba5d918b4ca9bf0a38ae0d83bf86d06ac12cb29ac5b3 SHA512 1b20f2cc8e511d02beb60b191b0b66d0ef53ab1dfb966773ddd8e72570eddc295768b3b8a340f70c9cc7bb061a25e649061435b844307b3bdd9177866f4e2f4a +DIST openocd-0.12.0-rc3.tar.gz 8444782 BLAKE2B 04daf4865ff6cb5102f037ae9e0436eac80eaa5a78aa3ee31c7bb7b51acc879d9076c816dc797f9d9b474502b6d216c064cffae46cf17663f7d6887ea6ccf958 SHA512 62a2a5316be6fa10ed424f57fa784c0774ae325bfa27a8e5a7ddc19841dbd55c7c1bb335aa9b8ffefebdf0ffcb3638dad20c191ade75b5b804d8be76b483fba4 diff --git a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild new file mode 100644 index ..57562d0c8fc5 --- /dev/null +++ b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools udev + +if [[ ${PV} == * ]] ; then + inherit git-r3 + EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; +else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + S="${WORKDIR}"/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" +fi + +DESCRIPTION="OpenOCD - Open On-Chip Debugger" +HOMEPAGE="https://openocd.sourceforge.net"; + +LICENSE="GPL-2+" +SLOT="0" +IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +RESTRICT="strip" # includes non-native binaries + +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.81:= + capstone? ( dev-libs/capstone ) + cmsis-dap? ( dev-libs/hidapi ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) + usb? ( virtual/libusb:1 ) + ftdi? ( dev-embedded/libftdi:= )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + AT_NO_RECURSIVE=yes eautoreconf +} + +src_configure() { + local myconf=( + --enable-amtjtagaccel + --enable-am335xgpio + --enable-arm-jtag-ew + --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx + --enable-gw16012 + --enable-jtag_dpi + --enable-sysfsgpio + --enable-vdebug + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-parport-giveio + --disable-werror + $(use_with capstone) + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + dostrip /usr/bin + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules +} + +pkg_postinst() { + udev_reload + + elog "To access openocd devices as user you must be in the plugdev group" +} + +pkg_
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: d5bde4d98ccb8bb5e73dac86d9bd9e8acb64377f Author: Sam James gentoo org> AuthorDate: Sat Apr 22 11:34:09 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 22 11:34:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5bde4d9 dev-embedded/openocd: Stabilize 0.12.0 amd64, #904761 Signed-off-by: Sam James gentoo.org> dev-embedded/openocd/openocd-0.12.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.12.0.ebuild b/dev-embedded/openocd/openocd-0.12.0.ebuild index aa36f5378531..e44ea12342b9 100644 --- a/dev-embedded/openocd/openocd-0.12.0.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: d26f6e333b2aa5aef65ae2df74a338029ce99f2a Author: Sam James gentoo org> AuthorDate: Sat Apr 22 13:01:54 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 22 13:01:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26f6e33 dev-embedded/openocd: Stabilize 0.12.0 x86, #904761 Signed-off-by: Sam James gentoo.org> dev-embedded/openocd/openocd-0.12.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/openocd/openocd-0.12.0.ebuild b/dev-embedded/openocd/openocd-0.12.0.ebuild index e44ea12342b9..51b608736e5a 100644 --- a/dev-embedded/openocd/openocd-0.12.0.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 64e157a15c8a0acd4afed5a6a10f800011c504bc Author: Viorel Munteanu gentoo org> AuthorDate: Sat Apr 22 13:11:02 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Sat Apr 22 13:11:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e157a1 dev-embedded/openocd: drop 0.11.0 Signed-off-by: Viorel Munteanu gentoo.org> dev-embedded/openocd/Manifest | 1 - dev-embedded/openocd/openocd-0.11.0.ebuild | 105 - 2 files changed, 106 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index df295ecbf137..bfa1962f57ef 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1 @@ -DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b DIST openocd-0.12.0.tar.gz 8445833 BLAKE2B 82616ed1bf51588d2a19c56fab6a6944ac5fa22e07bc5f83962ff8fecd88faeceb33e2104acb3cd08710f7f96d578ccd4ef6282372ae9d206ab469b3ac70fff8 SHA512 2b95d30eb10316b5cf1b329e0214b8d9f3fbf1fda5fa5568acc8cb16cdc25aa58c211f17f9883d8e4b93bcda3f296e511c279b44d24db9303c26e6c6640540b0 diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild deleted file mode 100644 index a9c78e5c1ea0.. --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools udev - -if [[ ${PV} == * ]] ; then - inherit git-r3 - EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76:= - =dev-embedded/libjaylink-0.2.0 ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - AT_NO_RECURSIVE=yes eautoreconf -} - -src_configure() { - local myconf=( - --enable-amtjtagaccel - --enable-arm-jtag-ew - --enable-at91rm9200 - --enable-bcm2835gpio - --enable-buspirate - --enable-ep93xx - --enable-gw16012 - --enable-sysfsgpio - --disable-internal-jimtcl - --disable-internal-libjaylink - --disable-werror - $(use_with capstone) - $(use_enable cmsis-dap) - $(use_enable dummy) - $(use_enable ftdi openjtag) - $(use_enable ftdi presto) - $(use_enable ftdi usb-blaster) - $(use_enable jlink) - $(use_enable parport) - $(use_enable parport parport_ppdev) - $(use_enable usb aice) - $(use_enable usb armjtagew) - $(use_enable usb ftdi) - $(use_enable usb osbdm) - $(use_enable usb opendous) - $(use_enable usb rlink) - $(use_enable usb stlink) - $(use_enable usb ti-icdi) - $(use_enable usb usbprog) - $(use_enable usb usb-blaster-2) - $(use_enable usb ulink) - $(use_enable usb vsllink) - $(use_enable verbose-io verbose-jtag-io) - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - dostrip /usr/bin - udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - udev_reload - - elog "To access openocd devices as user you must be in the plugdev group" -} - -pkg_postrm() { - udev_reload -}
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 8d1b9f1dc4c18f185a6ad530bcb7dcc4eff5e369 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jun 7 17:15:46 2023 + Commit: Viorel Munteanu gentoo org> CommitDate: Thu Jun 8 11:19:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1b9f1d dev-embedded/openocd: use HTTPS Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Viorel Munteanu gentoo.org> dev-embedded/openocd/openocd-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 42d4b587893e..57562d0c8fc5 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; +HOMEPAGE="https://openocd.sourceforge.net"; LICENSE="GPL-2+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
commit: 329cffa801ffef25f10cda1181ecf4ef4ab3342c Author: Yixun Lan gentoo org> AuthorDate: Mon Dec 19 01:04:48 2022 + Commit: Yixun Lan gentoo org> CommitDate: Mon Dec 19 01:09:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329cffa8 dev-embedded/openocd: version bump, 0.12.0_rc2 drop virtual/libusb:0 Closes: https://bugs.gentoo.org/886637 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/Manifest | 1 + ...enocd-.ebuild => openocd-0.12.0_rc2.ebuild} | 29 +++--- dev-embedded/openocd/openocd-.ebuild | 29 +++--- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 399fea8ec02c..9f1da9c3dd38 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1 +1,2 @@ DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b +DIST openocd-0.12.0-rc2.tar.gz 8437679 BLAKE2B 3d1ec6fc758ace9d975956ecb2a4152a067e8be9a2e03a4c69c1020b4dbe752d52bb7be626ec78028953ba5d918b4ca9bf0a38ae0d83bf86d06ac12cb29ac5b3 SHA512 1b20f2cc8e511d02beb60b191b0b66d0ef53ab1dfb966773ddd8e72570eddc295768b3b8a340f70c9cc7bb061a25e649061435b844307b3bdd9177866f4e2f4a diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild similarity index 84% copy from dev-embedded/openocd/openocd-.ebuild copy to dev-embedded/openocd/openocd-0.12.0_rc2.ebuild index 569c77f75c26..42d4b587893e 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit udev +inherit autotools udev if [[ ${PV} == * ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; else MY_PV="${PV/_/-}" @@ -21,46 +21,45 @@ HOMEPAGE="http://openocd.sourceforge.net"; LICENSE="GPL-2+" SLOT="0" -IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev - >=dev-lang/jimtcl-0.80:= + >=dev-lang/jimtcl-0.81:= + capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) + usb? ( virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )" DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/texinfo - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" src_prepare() { default - if [[ ${PV} == * ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi + AT_NO_RECURSIVE=yes eautoreconf } src_configure() { local myconf=( --enable-amtjtagaccel + --enable-am335xgpio --enable-arm-jtag-ew --enable-at91rm9200 --enable-bcm2835gpio --enable-buspirate --enable-ep93xx --enable-gw16012 + --enable-jtag_dpi --enable-sysfsgpio + --enable-vdebug --disable-internal-jimtcl --disable-internal-libjaylink + --disable-parport-giveio --disable-werror + $(use_with capstone) $(use_enable cmsis-dap) $(use_enable dummy) $(use_enable ftdi openjtag) diff --git a/dev-embedded/openocd/openocd-.ebuild b/dev-embedded/openocd/openocd-.ebuild index 569c77f75c26..42d4b587893e 100644 --- a/dev-embedded/openocd/openocd-.ebuild +++ b/dev-embedded/openocd/openocd-.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit udev +inherit autotools udev if [[ ${PV} == * ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; else MY_PV="${PV/_/-}" @@ -21,46 +21,45 @@ HOMEPAGE="http://openocd.sourceforge.net"; LICENSE="GPL-2+" SLOT="0" -IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev - >=dev-lang/jimtcl-0.80:= + >=dev-lang/jimtcl-0.81:= + capstone? ( dev-libs/capston
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/
commit: 8c2623a628549575330835fbe1ffa8d301a40b26 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 31 10:01:40 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Dec 31 21:48:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2623a6 dev-embedded/openocd: Clean old up dev-embedded/openocd/Manifest | 4 - .../openocd/files/openocd-0.8.0-jimtcl-0.75.patch | 66 -- dev-embedded/openocd/metadata.xml | 7 -- dev-embedded/openocd/openocd-0.5.0.ebuild | 76 --- dev-embedded/openocd/openocd-0.6.1.ebuild | 103 --- dev-embedded/openocd/openocd-0.7.0-r1.ebuild | 117 - dev-embedded/openocd/openocd-0.8.0.ebuild | 139 - 7 files changed, 512 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 4c3bcc01dfb..d245d5b1033 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,6 +1,2 @@ DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a -DIST openocd-0.5.0.tar.bz2 2228655 BLAKE2B e8e12f72471d446be7426c14568d2efea2b002758846413e0319c79dce7cecd29279d022a27a190ce5c70dc65ec724aec854b5eee88e0ab57895139f49f80778 SHA512 8e2e168a35bf3f753683115fd5f4d4c79e54cd0fe5d072921475d43880619e5b4ab60f28d97a4a595d4b77938b9218e689013f66a925ee8007e6499f5b42448c -DIST openocd-0.6.1.tar.bz2 3431071 BLAKE2B 4dd32fc89b53d62c29c92b7f1b0d1f4c4cd08a717748bc473b2dd750e68c9b9377a879cf7c58bd6ad4b05c712a8e698db4579e384e79ea44a278536b293c9ba8 SHA512 59f35750f761d3f2ce7a32ffdc5028d053fda2bd9424cc4497f528ec628ac1f022662d9f226dd2b04a8cd682a5cd056a09de14d50e1090426a816bb602f98250 -DIST openocd-0.7.0.tar.bz2 3493924 BLAKE2B 23bd079c3610f75ec8c16dac12621b390f2b1d891573dbff59954cba35eea61eff3386701c918121ee38d614738f197963b1406346f14d0528f5a65f633d209d SHA512 bfba267e5cda558b347f6fab1a286353b97d81093c0457ac044667baa369f5cd47a07b3ce6a1ceb66e7992c2e4224765458dd859d0a6fa748ad8e6f80ea541ad -DIST openocd-0.8.0.tar.gz 4821738 BLAKE2B dff8c951b28c1a61be33f9e540ebe6aa662429b5d522fc169a8bd80b04c63442c8d50aba41c2413436e630afdb65e2da83191128076ba58f7bc96edcb8c2d2aa SHA512 9130b683394c4d99cd4c5365ba2bbe07ca8bdf0d02bdd4504b0f5f376209e787955d725c11d811f8937b7b0fc207c8d02e0b7484607edd2f68b2d00d48250f2c DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227 diff --git a/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch b/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch deleted file mode 100644 index 1791cabc66f..000 --- a/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch +++ /dev/null @@ -1,66 +0,0 @@ -Apply upstream patch for jimtcl-0.75 compatibility - -X-Gentoo-Bug: 509902 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=509902 -Link: http://repo.or.cz/w/openocd.git/commitdiff/92ea548aafee840e1507306a3ffb38625f427ec5 - -Signed-off-by: Markos Chandras - -From 92ea548aafee840e1507306a3ffb38625f427ec5 Mon Sep 17 00:00:00 2001 -From: Paul Fertser -Date: Mon, 28 Apr 2014 14:34:47 +0400 -Subject: [PATCH] Update to the current Jim Tcl - -This is a post-release version but hopefully some fixes that went in -are worth it; also the changes here make OpenOCD compatible with stock -0.75 version if a distro maintainer decides to use it. - -Change-Id: I7ad1814c7c4868198475cdca4750c3d0ee4f5f8b -Signed-off-by: Paul Fertser -Reviewed-on: http://openocd.zylin.com/2121 -Tested-by: jenkins -Reviewed-by: Freddie Chopin - jimtcl |2 +- - src/helper/command.c |2 +- - src/helper/command.h |4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/helper/command.c b/src/helper/command.c -index 21362a6..137ac7e 100644 a/src/helper/command.c -+++ b/src/helper/command.c -@@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx, - - LOG_DEBUG("registering '%s'...", ocd_name); - -- Jim_CmdProc func = c->handler ? &script_command : &command_unknown; -+ Jim_CmdProc *func = c->handler ? &script_command : &command_unknown; - int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL); - free(ocd_name); - if (JIM_OK != retval) -diff --git a/src/helper/command.h b/src/helper/command.h -index 0f0edbb..0eda5b5 100644 a/src/helper/command.h -+++ b/src/helper/command.h -@@ -168,7 +168,7 @@ struct command { - struct command *parent; -
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/
commit: 58aeea2a8587f5f9875a7c50f8347c141f93 Author: Sven Wegener gentoo org> AuthorDate: Sat Apr 23 19:20:00 2022 + Commit: Sven Wegener gentoo org> CommitDate: Sat Apr 23 19:35:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58aeea2a dev-embedded/openocd: Cleanup Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Sven Wegener gentoo.org> dev-embedded/openocd/Manifest | 1 - .../openocd/files/openocd-0.10.0-fno-common.patch | 11 --- dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 100 - 3 files changed, 112 deletions(-) diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 8c2977737e27..399fea8ec02c 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1 @@ -DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch deleted file mode 100644 index c924b2f8fec0.. --- a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ a/src/jtag/drivers/bitbang.h -+++ b/src/jtag/drivers/bitbang.h -@@ -35,7 +35,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; - diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild deleted file mode 100644 index 6c7a9d5bcfa7.. --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit udev - -if [[ ${PV} == * ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="amd64 ~arm x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net"; - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76:0= - cmsis-dap? ( dev-libs/hidapi ) - jlink? ( dev-embedded/libjaylink ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -src_prepare() { - default - - if [[ ${PV} == * ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - local myconf=( - --enable-amtjtagaccel - --enable-arm-jtag-ew - --enable-at91rm9200 - --enable-bcm2835gpio - --enable-buspirate - --enable-ep93xx - --enable-gw16012 - --enable-sysfsgpio - --disable-internal-jimtcl - --disable-internal-libjaylink - --disable-werror - $(use_enable cmsis-dap) - $(use_enable dummy) - $(use_enable ftdi openjtag) - $(use_enable ftdi presto) - $(use_enable ftdi usb-blaster) - $(use_enable jlink) - $(use_enable parport) - $(use_enable parport parport_ppdev) - $(use_enable usb aice) - $(use_enable usb armjtagew) - $(use_enable usb ftdi) - $(use_enable usb osbdm) - $(use_enable usb opendous) - $(use_enable usb rlink) - $(use_enable usb stlink) - $(use_enable usb ti-icdi) - $(use_enable usb usbprog) - $(use_enable usb usb-blaster-2) - $(use_enable usb ulink) - $(use_enable usb vsllink) - $(use_enable verbose-io verbose-jtag-io) - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - -
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/
commit: 655ddf5db91609cdf30abf364fb22e0eaf78affd Author: Jakov Smolic sartura hr> AuthorDate: Sat Feb 13 10:14:32 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 13 10:14:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655ddf5d dev-embedded/openocd: Remove duplicate gcc-10 patch from 0.10.0-r1 Closes: https://github.com/gentoo/gentoo/pull/19404 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> .../openocd/files/openocd-0.10.0-gcc10.patch | 36 -- dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 --- 2 files changed, 40 deletions(-) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch deleted file mode 100644 index b7e3ea13bfb..000 --- a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/722640 -http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696 -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 edb779c..bbbc693 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; - --- -1.9.1 - diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index ac8942db0b0..6c7a9d5bcfa 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -40,10 +40,6 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) -PATCHES=( - "${FILESDIR}/${P}-gcc10.patch" -) - src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/, dev-embedded/openocd/files/
commit: 932966d8e53c771d30e0eebbc12a9b6256f81ce9 Author: Jannis Achstetter kripserver net> AuthorDate: Sat Dec 19 09:26:41 2020 + Commit: Sam James gentoo org> CommitDate: Sun Dec 27 05:01:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932966d8 dev-embedded/openocd: Fix compilation with gcc 10 Closes: https://bugs.gentoo.org/722640 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Jannis Achstetter kripserver.net> Closes: https://github.com/gentoo/gentoo/pull/18722 Signed-off-by: Sam James gentoo.org> .../openocd/files/openocd-0.10.0-gcc10.patch | 36 ++ dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 +++ 2 files changed, 40 insertions(+) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch new file mode 100644 index 000..b7e3ea13bfb --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/722640 +http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696 +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 edb779c..bbbc693 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; + +-- +1.9.1 + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 168fc249956..1934a0ba1a0 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -40,6 +40,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) + src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/
commit: 45de522eb99a6a1cc619ffb1f69b748133da347b Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 14:15:33 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Dec 28 14:15:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45de522e dev-embedded/openocd: Fix build with gcc-10 * Drop unused eclasses Closes: https://bugs.gentoo.org/722640 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> .../openocd/files/openocd-0.10.0-fno-common.patch | 11 ++ dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 125 +++-- 2 files changed, 52 insertions(+), 84 deletions(-) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch new file mode 100644 index 000..c924b2f8fec --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +@@ -35,7 +35,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; + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 1934a0ba1a0..14fbf084e90 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == * ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"; + EGIT_REPO_URI=" https://repo.or.cz/openocd.git"; else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -36,9 +35,10 @@ RDEPEND=" ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -[[ ${PV} == "" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) PATCHES=( "${FILESDIR}/${P}-gcc10.patch" @@ -47,99 +47,56 @@ PATCHES=( src_prepare() { default - if [[ ${PV} == "" ]] ; then + if [[ ${PV} == * ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew -
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/
commit: 5eb224df15acf319b38f4cc6874ead2556117cda Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Jan 4 23:18:12 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 5 05:14:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb224df dev-embedded/openocd: fix capstone include directory Closes: https://bugs.gentoo.org/889762 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/28965 Signed-off-by: Sam James gentoo.org> .../files/openocd-0.12.0-capstone-includedir.patch | 40 ++ dev-embedded/openocd/openocd-0.12.0_rc3.ebuild | 4 +++ 2 files changed, 44 insertions(+) diff --git a/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch new file mode 100644 index ..f2dbff6520e5 --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.12.0-capstone-includedir.patch @@ -0,0 +1,40 @@ +Bug: https://bugs.gentoo.org/889762 +diff --git a/contrib/cross-build.sh b/contrib/cross-build.sh +index b199bf715..919a22005 100755 +--- a/contrib/cross-build.sh b/contrib/cross-build.sh +@@ -155,7 +155,7 @@ if [ -d $CAPSTONE_SRC ] ; then + sed -i '1s;^;prefix=/usr \ + exec_prefix=${prefix} \ + libdir=${exec_prefix}/lib \ +-includedir=${prefix}/include/capstone\n\n;' $CAPSTONE_PC_FILE ++includedir=${prefix}/include\n\n;' $CAPSTONE_PC_FILE + fi + + +diff --git a/src/target/a64_disassembler.c b/src/target/a64_disassembler.c +index ca3d3ea7a..9579860f0 100644 +--- a/src/target/a64_disassembler.c b/src/target/a64_disassembler.c +@@ -15,7 +15,7 @@ + + #if HAVE_CAPSTONE + +-#include ++#include + + static void print_opcode(struct command_invocation *cmd, const cs_insn *insn) + { +diff --git a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c +index 749274f36..e78d08853 100644 +--- a/src/target/arm_disassembler.c b/src/target/arm_disassembler.c +@@ -16,7 +16,7 @@ + #include + + #if HAVE_CAPSTONE +-#include ++#include + #endif + + /* diff --git a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild index 57562d0c8fc5..031ef6803e37 100644 --- a/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0_rc3.ebuild @@ -36,6 +36,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch" +) + src_prepare() { default