* [Buildroot] [PATCH] host-lua: fix bug #5354
From: Peter Korsgaard @ 2012-11-17 21:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50A7F1D1.9060405@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Hi,
>> Ahh, I see it now - It's because we're passing -nostdlib -lgcc when
>> creating the shared library. Why are we doing that in the first place?
>>
>> Gustavo, it seems to date back to 46913a2d4. Do you have any idea why it
>> was done like that?
Gustavo> https://bugs.busybox.net/show_bug.cgi?id=803 has rvpaasen's
Gustavo> work, i just reworked it IIRC. OpenWRT doesn't try to link to
Gustavo> libgcc or ditch the standard startup and libraries, it's worth
Gustavo> a try to kill that bit.
Ok, done.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] news.html: announce dev days report / next dev days
From: Peter Korsgaard @ 2012-11-17 21:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e4f33d4a8c08eca2668320a97dbdd157bbb5ecd4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/news.html | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/docs/news.html b/docs/news.html
index 2f54567..416857c 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,21 @@
<p>
<ul>
+ <li><b>17 November 2012 -- Buildroot Developer Day</b>
+
+ <p>A report from the recent <i>Buildroot Developer Days</i> meeting
+ in Barcelona, Spain is now <a
+ href="http://lists.busybox.net/pipermail/buildroot/2012-November/061558.html">available</a>.
+ Many thanks to all the participants, and a special thanks to Arnout
+ Vandecappelle from <a href="http://mind.be/">mind</a> for taking
+ notes and Thomas Petazzoni from <a
+ href="http://free-electrons.com/">Free Electrons</a> for handling
+ all the practical arrangements, and naturally our sponsors, <a
+ href="http://www.fluendo.com/">Fluendo</a> and <a href="http://www.synopsys.com/">Synopsis</a>.
+ </p>
+ <p>The next Developer Days will take place on February 4th and 5th
+ in Brussels, Belgium, right after <a href="http://fosdem.org">FOSDEM</a>.</p>
+
<li><b>31 August 2012 -- 2012.08 released</b>
<p>The stable 2012.08 release is out - Thanks to everyone
^ permalink raw reply related
* [Buildroot] [Bug 5354] host-lua doesn't build for EFL elementary
From: bugzilla at busybox.net @ 2012-11-17 21:24 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-5354-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=5354
--- Comment #8 from Peter Korsgaard <jacmet@uclibc.org> 2012-11-17 21:24:54 UTC ---
It is most likely because the shared library was linked with -nostdlib -lgcc.
I've just committed a fix for that to git (684f208ec 'lua: don't be fancy when
creating shared library'), could you give it a try to see if it fixes your
issue?
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [git commit] lua: don't be fancy when creating shared library
From: Peter Korsgaard @ 2012-11-17 21:19 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=684f208ecf1da23ce7013a91a69adb2ff7161715
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
(Possibly) fixes #5354
The lua shared library patch was creating the shared library with
-nostdlib -lgcc for some unknown reason, which most likely is
the reason for the link issue reported in #5354.
Fix it by dropping these arguments, so gcc gets to figure out itself
what dependencies are needed.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/lua/lua-02-shared-libs-for-lua.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/lua/lua-02-shared-libs-for-lua.patch b/package/lua/lua-02-shared-libs-for-lua.patch
index 454e660..97a7068 100644
--- a/package/lua/lua-02-shared-libs-for-lua.patch
+++ b/package/lua/lua-02-shared-libs-for-lua.patch
@@ -39,7 +39,7 @@ Index: b/src/Makefile
-$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc
++ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
+ ln -fs $@.$(PKG_VERSION) $@
+
+$(LUA_T): $(LUA_O) $(LUA_SO)
^ permalink raw reply related
* [Buildroot] [PATCH v2] libusb: disable on avr32
From: Peter Korsgaard @ 2012-11-17 21:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353186466-2269-1-git-send-email-spdawson@gmail.com>
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes:
spdawson> From: Simon Dawson <spdawson@gmail.com>
spdawson> For target architecture avr32, the gpsd package fails to build when
spdawson> libusb is selected. The following autobuild failure illustrates the problem.
spdawson> http://autobuild.buildroot.net/results/aa3d4763a0e90c995bc8431cf345730ee22e65a1/build-end.log
spdawson> The issue is that libusb requires timerfd_settime and timerfd_create, but
spdawson> the underlying syscalls are not implemented on avr32.
spdawson> This patch disables the libusb package for the avr32 target architecture.
spdawson> This will also fix autobuild failures such as the following
spdawson> http://autobuild.buildroot.net/results/1a17810c2183e389244143dea55b0241c62c0bee/build-end.log
spdawson> In this case, the pcsc-lite package fails to build on the avr32 architecture,
spdawson> due to the dependency on libusb.
spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
spdawson> ---
spdawson> v2: Handle reverse dependencies of libusb, as suggested by Peter Korsgaard
spdawson> package/ccid/Config.in | 4 ++--
spdawson> package/efl/libedbus/Config.in | 1 +
spdawson> package/libfreefare/Config.in | 4 ++--
spdawson> package/libftdi/Config.in | 4 ++--
spdawson> package/libhid/Config.in | 3 +--
spdawson> package/libiqrf/Config.in | 4 ++--
spdawson> package/libnfc-llcp/Config.in | 5 ++++-
spdawson> package/libnfc/Config.in | 4 ++--
spdawson> package/libusb/Config.in | 3 ++-
spdawson> package/openocd/Config.in | 4 ++--
spdawson> package/pcsc-lite/Config.in | 1 +
spdawson> package/python-nfc/Config.in | 4 ++++
spdawson> package/sconeserver/Config.in | 2 ++
spdawson> package/usb_modeswitch/Config.in | 4 ++--
spdawson> package/usb_modeswitch_data/Config.in | 4 ++++
spdawson> package/usbutils/Config.in | 4 ++--
spdawson> 16 files changed, 35 insertions(+), 20 deletions(-)
spdawson> diff --git a/package/ccid/Config.in b/package/ccid/Config.in
spdawson> index c9b77d1..7e4bd70 100644
spdawson> --- a/package/ccid/Config.in
spdawson> +++ b/package/ccid/Config.in
spdawson> @@ -2,11 +2,11 @@ config BR2_PACKAGE_CCID
spdawson> bool "ccid"
spdawson> select BR2_PACKAGE_PCSC_LITE
spdawson> select BR2_PACKAGE_LIBUSB
spdawson> - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
spdawson> + depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
spdawson> help
spdawson> PC/SC driver for USB CCID smart card readers
spdawson> http://pcsclite.alioth.debian.org/ccid.html
spdawson> comment "ccid needs a toolchain with thread support"
spdawson> - depends on !BR2_TOOLCHAIN_HAS_THREADS
spdawson> + depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
spdawson> diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
spdawson> index 985939e..a8a9e14 100644
spdawson> --- a/package/efl/libedbus/Config.in
spdawson> +++ b/package/efl/libedbus/Config.in
spdawson> @@ -15,6 +15,7 @@ if BR2_PACKAGE_LIBEDBUS
spdawson> config BR2_PACKAGE_LIBEDBUS_BLUEZ
spdawson> bool "bluez support"
spdawson> + depends on !BR2_avr32 # libusb
spdawson> select BR2_PACKAGE_BLUEZ_UTILS
But bluez doesn't depend on libusb, only the BR2_PACKAGE_BLUEZ_UTILS_USB
suboption (which should depend on !BR2_avr32).
spdawson> config BR2_PACKAGE_SCONESERVER_BLUETOOTH
spdawson> bool "bluetooth"
spdawson> + depends on !BR2_avr32 && BR2_USE_WCHAR && \
spdawson> + BR2_TOOLCHAIN_HAS_THREADS # bluez-utils
spdawson> select BR2_PACKAGE_BLUEZ_UTILS
Same here.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 1/2] polarssl: bump to version 1.2.0
From: Peter Korsgaard @ 2012-11-17 21:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353170548-13069-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed both, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] collectd: bump to version 5.1.1
From: Peter Korsgaard @ 2012-11-17 21:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353170528-12967-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] hiawatha: bump to version 8.6
From: Peter Korsgaard @ 2012-11-17 21:08 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=56cbd27a4c14709163ec5437c41a8a046631b8c9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/hiawatha/hiawatha.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 79546e3..bd9da43 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,5 +1,5 @@
-HIAWATHA_VERSION = 8.5
-HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+HIAWATHA_VERSION = 8.6
+HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
HIAWATHA_LICENSE = GPLv2
HIAWATHA_LICENSE_FILES = LICENSE
^ permalink raw reply related
* [Buildroot] [git commit] polarssl: bump to version 1.2.0
From: Peter Korsgaard @ 2012-11-17 21:08 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b5a34e750f25cd97b1717c7cf56d0e90d6b0f895
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
.../polarssl-shared-and-static-library.patch | 19 +++++++++++--------
| 6 ++++--
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 562b900..e11cab3 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,21 +9,22 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
defaults to OFF). Both options can be manipulated independently.
+[Gustavo: update for polarssl 1.2.0]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Index: polarssl-1.1.1/library/CMakeLists.txt
-===================================================================
---- polarssl-1.1.1.orig/library/CMakeLists.txt
-+++ polarssl-1.1.1/library/CMakeLists.txt
+diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
+--- polarssl-1.2.0.orig/library/CMakeLists.txt 2012-11-15 15:01:58.239248830 -0300
++++ polarssl-1.2.0/library/CMakeLists.txt 2012-11-15 15:00:10.310806353 -0300
@@ -1,4 +1,5 @@
option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
+option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
set(src
aes.c
-@@ -40,17 +41,21 @@
- xtea.c
- )
+@@ -50,19 +51,23 @@
+ set(libs ws2_32)
+ endif(WIN32)
-if(NOT USE_SHARED_POLARSSL_LIBRARY)
-
@@ -33,7 +34,7 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
+if(USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
+
+endif(USE_SHARED_POLARSSL_LIBRARY)
@@ -46,6 +47,8 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
-endif(NOT USE_SHARED_POLARSSL_LIBRARY)
+endif(USE_STATIC_POLARSSL_LIBRARY)
+ target_link_libraries(polarssl ${libs})
+
-install(TARGETS polarssl
+install(TARGETS polarssl polarssl-static
DESTINATION ${LIB_INSTALL_DIR}
--git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 34fbe29..edda9bf 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
-POLARSSL_SITE = http://polarssl.org/code/releases/
-POLARSSL_VERSION = 1.1.4
+POLARSSL_SITE = https://polarssl.org/download
+POLARSSL_VERSION = 1.2.0
POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
POLARSSL_CONF_OPT = \
-DUSE_SHARED_POLARSSL_LIBRARY=ON \
@@ -8,6 +8,8 @@ POLARSSL_CONF_OPT = \
-DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
POLARSSL_INSTALL_STAGING = YES
+POLARSSL_LICENSE = GPLv2
+POLARSSL_LICENSE_FILES = LICENSE
$(eval $(cmake-package))
^ permalink raw reply related
* [Buildroot] [git commit] collectd: bump to version 5.1.1
From: Peter Korsgaard @ 2012-11-17 21:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=7451db3d3aed29c65b7c9acfc880536b381ce1dd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/collectd/collectd.mk | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6164df2..f6aeb0d 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,10 +4,12 @@
#
#############################################################
-COLLECTD_VERSION = 5.1.0
+COLLECTD_VERSION = 5.1.1
COLLECTD_SITE = http://collectd.org/files
COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+COLLECTD_LICENSE = GPLv2 LGPLv2.1
+COLLECTD_LICENSE_FILES = COPYING
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
^ permalink raw reply related
* [Buildroot] [PATCH v2] libusb: disable on avr32
From: spdawson at gmail.com @ 2012-11-17 21:07 UTC (permalink / raw)
To: buildroot
From: Simon Dawson <spdawson@gmail.com>
For target architecture avr32, the gpsd package fails to build when
libusb is selected. The following autobuild failure illustrates the problem.
http://autobuild.buildroot.net/results/aa3d4763a0e90c995bc8431cf345730ee22e65a1/build-end.log
The issue is that libusb requires timerfd_settime and timerfd_create, but
the underlying syscalls are not implemented on avr32.
This patch disables the libusb package for the avr32 target architecture.
This will also fix autobuild failures such as the following
http://autobuild.buildroot.net/results/1a17810c2183e389244143dea55b0241c62c0bee/build-end.log
In this case, the pcsc-lite package fails to build on the avr32 architecture,
due to the dependency on libusb.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
v2: Handle reverse dependencies of libusb, as suggested by Peter Korsgaard
package/ccid/Config.in | 4 ++--
package/efl/libedbus/Config.in | 1 +
package/libfreefare/Config.in | 4 ++--
package/libftdi/Config.in | 4 ++--
package/libhid/Config.in | 3 +--
package/libiqrf/Config.in | 4 ++--
package/libnfc-llcp/Config.in | 5 ++++-
package/libnfc/Config.in | 4 ++--
package/libusb/Config.in | 3 ++-
package/openocd/Config.in | 4 ++--
package/pcsc-lite/Config.in | 1 +
package/python-nfc/Config.in | 4 ++++
package/sconeserver/Config.in | 2 ++
package/usb_modeswitch/Config.in | 4 ++--
package/usb_modeswitch_data/Config.in | 4 ++++
package/usbutils/Config.in | 4 ++--
16 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
index c9b77d1..7e4bd70 100644
--- a/package/ccid/Config.in
+++ b/package/ccid/Config.in
@@ -2,11 +2,11 @@ config BR2_PACKAGE_CCID
bool "ccid"
select BR2_PACKAGE_PCSC_LITE
select BR2_PACKAGE_LIBUSB
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
help
PC/SC driver for USB CCID smart card readers
http://pcsclite.alioth.debian.org/ccid.html
comment "ccid needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 985939e..a8a9e14 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -15,6 +15,7 @@ if BR2_PACKAGE_LIBEDBUS
config BR2_PACKAGE_LIBEDBUS_BLUEZ
bool "bluez support"
+ depends on !BR2_avr32 # libusb
select BR2_PACKAGE_BLUEZ_UTILS
help
Bluetooth support.
diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index 6877000..930b0e3 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBFREEFARE
bool "libfreefare"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LIBNFC
help
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LIBFREEFARE
http://code.google.com/p/nfc-tools/wiki/libfreefare
comment "libfreefare needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/libftdi/Config.in b/package/libftdi/Config.in
index 48e9ceb..4a12af0 100644
--- a/package/libftdi/Config.in
+++ b/package/libftdi/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBFTDI
bool "libftdi"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
@@ -19,4 +19,4 @@ config BR2_PACKAGE_LIBTFDI_CPP
endif # BR2_PACKAGE_LIBFTDI
comment "libftdi needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/libhid/Config.in b/package/libhid/Config.in
index bd1cfcb..f0bfc52 100644
--- a/package/libhid/Config.in
+++ b/package/libhid/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBHID
bool "libhid"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
- depends on !BR2_avr32 # timerfd not in uClibc-0.9.31
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
diff --git a/package/libiqrf/Config.in b/package/libiqrf/Config.in
index 7222536..590913c 100644
--- a/package/libiqrf/Config.in
+++ b/package/libiqrf/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBIQRF
bool "libiqrf"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
help
This library implement specific protocol
@@ -11,4 +11,4 @@ config BR2_PACKAGE_LIBIQRF
https://github.com/nandra/libiqrf
comment "libiqrf needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/libnfc-llcp/Config.in b/package/libnfc-llcp/Config.in
index f557926..efa2e31 100644
--- a/package/libnfc-llcp/Config.in
+++ b/package/libnfc-llcp/Config.in
@@ -1,9 +1,12 @@
config BR2_PACKAGE_LIBNFC_LLCP
bool "libnfc-llcp"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBNFC
help
Library extending libnfc with support for Logical Link Control
Protocol.
http://code.google.com/p/nfc-tools/source/browse/trunk/libnfc-llcp/
+
+comment "libnfc-llcp needs a toolchain with thread support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in
index 159578f..8249294 100644
--- a/package/libnfc/Config.in
+++ b/package/libnfc/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBNFC
bool "libnfc"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
@@ -14,4 +14,4 @@ config BR2_PACKAGE_LIBNFC_EXAMPLES
select BR2_PACKAGE_READLINE
comment "libnfc needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
index 2eed3fa..cbaeac6 100644
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBUSB
bool "libusb"
+ depends on !BR2_avr32 # timerfd not in uClibc-0.9.31
depends on BR2_TOOLCHAIN_HAS_THREADS
help
Userspace library for accessing USB devices
@@ -7,4 +8,4 @@ config BR2_PACKAGE_LIBUSB
http://libusb.sourceforge.net/
comment "libusb needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index 4ea66a5..6ef50a7 100644
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_OPENOCD
bool "openocd"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
@@ -30,4 +30,4 @@ config BR2_PACKAGE_OPENOCD_VSLLINK
endif # BR2_PACKAGE_OPENOCD
comment "openocd needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in
index 621cc66..26aa33c 100644
--- a/package/pcsc-lite/Config.in
+++ b/package/pcsc-lite/Config.in
@@ -11,6 +11,7 @@ if BR2_PACKAGE_PCSC_LITE
config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB
bool "use libusb"
depends on !BR2_PACKAGE_UDEV
+ depends on !BR2_avr32 # libusb
select BR2_PACKAGE_LIBUSB
help
Select Y if you want to support usb smart card readers.
diff --git a/package/python-nfc/Config.in b/package/python-nfc/Config.in
index c928ba1..9b5555c 100644
--- a/package/python-nfc/Config.in
+++ b/package/python-nfc/Config.in
@@ -1,9 +1,13 @@
config BR2_PACKAGE_PYTHON_NFC
bool "python-nfc"
depends on BR2_PACKAGE_PYTHON
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
Python module for near field communication.
https://launchpad.net/nfcpy
+
+comment "python-nfc needs a toolchain with thread support"
+ depends on BR2_PACKAGE_PYTHON && !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index a7e5c75..023219b 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -38,6 +38,8 @@ config BR2_PACKAGE_SCONESERVER_MYSQL
config BR2_PACKAGE_SCONESERVER_BLUETOOTH
bool "bluetooth"
+ depends on !BR2_avr32 && BR2_USE_WCHAR && \
+ BR2_TOOLCHAIN_HAS_THREADS # bluez-utils
select BR2_PACKAGE_BLUEZ_UTILS
help
Bluetooth module for Sconeserver
diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
index a27b3ee..83e7fd8 100644
--- a/package/usb_modeswitch/Config.in
+++ b/package/usb_modeswitch/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_USB_MODESWITCH
bool "usb_modeswitch"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
@@ -10,4 +10,4 @@ config BR2_PACKAGE_USB_MODESWITCH
http://www.draisberghof.de/usb_modeswitch/
comment "usb_modeswitch needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/usb_modeswitch_data/Config.in b/package/usb_modeswitch_data/Config.in
index 8698bb6..a3aa19f 100644
--- a/package/usb_modeswitch_data/Config.in
+++ b/package/usb_modeswitch_data/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_USB_MODESWITCH_DATA
bool "usb_modeswitch_data"
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_USB_MODESWITCH
# tcl is a runtime dependency
select BR2_PACKAGE_TCL
@@ -10,3 +11,6 @@ config BR2_PACKAGE_USB_MODESWITCH_DATA
function automatically
http://www.draisberghof.de/usb_modeswitch/
+
+comment "usb_modeswitch_data needs a toolchain with thread support"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index fd9926c..a35d4db 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_USBUTILS
bool "usbutils"
- depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_THREADS # libusb
select BR2_PACKAGE_LIBUSB
help
USB enumeration utilities
@@ -18,4 +18,4 @@ config BR2_PACKAGE_USBUTILS_ZLIB
to decompress the file every time it's run.
comment "usbutils needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH] host-lua: fix bug #5354
From: Gustavo Zacarias @ 2012-11-17 20:21 UTC (permalink / raw)
To: buildroot
In-Reply-To: <871ufst34m.fsf@dell.be.48ers.dk>
On 11/17/2012 04:56 PM, Peter Korsgaard wrote:
> Ahh, I see it now - It's because we're passing -nostdlib -lgcc when
> creating the shared library. Why are we doing that in the first place?
>
> Gustavo, it seems to date back to 46913a2d4. Do you have any idea why it
> was done like that?
https://bugs.busybox.net/show_bug.cgi?id=803 has rvpaasen's work, i just
reworked it IIRC.
OpenWRT doesn't try to link to libgcc or ditch the standard startup and
libraries, it's worth a try to kill that bit.
Regards.
^ permalink raw reply
* [Buildroot] [PATCH] libusb: disable on avr32
From: Simon Dawson @ 2012-11-17 20:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87sj88rns4.fsf@dell.be.48ers.dk>
On 17 November 2012 20:13, Peter Korsgaard <jacmet@uclibc.org> wrote:
> Yes, that's the only solution we have right now.
>
> Remember to look recursively upwards. These libusb users might be
> selected by other packages.
Okay; thanks Peter.
Simon.
^ permalink raw reply
* [Buildroot] [PATCH] libusb: disable on avr32
From: Peter Korsgaard @ 2012-11-17 20:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAHt8ZCMF-cvx4W+GrGUxqn1iBx9XDmGutVv-xGr1uF4M=o-A1A@mail.gmail.com>
>>>>> "Simon" == Simon Dawson <spdawson@gmail.com> writes:
Simon> Hi Peter; thanks for the feedback.
Simon> On 17 November 2012 19:58, Peter Korsgaard <jacmet@uclibc.org> wrote:
>> What about libusb's reverse dependencies?
>>
>> git grep 'select BR2_PACKAGE_LIBUSB'
>> package/bluez_utils/Config.in: select BR2_PACKAGE_LIBUSB
>> package/ccid/Config.in: select BR2_PACKAGE_LIBUSB
>> package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB
>> package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/libhid/Config.in: select BR2_PACKAGE_LIBUSB
>> package/libhid/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/libiqrf/Config.in: select BR2_PACKAGE_LIBUSB
>> package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB
>> package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/openocd/Config.in: select BR2_PACKAGE_LIBUSB
>> package/openocd/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/pcsc-lite/Config.in: select BR2_PACKAGE_LIBUSB
>> package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB
>> package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB
>> package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
>> package/usbutils/Config.in: select BR2_PACKAGE_LIBUSB
Simon> Ah, yes. What's the right thing to do here? I don't really like the
Simon> thought of that "depends on !BR2_avr32" all over the place, but I
Simon> guess that's the cleanest solution, right?
Yes, that's the only solution we have right now.
Remember to look recursively upwards. These libusb users might be
selected by other packages.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] libusb: disable on avr32
From: Simon Dawson @ 2012-11-17 20:02 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87wqxkrofx.fsf@dell.be.48ers.dk>
Hi Peter; thanks for the feedback.
On 17 November 2012 19:58, Peter Korsgaard <jacmet@uclibc.org> wrote:
> What about libusb's reverse dependencies?
>
> git grep 'select BR2_PACKAGE_LIBUSB'
> package/bluez_utils/Config.in: select BR2_PACKAGE_LIBUSB
> package/ccid/Config.in: select BR2_PACKAGE_LIBUSB
> package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB
> package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/libhid/Config.in: select BR2_PACKAGE_LIBUSB
> package/libhid/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/libiqrf/Config.in: select BR2_PACKAGE_LIBUSB
> package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB
> package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/openocd/Config.in: select BR2_PACKAGE_LIBUSB
> package/openocd/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/pcsc-lite/Config.in: select BR2_PACKAGE_LIBUSB
> package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB
> package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB
> package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
> package/usbutils/Config.in: select BR2_PACKAGE_LIBUSB
Ah, yes. What's the right thing to do here? I don't really like the
thought of that "depends on !BR2_avr32" all over the place, but I
guess that's the cleanest solution, right?
Simon.
^ permalink raw reply
* [Buildroot] [PATCH] libusb: disable on avr32
From: Peter Korsgaard @ 2012-11-17 19:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353182156-28906-1-git-send-email-spdawson@gmail.com>
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes:
spdawson> From: Simon Dawson <spdawson@gmail.com>
spdawson> For target architecture avr32, the gpsd package fails to build when
spdawson> libusb is selected. The following autobuild failure illustrates the problem.
spdawson> http://autobuild.buildroot.net/results/aa3d4763a0e90c995bc8431cf345730ee22e65a1/build-end.log
spdawson> The issue is that libusb requires timerfd_settime and timerfd_create, but
spdawson> the underlying syscalls are not implemented on avr32.
spdawson> This patch disables the libusb package for the avr32 target architecture.
What about libusb's reverse dependencies?
git grep 'select BR2_PACKAGE_LIBUSB'
package/bluez_utils/Config.in: select BR2_PACKAGE_LIBUSB
package/ccid/Config.in: select BR2_PACKAGE_LIBUSB
package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB
package/libftdi/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/libhid/Config.in: select BR2_PACKAGE_LIBUSB
package/libhid/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/libiqrf/Config.in: select BR2_PACKAGE_LIBUSB
package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB
package/libnfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/openocd/Config.in: select BR2_PACKAGE_LIBUSB
package/openocd/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/pcsc-lite/Config.in: select BR2_PACKAGE_LIBUSB
package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB
package/python-nfc/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB
package/usb_modeswitch/Config.in: select BR2_PACKAGE_LIBUSB_COMPAT
package/usbutils/Config.in: select BR2_PACKAGE_LIBUSB
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] host-lua: fix bug #5354
From: Peter Korsgaard @ 2012-11-17 19:56 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87boewt3hv.fsf@dell.be.48ers.dk>
>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:
Francois> see https://bugs.busybox.net/show_bug.cgi?id=5354
Peter> Thanks, but I don't get the problem in the first place. Lua links
Peter> lua/luac using gcc, so why doesn't it pick up the stack protection bits?
Ahh, I see it now - It's because we're passing -nostdlib -lgcc when
creating the shared library. Why are we doing that in the first place?
Gustavo, it seems to date back to 46913a2d4. Do you have any idea why it
was done like that?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] libusb: disable on avr32
From: spdawson at gmail.com @ 2012-11-17 19:55 UTC (permalink / raw)
To: buildroot
From: Simon Dawson <spdawson@gmail.com>
For target architecture avr32, the gpsd package fails to build when
libusb is selected. The following autobuild failure illustrates the problem.
http://autobuild.buildroot.net/results/aa3d4763a0e90c995bc8431cf345730ee22e65a1/build-end.log
The issue is that libusb requires timerfd_settime and timerfd_create, but
the underlying syscalls are not implemented on avr32.
This patch disables the libusb package for the avr32 target architecture.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
package/libusb/Config.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
index 2eed3fa..cbaeac6 100644
--- a/package/libusb/Config.in
+++ b/package/libusb/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBUSB
bool "libusb"
+ depends on !BR2_avr32 # timerfd not in uClibc-0.9.31
depends on BR2_TOOLCHAIN_HAS_THREADS
help
Userspace library for accessing USB devices
@@ -7,4 +8,4 @@ config BR2_PACKAGE_LIBUSB
http://libusb.sourceforge.net/
comment "libusb needs a toolchain with thread support"
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS && !BR2_avr32
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH] host-lua: fix bug #5354
From: Peter Korsgaard @ 2012-11-17 19:48 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353146744-13529-1-git-send-email-francois.perrad@gadz.org>
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
Francois> see https://bugs.busybox.net/show_bug.cgi?id=5354
Thanks, but I don't get the problem in the first place. Lua links
lua/luac using gcc, so why doesn't it pick up the stack protection bits?
Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Francois> ---
Francois> package/lua/lua.mk | 2 +-
Francois> 1 file changed, 1 insertion(+), 1 deletion(-)
Francois> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
Francois> index 9e0d387..3ce9867 100644
Francois> --- a/package/lua/lua.mk
Francois> +++ b/package/lua/lua.mk
Francois> @@ -24,7 +24,7 @@ endif
Francois> # We never want to have host-readline and host-ncurses as dependencies
Francois> # of host-lua.
Francois> HOST_LUA_DEPENDENCIES =
Francois> -HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
Francois> +HOST_LUA_CFLAGS = -Wall -fPIC -fno-stack-protector -DLUA_USE_DLOPEN -DLUA_USE_POSIX
Francois> HOST_LUA_MYLIBS = -ldl
Francois> define LUA_BUILD_CMDS
Francois> --
Francois> 1.7.9.5
Francois> _______________________________________________
Francois> buildroot mailing list
Francois> buildroot at busybox.net
Francois> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Solving the mesa3d build issue
From: Peter Korsgaard @ 2012-11-17 16:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121117150357.2aa86a1c@skate>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
Thomas> We really need to solve that problem, so I would be grateful if you
Thomas> could comment on it. Peter?
As discussed on irc, option 1 seems the best option until we can go for
3.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 2/2] hiawatha: bump to version 8.6
From: Gustavo Zacarias @ 2012-11-17 16:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353170548-13069-1-git-send-email-gustavo@zacarias.com.ar>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/hiawatha/hiawatha.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 79546e3..bd9da43 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -1,5 +1,5 @@
-HIAWATHA_VERSION = 8.5
-HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
+HIAWATHA_VERSION = 8.6
+HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
HIAWATHA_LICENSE = GPLv2
HIAWATHA_LICENSE_FILES = LICENSE
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] polarssl: bump to version 1.2.0
From: Gustavo Zacarias @ 2012-11-17 16:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../polarssl-shared-and-static-library.patch | 19 +++++++++++--------
| 6 ++++--
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index 562b900..e11cab3 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,21 +9,22 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
defaults to OFF). Both options can be manipulated independently.
+[Gustavo: update for polarssl 1.2.0]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Index: polarssl-1.1.1/library/CMakeLists.txt
-===================================================================
---- polarssl-1.1.1.orig/library/CMakeLists.txt
-+++ polarssl-1.1.1/library/CMakeLists.txt
+diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
+--- polarssl-1.2.0.orig/library/CMakeLists.txt 2012-11-15 15:01:58.239248830 -0300
++++ polarssl-1.2.0/library/CMakeLists.txt 2012-11-15 15:00:10.310806353 -0300
@@ -1,4 +1,5 @@
option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
+option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
set(src
aes.c
-@@ -40,17 +41,21 @@
- xtea.c
- )
+@@ -50,19 +51,23 @@
+ set(libs ws2_32)
+ endif(WIN32)
-if(NOT USE_SHARED_POLARSSL_LIBRARY)
-
@@ -33,7 +34,7 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
+if(USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
+
+endif(USE_SHARED_POLARSSL_LIBRARY)
@@ -46,6 +47,8 @@ Index: polarssl-1.1.1/library/CMakeLists.txt
-endif(NOT USE_SHARED_POLARSSL_LIBRARY)
+endif(USE_STATIC_POLARSSL_LIBRARY)
+ target_link_libraries(polarssl ${libs})
+
-install(TARGETS polarssl
+install(TARGETS polarssl polarssl-static
DESTINATION ${LIB_INSTALL_DIR}
--git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index 34fbe29..edda9bf 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
-POLARSSL_SITE = http://polarssl.org/code/releases/
-POLARSSL_VERSION = 1.1.4
+POLARSSL_SITE = https://polarssl.org/download
+POLARSSL_VERSION = 1.2.0
POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
POLARSSL_CONF_OPT = \
-DUSE_SHARED_POLARSSL_LIBRARY=ON \
@@ -8,6 +8,8 @@ POLARSSL_CONF_OPT = \
-DBUILD_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
POLARSSL_INSTALL_STAGING = YES
+POLARSSL_LICENSE = GPLv2
+POLARSSL_LICENSE_FILES = LICENSE
$(eval $(cmake-package))
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH] collectd: bump to version 5.1.1
From: Gustavo Zacarias @ 2012-11-17 16:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/collectd/collectd.mk | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 6164df2..f6aeb0d 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -4,10 +4,12 @@
#
#############################################################
-COLLECTD_VERSION = 5.1.0
+COLLECTD_VERSION = 5.1.1
COLLECTD_SITE = http://collectd.org/files
COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+COLLECTD_LICENSE = GPLv2 LGPLv2.1
+COLLECTD_LICENSE_FILES = COPYING
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
--
1.7.8.6
^ permalink raw reply related
* [Buildroot] [PATCH v4] Allow to run severals post build scripts instead of only one
From: Peter Korsgaard @ 2012-11-17 16:24 UTC (permalink / raw)
To: buildroot
In-Reply-To: <30186_1353153693_50A77C9C_30186_8127_1_1353153682-31020-1-git-send-email-philippe.reynes@sagemcom.com>
>>>>> "Philippe" == Philippe Reynes <philippe.reynes@sagemcom.com> writes:
Philippe> Using severals post build scripts is usefull to share
Philippe> script between severals boards/projects.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] Allow to run severals post build scripts instead of only one
From: Peter Korsgaard @ 2012-11-17 16:23 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=dbf4978e6b1b24973cb7fbf9be636dda3ae67862
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Using severals post build scripts is usefull to share
script between severals boards/projects.
[Peter: fix trailing spaces in Config.in]
Signed-off-by: Philippe Reynes <philippe.reynes@sagemcom.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile | 5 +++--
system/Config.in | 11 ++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 3e7d520..7602499 100644
--- a/Makefile
+++ b/Makefile
@@ -470,8 +470,9 @@ endif
) > $(TARGET_DIR)/etc/os-release
ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
- @$(call MESSAGE,"Executing post-build script")
- $(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
+ @$(call MESSAGE,"Executing post-build script\(s\)")
+ @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
+ $(s) $(TARGET_DIR)$(sep))
endif
ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
diff --git a/system/Config.in b/system/Config.in
index 10c9d9d..5823210 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -170,15 +170,16 @@ config BR2_ROOTFS_POST_BUILD_SCRIPT
string "Custom script to run before creating filesystem images"
default ""
help
- Specify a script to be run after the build has finished and before
- Buildroot starts packing the files into selected filesystem images.
+ Specify a space-separated list of scripts to be run after the build
+ has finished and before Buildroot starts packing the files into
+ selected filesystem images.
This gives users the oportunity to do board-specific cleanups,
add-ons and the like, so the generated files can be used directly
without further processing.
- The script is called with the target directory name as first and
- only argument. Make sure the exit code of that script is 0,
- otherwise make will stop after calling it.
+ These scripts are called with the target directory name as first and
+ only argument. Make sure the exit code of those scripts are 0,
+ otherwise make will stop after calling them.
endmenu
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox