hwoarang 14/05/03 22:18:55
Modified: metadata.xml openocd-9999.ebuild
openocd-0.8.0_rc2.ebuild ChangeLog
Log:
Massive ebuild improvements and clean up thanks to Paul Fertser
<fercer...@gmail.com> on bug #500350. No need for revbump as this will be
removed soon in favor of final 0.8.0
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
09BF4F54C2BA7F3C!)
Revision Changes Path
1.10 dev-embedded/openocd/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/metadata.xml?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/metadata.xml?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 24 May 2013 22:21:15 -0000 1.9
+++ metadata.xml 3 May 2014 22:18:55 -0000 1.10
@@ -4,6 +4,7 @@
<herd>dev-embedded</herd>
<use>
<flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+ <flag name='cmsis-dap'>Support for CMSIS-DAP compliant adapters</flag>
<flag name="dummy">Build the dummy port driver</flag>
<flag name="minidriver">Build the dummy minidriver</flag>
<flag name='ftd2xx'>Enable support for USB FTDI chips via
<pkg>dev-embedded/libftd2xx</pkg></flag>
1.34 dev-embedded/openocd/openocd-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.34&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.34&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.33&r2=1.34
Index: openocd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- openocd-9999.ebuild 26 Apr 2014 11:26:17 -0000 1.33
+++ openocd-9999.ebuild 3 May 2014 22:18:55 -0000 1.34
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v
1.33 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v
1.34 2014/05/03 22:18:55 hwoarang Exp $
EAPI="5"
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
# One ebuild to rule them all
if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@
DESCRIPTION="OpenOCD - Open On-Chip Debugger"
HOMEPAGE="http://openocd.sourceforge.net";
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
RESTRICT="strip" # includes non-native binaries
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+ cmsis-dap? ( dev-libs/hidapi )
usb? (
virtual/libusb:0
virtual/libusb:1
)
ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+ virtual/pkgconfig"
src_prepare() {
epatch_user
@@ -47,28 +45,12 @@
sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
AT_NO_RECURSIVE=yes eautoreconf
fi
-
- # Disable craptastic build settings.
- sed -i \
- -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if
false:' \
- configure || die
-
- if use ftdi ; then
- 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 \
- -e "s:-lftdi -lusb:${libs}:" \
- configure src/Makefile.in || die
- append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
- fi
}
src_configure() {
# Here are some defaults
local myconf=(
--enable-buspirate
- --enable-ioutil
--disable-werror
--disable-internal-jimtcl
--enable-amtjtagaccel
@@ -77,12 +59,16 @@
--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
@@ -92,42 +78,47 @@
--enable-rlink
--enable-stlink
--enable-vsllink
- --enable-arm-jtag-ew
+ --enable-armjtagew
$(use_enable verbose-io verbose-usb-io)
$(use_enable verbose-io verbose_usb_comms)
)
else
myconf+=(
--disable-aice
- --disable-stlink
+ --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 blaster; then
+ if use ftdi; then
myconf+=(
- --enable-usb_blaster_libftdi
- --enable-usb-blaster-2
+ --enable_usb_blaster_libftdi
+ --enable-openjtag_ftdi
+ --enable-presto_libftdi
)
else
myconf+=(
+ --disable-openjtag_ftdi
+ --disable-presto_libftdi
--disable-usb_blaster_libftdi
- --disable-usb-blaster-2
)
fi
econf \
$(use_enable dummy) \
- $(use_enable ftdi) \
- $(use_enable minidriver minidriver-dummy) \
+ $(use_enable cmsis-dap) \
$(use_enable parport) \
$(use_enable parport parport_ppdev) \
- $(use_enable parport parport_giveio) \
- $(use_enable presto presto_libftdi) \
- $(use_enable segger jlink) \
$(use_enable verbose-io verbose-jtag-io) \
"${myconf[@]}"
}
@@ -135,4 +126,5 @@
src_install() {
default
env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+ udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
}
1.2 dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild?r1=1.1&r2=1.2
Index: openocd-0.8.0_rc2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openocd-0.8.0_rc2.ebuild 26 Apr 2014 11:26:17 -0000 1.1
+++ openocd-0.8.0_rc2.ebuild 3 May 2014 22:18:55 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.1
2014/04/26 11:26:17 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.2
2014/05/03 22:18:55 hwoarang Exp $
EAPI="5"
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
# One ebuild to rule them all
if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@
DESCRIPTION="OpenOCD - Open On-Chip Debugger"
HOMEPAGE="http://openocd.sourceforge.net";
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
RESTRICT="strip" # includes non-native binaries
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+ cmsis-dap? ( dev-libs/hidapi )
usb? (
virtual/libusb:0
virtual/libusb:1
)
ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+ virtual/pkgconfig"
src_prepare() {
epatch_user
@@ -47,28 +45,12 @@
sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
AT_NO_RECURSIVE=yes eautoreconf
fi
-
- # Disable craptastic build settings.
- sed -i \
- -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if
false:' \
- configure || die
-
- if use ftdi ; then
- 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 \
- -e "s:-lftdi -lusb:${libs}:" \
- configure src/Makefile.in || die
- append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
- fi
}
src_configure() {
# Here are some defaults
local myconf=(
--enable-buspirate
- --enable-ioutil
--disable-werror
--disable-internal-jimtcl
--enable-amtjtagaccel
@@ -77,12 +59,16 @@
--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
@@ -92,42 +78,47 @@
--enable-rlink
--enable-stlink
--enable-vsllink
- --enable-arm-jtag-ew
+ --enable-armjtagew
$(use_enable verbose-io verbose-usb-io)
$(use_enable verbose-io verbose_usb_comms)
)
else
myconf+=(
--disable-aice
- --disable-stlink
+ --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 blaster; then
+ if use ftdi; then
myconf+=(
- --enable-usb_blaster_libftdi
- --enable-usb-blaster-2
+ --enable_usb_blaster_libftdi
+ --enable-openjtag_ftdi
+ --enable-presto_libftdi
)
else
myconf+=(
+ --disable-openjtag_ftdi
+ --disable-presto_libftdi
--disable-usb_blaster_libftdi
- --disable-usb-blaster-2
)
fi
econf \
$(use_enable dummy) \
- $(use_enable ftdi) \
- $(use_enable minidriver minidriver-dummy) \
+ $(use_enable cmsis-dap) \
$(use_enable parport) \
$(use_enable parport parport_ppdev) \
- $(use_enable parport parport_giveio) \
- $(use_enable presto presto_libftdi) \
- $(use_enable segger jlink) \
$(use_enable verbose-io verbose-jtag-io) \
"${myconf[@]}"
}
@@ -135,4 +126,5 @@
src_install() {
default
env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+ udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
}
1.48 dev-embedded/openocd/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.48&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.48&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 26 Apr 2014 11:26:17 -0000 1.47
+++ ChangeLog 3 May 2014 22:18:55 -0000 1.48
@@ -1,6 +1,12 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.47
2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.48
2014/05/03 22:18:55 hwoarang Exp $
+
+ 03 May 2014; Markos Chandras <hwoar...@gentoo.org> metadata.xml,
+ openocd-0.8.0_rc2.ebuild, openocd-9999.ebuild:
+ Massive ebuild improvements and clean up thanks to Paul Fertser
+ <fercer...@gmail.com> on bug #500350. No need for revbump as this will be
+ removed soon in favor of final 0.8.0
*openocd-0.8.0_rc2 (26 Apr 2014)
