* [Buildroot] [PATCH 2/6] ubus: bump version
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
@ 2017-03-24 12:49 ` Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 3/6] libuci: " Rahul Jain
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Rahul Jain @ 2017-03-24 12:49 UTC (permalink / raw)
To: buildroot
rebase 0001-Install-server-and-client-examples patch
on latest version.
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
.../ubus/0001-Install-server-and-client-examples.patch | 15 ++++++++++-----
package/ubus/ubus.hash | 2 +-
package/ubus/ubus.mk | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/package/ubus/0001-Install-server-and-client-examples.patch b/package/ubus/0001-Install-server-and-client-examples.patch
index 0ee4d3e..5c985d8 100644
--- a/package/ubus/0001-Install-server-and-client-examples.patch
+++ b/package/ubus/0001-Install-server-and-client-examples.patch
@@ -1,23 +1,28 @@
-Install server and client examples
+From aa4aea68a9d2a38fabb5ae8e5a0d05dfd7bcf907 Mon Sep 17 00:00:00 2001
+From: Rahul Jain <Rahul.Jain@imgtec.com>
+Date: Fri, 24 Mar 2017 18:03:24 +0530
+Subject: [PATCH] Install server and client examples
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
+[Rahul Jain: rebase the patch on latest version]
---
examples/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 0279f6e66b50..2f8f4e026e20 100644
+index 81f9997..38f153f 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -9,4 +9,8 @@ IF (BUILD_EXAMPLES)
ADD_EXECUTABLE(client client.c count.c)
- TARGET_LINK_LIBRARIES(client ubus ubox)
+ TARGET_LINK_LIBRARIES(client ubus ${ubox_library})
+
+ INSTALL(TARGETS server client
-+ RUNTIME DESTINATION sbin
++ RUNTIME DESTINATION sbin
+ )
ENDIF()
--
-1.9.1
+2.6.2
diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash
index 4e6a755..0829734 100644
--- a/package/ubus/ubus.hash
+++ b/package/ubus/ubus.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 0dbf75c2103f3f567b9bf1bb719ea9776d18401bbf2dfd8bed2c2ebbdd1021da ubus-259450f414d8c9ee41896e8e6d6bc57ec00e2b63.tar.gz
+sha256 93ef2612853641ca8d16d07527115c72ed03f8eaa1c727a01b069a4e814247c0 ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692.tar.gz
diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk
index cd66b86..08c9ce2 100644
--- a/package/ubus/ubus.mk
+++ b/package/ubus/ubus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UBUS_VERSION = 259450f414d8c9ee41896e8e6d6bc57ec00e2b63
+UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692
UBUS_SITE = git://git.openwrt.org/project/ubus.git
UBUS_LICENSE = LGPLv2.1
--
2.6.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 3/6] libuci: bump version
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 2/6] ubus: " Rahul Jain
@ 2017-03-24 12:49 ` Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 4/6] uhttpd: " Rahul Jain
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Rahul Jain @ 2017-03-24 12:49 UTC (permalink / raw)
To: buildroot
Change upstream location
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/libuci/libuci.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
index 6647045..9161be9 100644
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBUCI_VERSION = e339407372ffc70b1451e4eda218c01aa95a6a7f
-LIBUCI_SITE = git://nbd.name/uci.git
+LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d
+LIBUCI_SITE = git://git.openwrt.org/project/uci.git
LIBUCI_LICENSE = LGPLv2.1, GPLv2 (tools)
LIBUCI_INSTALL_STAGING = YES
LIBUCI_DEPENDENCIES = libubox
--
2.6.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 4/6] uhttpd: bump version
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 2/6] ubus: " Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 3/6] libuci: " Rahul Jain
@ 2017-03-24 12:49 ` Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 5/6] ustream-ssl: " Rahul Jain
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Rahul Jain @ 2017-03-24 12:49 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/uhttpd/uhttpd.hash | 2 +-
package/uhttpd/uhttpd.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash
index bfeb557..7e09f18 100644
--- a/package/uhttpd/uhttpd.hash
+++ b/package/uhttpd/uhttpd.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 b01aec584daaa367b85eddd950da27e3a41bcb265507cf42f79ff2ebcf0972d4 uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz
+sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz
diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
index be0d7d6..cc7649d 100644
--- a/package/uhttpd/uhttpd.mk
+++ b/package/uhttpd/uhttpd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
+UHTTPD_VERSION = a8bf9c00842224edb394e79909053f7628ee6a82
UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git
UHTTPD_SITE_METHOD = git
UHTTPD_LICENSE = ISC
--
2.6.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 5/6] ustream-ssl: bump version
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
` (2 preceding siblings ...)
2017-03-24 12:49 ` [Buildroot] [PATCH 4/6] uhttpd: " Rahul Jain
@ 2017-03-24 12:49 ` Rahul Jain
2017-03-24 12:49 ` [Buildroot] [PATCH 6/6] libubox: enable static build Rahul Jain
2017-03-25 14:15 ` [Buildroot] [PATCH 1/6] libubox: bump version Thomas Petazzoni
5 siblings, 0 replies; 10+ messages in thread
From: Rahul Jain @ 2017-03-24 12:49 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/ustream-ssl/ustream-ssl.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk
index b83d129..9b10788 100644
--- a/package/ustream-ssl/ustream-ssl.mk
+++ b/package/ustream-ssl/ustream-ssl.mk
@@ -4,7 +4,7 @@
#
################################################################################
-USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6
+USTREAM_SSL_VERSION = 45ac93088bc6f2d8ef3b0512d8e1ddfd9c4ee9e5
USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git
USTREAM_SSL_LICENSE = ISC
USTREAM_SSL_LICENSE_FILES = ustream-ssl.h
--
2.6.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 6/6] libubox: enable static build
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
` (3 preceding siblings ...)
2017-03-24 12:49 ` [Buildroot] [PATCH 5/6] ustream-ssl: " Rahul Jain
@ 2017-03-24 12:49 ` Rahul Jain
2017-03-24 13:07 ` Arnout Vandecappelle
2017-03-25 14:15 ` [Buildroot] [PATCH 1/6] libubox: bump version Thomas Petazzoni
5 siblings, 1 reply; 10+ messages in thread
From: Rahul Jain @ 2017-03-24 12:49 UTC (permalink / raw)
To: buildroot
upstream has added the support to build the static libraries.
update comment for BR2_STATIC_LIBS for other packages having
dependency on libubox.
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/libubox/Config.in | 4 ----
package/ubus/Config.in | 2 +-
package/ustream-ssl/Config.in | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/package/libubox/Config.in b/package/libubox/Config.in
index 25ef4bb..ba10f8d 100644
--- a/package/libubox/Config.in
+++ b/package/libubox/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBUBOX
bool "libubox"
- depends on !BR2_STATIC_LIBS
help
This library originates from the OpenWrt project to
handle the configuration file infrastructure, but can
@@ -8,6 +7,3 @@ config BR2_PACKAGE_LIBUBOX
than OpenWrt.
http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary
-
-comment "libubox needs a toolchain w/ dynamic library"
- depends on BR2_STATIC_LIBS
diff --git a/package/ubus/Config.in b/package/ubus/Config.in
index c14f6a8..84e13f8 100644
--- a/package/ubus/Config.in
+++ b/package/ubus/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_UBUS
select BR2_PACKAGE_LIBUBOX
select BR2_PACKAGE_JSON_C
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
- depends on !BR2_STATIC_LIBS # libubox
+ depends on !BR2_STATIC_LIBS
help
IPC/RPC bus that allows communication between processes.
diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in
index 540e436..a12c37b 100644
--- a/package/ustream-ssl/Config.in
+++ b/package/ustream-ssl/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_USTREAM_SSL
bool "ustream-ssl"
- depends on !BR2_STATIC_LIBS #libubox
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBUBOX
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
help
--
2.6.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 6/6] libubox: enable static build
2017-03-24 12:49 ` [Buildroot] [PATCH 6/6] libubox: enable static build Rahul Jain
@ 2017-03-24 13:07 ` Arnout Vandecappelle
2017-03-29 10:38 ` Rahul Jain
0 siblings, 1 reply; 10+ messages in thread
From: Arnout Vandecappelle @ 2017-03-24 13:07 UTC (permalink / raw)
To: buildroot
On 24-03-17 13:49, Rahul Jain wrote:
> upstream has added the support to build the static libraries.
> update comment for BR2_STATIC_LIBS for other packages having
> dependency on libubox.
The reason why that comment is there, is so we remember that when libubox is
allowed to be built statically, we should check if ubus and ustream-ssl perhaps
now also can be built statically. So, did you check that? If yes, you should
update the comment as to why they can't be build statically (e.g. "dlopen()",
see other Config.in files).
Regards,
Arnout
>
> Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
> ---
> package/libubox/Config.in | 4 ----
> package/ubus/Config.in | 2 +-
> package/ustream-ssl/Config.in | 2 +-
> 3 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/package/libubox/Config.in b/package/libubox/Config.in
> index 25ef4bb..ba10f8d 100644
> --- a/package/libubox/Config.in
> +++ b/package/libubox/Config.in
> @@ -1,6 +1,5 @@
> config BR2_PACKAGE_LIBUBOX
> bool "libubox"
> - depends on !BR2_STATIC_LIBS
> help
> This library originates from the OpenWrt project to
> handle the configuration file infrastructure, but can
> @@ -8,6 +7,3 @@ config BR2_PACKAGE_LIBUBOX
> than OpenWrt.
>
> http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary
> -
> -comment "libubox needs a toolchain w/ dynamic library"
> - depends on BR2_STATIC_LIBS
> diff --git a/package/ubus/Config.in b/package/ubus/Config.in
> index c14f6a8..84e13f8 100644
> --- a/package/ubus/Config.in
> +++ b/package/ubus/Config.in
> @@ -7,7 +7,7 @@ config BR2_PACKAGE_UBUS
> select BR2_PACKAGE_LIBUBOX
> select BR2_PACKAGE_JSON_C
> depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
> - depends on !BR2_STATIC_LIBS # libubox
> + depends on !BR2_STATIC_LIBS
> help
> IPC/RPC bus that allows communication between processes.
>
> diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in
> index 540e436..a12c37b 100644
> --- a/package/ustream-ssl/Config.in
> +++ b/package/ustream-ssl/Config.in
> @@ -1,6 +1,6 @@
> config BR2_PACKAGE_USTREAM_SSL
> bool "ustream-ssl"
> - depends on !BR2_STATIC_LIBS #libubox
> + depends on !BR2_STATIC_LIBS
> select BR2_PACKAGE_LIBUBOX
> select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
> help
>
--
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 6/6] libubox: enable static build
2017-03-24 13:07 ` Arnout Vandecappelle
@ 2017-03-29 10:38 ` Rahul Jain
2017-03-29 12:38 ` Arnout Vandecappelle
0 siblings, 1 reply; 10+ messages in thread
From: Rahul Jain @ 2017-03-29 10:38 UTC (permalink / raw)
To: buildroot
Hi Arnout,
Thanks for your comments.
On Friday 24 March 2017 06:37 PM, Arnout Vandecappelle wrote:
>
>
> On 24-03-17 13:49, Rahul Jain wrote:
>> upstream has added the support to build the static libraries.
>> update comment for BR2_STATIC_LIBS for other packages having
>> dependency on libubox.
>
> The reason why that comment is there, is so we remember that when libubox is
> allowed to be built statically, we should check if ubus and ustream-ssl perhaps
> now also can be built statically. So, did you check that? If yes, you should
> update the comment as to why they can't be build statically (e.g. "dlopen()",
> see other Config.in files).
I have checked package cmake files and found out that there is no
support for building static libraries in ubus and ustream-ssl packages.
I will add a comment '#no support to build static libraries in config file'.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 6/6] libubox: enable static build
2017-03-29 10:38 ` Rahul Jain
@ 2017-03-29 12:38 ` Arnout Vandecappelle
0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2017-03-29 12:38 UTC (permalink / raw)
To: buildroot
On 29-03-17 12:38, Rahul Jain wrote:
> Hi Arnout,
>
> Thanks for your comments.
>
> On Friday 24 March 2017 06:37 PM, Arnout Vandecappelle wrote:
>>
>>
>> On 24-03-17 13:49, Rahul Jain wrote:
>>> upstream has added the support to build the static libraries.
>>> update comment for BR2_STATIC_LIBS for other packages having
>>> dependency on libubox.
>>
>> The reason why that comment is there, is so we remember that when libubox is
>> allowed to be built statically, we should check if ubus and ustream-ssl perhaps
>> now also can be built statically. So, did you check that? If yes, you should
>> update the comment as to why they can't be build statically (e.g. "dlopen()",
>> see other Config.in files).
>
> I have checked package cmake files and found out that there is no support for
> building static libraries in ubus and ustream-ssl packages.
If nothing specific is done in the CMakeLists.txt, it *will* support building
static libraries. Only if some custom commands are used instead of
TARGET_LINK_LIBRARIES it needs special treatment.
The best way to be sure is just to test it: start from
http://autobuild.buildroot.net/toolchains/configs/br-arm-full-static.config
enable BR2_STATIC_LIBS, remove the dependency on !BR2_STATIC_LIBS, and build it.
Regards,
Arnout
> I will add a comment '#no support to build static libraries in config file'.
--
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: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/6] libubox: bump version
2017-03-24 12:49 [Buildroot] [PATCH 1/6] libubox: bump version Rahul Jain
` (4 preceding siblings ...)
2017-03-24 12:49 ` [Buildroot] [PATCH 6/6] libubox: enable static build Rahul Jain
@ 2017-03-25 14:15 ` Thomas Petazzoni
5 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2017-03-25 14:15 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 24 Mar 2017 18:19:50 +0530, Rahul Jain wrote:
> Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
> ---
> package/libubox/libubox.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Patches 1 to 5 applied, thanks!
I've marked patch 6 as "Changes Requested" in our patch tracking
system, since you got some comments from Arnout that need to be
addressed. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread