* [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1
@ 2015-03-17 17:36 Samuel Martin
2015-03-17 17:36 ` [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi Samuel Martin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Samuel Martin @ 2015-03-17 17:36 UTC (permalink / raw)
To: buildroot
Avrdude supports both libftdi and libftdi1.
Because libftdi is already an optional dependency, this patch adds
libftdi1 as optional dependency as well, but privileges libftdi1 over
libftdi (accdording to what is done in avrdude's configure script).
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
changes v2->v3:
- rebase
- re-introduce optional libftdi dependency (ThomasP)
- reword commit log
changes v1->v2:
- rebase
---
package/avrdude/avrdude.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
index 03d6490..1811893 100644
--- a/package/avrdude/avrdude.mk
+++ b/package/avrdude/avrdude.mk
@@ -17,7 +17,9 @@ AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
AVRDUDE_LICENSE = GPLv2+
AVRDUDE_LICENSE_FILES = avrdude/COPYING
-ifeq ($(BR2_PACKAGE_LIBFTDI),y)
+ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
+AVRDUDE_DEPENDENCIES += libftdi1
+else ifeq ($(BR2_PACKAGE_LIBFTDI),y)
AVRDUDE_DEPENDENCIES += libftdi
endif
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi 2015-03-17 17:36 [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Samuel Martin @ 2015-03-17 17:36 ` Samuel Martin 2015-03-18 23:58 ` Arnout Vandecappelle 2015-03-18 23:58 ` [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Arnout Vandecappelle 2015-03-20 22:30 ` Thomas Petazzoni 2 siblings, 1 reply; 5+ messages in thread From: Samuel Martin @ 2015-03-17 17:36 UTC (permalink / raw) To: buildroot Note that, if both libftdi and libftdi1 are available, openocd will prefer libftdi1, so does Buildroot. ;-) Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- changes v2->v3: - rebase - fix dependency list (ThomasP) - extend commit log changes v1->v2: - rebase --- package/openocd/Config.in | 8 ++++---- package/openocd/openocd.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openocd/Config.in b/package/openocd/Config.in index 7c140c7..2db17fa 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -121,7 +121,7 @@ config BR2_PACKAGE_OPENOCD_PARPORT config BR2_PACKAGE_OPENOCD_FT2XXX bool "FT2232 based devices (DEPRECATED)" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -135,7 +135,7 @@ config BR2_PACKAGE_OPENOCD_VPI config BR2_PACKAGE_OPENOCD_UBLASTER bool "Altera USB-Blaster" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -176,7 +176,7 @@ config BR2_PACKAGE_OPENOCD_GW16012 config BR2_PACKAGE_OPENOCD_PRESTO bool "ASIX Presto Programmer" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help @@ -185,7 +185,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO config BR2_PACKAGE_OPENOCD_OPENJTAG bool "OpenJTAG Programmer" - select BR2_PACKAGE_LIBFTDI + select BR2_PACKAGE_LIBFTDI1 depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb depends on BR2_ARCH_HAS_ATOMICS help diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index fd7e09f..3b76850 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -23,7 +23,7 @@ OPENOCD_CONF_OPTS = \ # the dependencies they need. OPENOCD_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_LIBFTDI),libftdi) \ + $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) -- 2.1.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi 2015-03-17 17:36 ` [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi Samuel Martin @ 2015-03-18 23:58 ` Arnout Vandecappelle 0 siblings, 0 replies; 5+ messages in thread From: Arnout Vandecappelle @ 2015-03-18 23:58 UTC (permalink / raw) To: buildroot On 17/03/15 18:36, Samuel Martin wrote: > Note that, if both libftdi and libftdi1 are available, openocd will > prefer libftdi1, so does Buildroot. ;-) > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Regards, Arnout > > --- > changes v2->v3: > - rebase > - fix dependency list (ThomasP) > - extend commit log > > changes v1->v2: > - rebase > --- > package/openocd/Config.in | 8 ++++---- > package/openocd/openocd.mk | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/openocd/Config.in b/package/openocd/Config.in > index 7c140c7..2db17fa 100644 > --- a/package/openocd/Config.in > +++ b/package/openocd/Config.in > @@ -121,7 +121,7 @@ config BR2_PACKAGE_OPENOCD_PARPORT > > config BR2_PACKAGE_OPENOCD_FT2XXX > bool "FT2232 based devices (DEPRECATED)" > - select BR2_PACKAGE_LIBFTDI > + select BR2_PACKAGE_LIBFTDI1 > depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb > depends on BR2_ARCH_HAS_ATOMICS > help > @@ -135,7 +135,7 @@ config BR2_PACKAGE_OPENOCD_VPI > > config BR2_PACKAGE_OPENOCD_UBLASTER > bool "Altera USB-Blaster" > - select BR2_PACKAGE_LIBFTDI > + select BR2_PACKAGE_LIBFTDI1 > depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb > depends on BR2_ARCH_HAS_ATOMICS > help > @@ -176,7 +176,7 @@ config BR2_PACKAGE_OPENOCD_GW16012 > > config BR2_PACKAGE_OPENOCD_PRESTO > bool "ASIX Presto Programmer" > - select BR2_PACKAGE_LIBFTDI > + select BR2_PACKAGE_LIBFTDI1 > depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb > depends on BR2_ARCH_HAS_ATOMICS > help > @@ -185,7 +185,7 @@ config BR2_PACKAGE_OPENOCD_PRESTO > > config BR2_PACKAGE_OPENOCD_OPENJTAG > bool "OpenJTAG Programmer" > - select BR2_PACKAGE_LIBFTDI > + select BR2_PACKAGE_LIBFTDI1 > depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb > depends on BR2_ARCH_HAS_ATOMICS > help > diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk > index fd7e09f..3b76850 100644 > --- a/package/openocd/openocd.mk > +++ b/package/openocd/openocd.mk > @@ -23,7 +23,7 @@ OPENOCD_CONF_OPTS = \ > # the dependencies they need. > > OPENOCD_DEPENDENCIES = \ > - $(if $(BR2_PACKAGE_LIBFTDI),libftdi) \ > + $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ > $(if $(BR2_PACKAGE_LIBUSB),libusb) \ > $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ > $(if $(BR2_PACKAGE_LIBHID),libhid) > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 2015-03-17 17:36 [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Samuel Martin 2015-03-17 17:36 ` [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi Samuel Martin @ 2015-03-18 23:58 ` Arnout Vandecappelle 2015-03-20 22:30 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Arnout Vandecappelle @ 2015-03-18 23:58 UTC (permalink / raw) To: buildroot On 17/03/15 18:36, Samuel Martin wrote: > Avrdude supports both libftdi and libftdi1. > > Because libftdi is already an optional dependency, this patch adds > libftdi1 as optional dependency as well, but privileges libftdi1 over > libftdi (accdording to what is done in avrdude's configure script). > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Regards, Arnout > > --- > changes v2->v3: > - rebase > - re-introduce optional libftdi dependency (ThomasP) > - reword commit log > > changes v1->v2: > - rebase > --- > package/avrdude/avrdude.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk > index 03d6490..1811893 100644 > --- a/package/avrdude/avrdude.mk > +++ b/package/avrdude/avrdude.mk > @@ -17,7 +17,9 @@ AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ > AVRDUDE_LICENSE = GPLv2+ > AVRDUDE_LICENSE_FILES = avrdude/COPYING > > -ifeq ($(BR2_PACKAGE_LIBFTDI),y) > +ifeq ($(BR2_PACKAGE_LIBFTDI1),y) > +AVRDUDE_DEPENDENCIES += libftdi1 > +else ifeq ($(BR2_PACKAGE_LIBFTDI),y) > AVRDUDE_DEPENDENCIES += libftdi > endif > > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 2015-03-17 17:36 [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Samuel Martin 2015-03-17 17:36 ` [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi Samuel Martin 2015-03-18 23:58 ` [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Arnout Vandecappelle @ 2015-03-20 22:30 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Thomas Petazzoni @ 2015-03-20 22:30 UTC (permalink / raw) To: buildroot Dear Samuel Martin, On Tue, 17 Mar 2015 18:36:35 +0100, Samuel Martin wrote: > Avrdude supports both libftdi and libftdi1. > > Because libftdi is already an optional dependency, this patch adds > libftdi1 as optional dependency as well, but privileges libftdi1 over > libftdi (accdording to what is done in avrdude's configure script). > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Both patches applied, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-20 22:30 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-03-17 17:36 [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Samuel Martin 2015-03-17 17:36 ` [Buildroot] [PATCH v3 2/2] package/openocd: depends on libftdi1 instead of libftdi Samuel Martin 2015-03-18 23:58 ` Arnout Vandecappelle 2015-03-18 23:58 ` [Buildroot] [PATCH v3 1/2] package/avrdude: optionally depends on libftdi or libftdi1 Arnout Vandecappelle 2015-03-20 22:30 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox