* [Buildroot] [PATCH 1/4] ustream-ssl: new package
@ 2016-09-16 9:16 Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 2/4] libubox: bump version Rahul Jain
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Rahul Jain @ 2016-09-16 9:16 UTC (permalink / raw)
To: buildroot
ustream-ssl has support for polarssl and cyassl
but since polarssl is made obsolete by mbedtls and cyassl
is not present in buildroot, we have not added support for it.
Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
Signed-off-by: Rahul Bedarkar <Rahul.Bedarkar@imgtec.com>
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/Config.in | 1 +
package/ustream-ssl/Config.in | 12 ++++++++++++
package/ustream-ssl/ustream-ssl.mk | 20 ++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 100644 package/ustream-ssl/Config.in
create mode 100644 package/ustream-ssl/ustream-ssl.mk
diff --git a/package/Config.in b/package/Config.in
index 2b5a4d1..6437f35 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -893,6 +893,7 @@ menu "Crypto"
source "package/polarssl/Config.in"
source "package/tinydtls/Config.in"
source "package/trousers/Config.in"
+ source "package/ustream-ssl/Config.in"
endmenu
menu "Database"
diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in
new file mode 100644
index 0000000..540e436
--- /dev/null
+++ b/package/ustream-ssl/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_USTREAM_SSL
+ bool "ustream-ssl"
+ depends on !BR2_STATIC_LIBS #libubox
+ select BR2_PACKAGE_LIBUBOX
+ select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
+ help
+ ustream SSL wrapper
+
+ https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary
+
+comment "ustream-ssl needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk
new file mode 100644
index 0000000..d8f8aed
--- /dev/null
+++ b/package/ustream-ssl/ustream-ssl.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# ustream-ssl
+#
+################################################################################
+
+USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6
+USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git
+USTREAM_SSL_LICENSE = ISC
+USTREAM_SSL_INSTALL_STAGING = YES
+USTREAM_SSL_DEPENDENCIES = libubox
+
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+USTREAM_SSL_DEPENDENCIES += mbedtls
+USTREAM_SSL_CONF_OPTS += -DMBEDTLS=ON
+else
+USTREAM_SSL_DEPENDENCIES += openssl
+endif
+
+$(eval $(cmake-package))
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/4] libubox: bump version
2016-09-16 9:16 [Buildroot] [PATCH 1/4] ustream-ssl: new package Rahul Jain
@ 2016-09-16 9:16 ` Rahul Jain
2016-09-16 16:38 ` Thomas Petazzoni
2016-09-16 9:16 ` [Buildroot] [PATCH 3/4] libubox: update legal info Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 4/4] uhttpd: new package Rahul Jain
2 siblings, 1 reply; 8+ messages in thread
From: Rahul Jain @ 2016-09-16 9:16 UTC (permalink / raw)
To: buildroot
Reviewed-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/libubox/libubox.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk
index 4c56951..67451fe 100644
--- a/package/libubox/libubox.mk
+++ b/package/libubox/libubox.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUBOX_VERSION = e88d816d6e462180f0337565e04e36be58a63309
+LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5
LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git
LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT
LIBUBOX_INSTALL_STAGING = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] libubox: update legal info
2016-09-16 9:16 [Buildroot] [PATCH 1/4] ustream-ssl: new package Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 2/4] libubox: bump version Rahul Jain
@ 2016-09-16 9:16 ` Rahul Jain
2016-09-16 16:39 ` Thomas Petazzoni
2016-09-16 9:16 ` [Buildroot] [PATCH 4/4] uhttpd: new package Rahul Jain
2 siblings, 1 reply; 8+ messages in thread
From: Rahul Jain @ 2016-09-16 9:16 UTC (permalink / raw)
To: buildroot
From: Rahul Jain <rahul.jain@imgtec.com>
Reviewed-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
Signed-off-by: Rahul Jain <rahul.jain@imgtec.com>
---
package/libubox/libubox.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk
index 67451fe..00392c3 100644
--- a/package/libubox/libubox.mk
+++ b/package/libubox/libubox.mk
@@ -6,7 +6,7 @@
LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5
LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git
-LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT
+LIBUBOX_LICENSE = ISC, BSD-3c
LIBUBOX_INSTALL_STAGING = YES
LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] uhttpd: new package
2016-09-16 9:16 [Buildroot] [PATCH 1/4] ustream-ssl: new package Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 2/4] libubox: bump version Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 3/4] libubox: update legal info Rahul Jain
@ 2016-09-16 9:16 ` Rahul Jain
2016-09-16 21:13 ` Arnout Vandecappelle
2 siblings, 1 reply; 8+ messages in thread
From: Rahul Jain @ 2016-09-16 9:16 UTC (permalink / raw)
To: buildroot
Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
Signed-off-by: Rahul Bedarkar <Rahul.Bedarkar@imgtec.com>
Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>
Signed-off-by: Abhishek Singh <Abhishek.Singh@imgtec.com>
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
package/Config.in | 1 +
package/uhttpd/Config.in | 18 ++++++++++++++++++
package/uhttpd/uhttpd.mk | 32 ++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+)
create mode 100644 package/uhttpd/Config.in
create mode 100644 package/uhttpd/uhttpd.mk
diff --git a/package/Config.in b/package/Config.in
index 6437f35..43a8c8b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1596,6 +1596,7 @@ endif
source "package/tunctl/Config.in"
source "package/tvheadend/Config.in"
source "package/udpcast/Config.in"
+ source "package/uhttpd/Config.in"
source "package/ulogd/Config.in"
source "package/ushare/Config.in"
source "package/ussp-push/Config.in"
diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
new file mode 100644
index 0000000..ec105ee
--- /dev/null
+++ b/package/uhttpd/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_UHTTPD
+ bool "uhttpd"
+ depends on !BR2_STATIC_LIBS # dlopen()
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+ depends on BR2_USE_MMU # fork()
+ select BR2_PACKAGE_LIBUBOX
+ select BR2_PACKAGE_JSON_C
+ help
+ uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
+ support. It is intended as a drop-in replacement for the Busybox
+ HTTP daemon.
+
+ https://git.openwrt.org/?p=project/uhttpd.git;a=summary
+
+comment "uhttpd needs a toolchain w/ dynamic library"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_USE_MMU
+ depends on BR2_STATIC_LIBS
diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
new file mode 100644
index 0000000..d336ff1
--- /dev/null
+++ b/package/uhttpd/uhttpd.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# uhttpd
+#
+################################################################################
+
+UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
+UHTTPD_SITE = git://git.openwrt.org/project/uhttpd.git
+UHTTPD_LICENSE = ISC
+UHTTPD_DEPENDENCIES = libubox json-c
+
+ifeq ($(BR2_PACKAGE_LUA_5_1),y)
+UHTTPD_DEPENDENCIES += lua
+UHTTPD_CONF_OPTS += -DLUAPATH=/usr/lib/lua/$(LUAINTERPRETER_ABIVER) \
+ -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
+else
+UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_USTREAM_SSL),y)
+UHTTPD_DEPENDENCIES += ustream-ssl
+else
+UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_UBUS),y)
+UHTTPD_DEPENDENCIES += ubus
+else
+UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF
+endif
+
+$(eval $(cmake-package))
--
2.6.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/4] libubox: bump version
2016-09-16 9:16 ` [Buildroot] [PATCH 2/4] libubox: bump version Rahul Jain
@ 2016-09-16 16:38 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2016-09-16 16:38 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 16 Sep 2016 14:46:25 +0530, Rahul Jain wrote:
> Reviewed-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
> Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
> ---
> package/libubox/libubox.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] libubox: update legal info
2016-09-16 9:16 ` [Buildroot] [PATCH 3/4] libubox: update legal info Rahul Jain
@ 2016-09-16 16:39 ` Thomas Petazzoni
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2016-09-16 16:39 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 16 Sep 2016 14:46:26 +0530, Rahul Jain wrote:
> From: Rahul Jain <rahul.jain@imgtec.com>
>
> Reviewed-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> Reviewed-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
> Signed-off-by: Rahul Jain <rahul.jain@imgtec.com>
> ---
> package/libubox/libubox.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] uhttpd: new package
2016-09-16 9:16 ` [Buildroot] [PATCH 4/4] uhttpd: new package Rahul Jain
@ 2016-09-16 21:13 ` Arnout Vandecappelle
2016-09-23 6:08 ` Rahul Jain
0 siblings, 1 reply; 8+ messages in thread
From: Arnout Vandecappelle @ 2016-09-16 21:13 UTC (permalink / raw)
To: buildroot
Hi Rahul,
Just a few small remarks, otherwise looks good.
On 16-09-16 11:16, Rahul Jain wrote:
[snip]
> diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
> new file mode 100644
> index 0000000..ec105ee
> --- /dev/null
> +++ b/package/uhttpd/Config.in
> @@ -0,0 +1,18 @@
> +config BR2_PACKAGE_UHTTPD
> + bool "uhttpd"
> + depends on !BR2_STATIC_LIBS # dlopen()
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
> + depends on BR2_USE_MMU # fork()
It's incredible that a tiny HTTP server has all these arch dependencies :-)
> + select BR2_PACKAGE_LIBUBOX
> + select BR2_PACKAGE_JSON_C
> + help
> + uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
> + support. It is intended as a drop-in replacement for the Busybox
> + HTTP daemon.
> +
> + https://git.openwrt.org/?p=project/uhttpd.git;a=summary
Perhaps this is a slightly more useful URL:
https://wiki.openwrt.org/doc/howto/http.uhttpd
> +
> +comment "uhttpd needs a toolchain w/ dynamic library"
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + depends on BR2_USE_MMU
> + depends on BR2_STATIC_LIBS
> diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
> new file mode 100644
> index 0000000..d336ff1
> --- /dev/null
> +++ b/package/uhttpd/uhttpd.mk
> @@ -0,0 +1,32 @@
> +################################################################################
> +#
> +# uhttpd
> +#
> +################################################################################
> +
> +UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
> +UHTTPD_SITE = git://git.openwrt.org/project/uhttpd.git
We prefer http URLs, they have a better chance of passing company firewalls.
Also, please add a hash file.
> +UHTTPD_LICENSE = ISC
> +UHTTPD_DEPENDENCIES = libubox json-c
> +
> +ifeq ($(BR2_PACKAGE_LUA_5_1),y)
Does it work with luajit as well? We don't do it anywhere else at the moment,
but perhaps a condition like
ifeq ($(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION),"5.1")
would be fitting.
> +UHTTPD_DEPENDENCIES += lua
> +UHTTPD_CONF_OPTS += -DLUAPATH=/usr/lib/lua/$(LUAINTERPRETER_ABIVER) \
I don't see LUAPATH used anywhere?
I would add an explicit -DLUA_SUPPORT=ON
> + -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
Is this really needed? It looks like CMakeLists will discover this itself with
its home-grown variant of pkg_check_modules. And you don't specify LUA_LIBS so
it will use pkg-config for that anyway.
> +else
> +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_USTREAM_SSL),y)
> +UHTTPD_DEPENDENCIES += ustream-ssl
Explicit -DTLS_SUPPORT=ON
> +else
> +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_UBUS),y)
> +UHTTPD_DEPENDENCIES += ubus
Same here.
Regards,
Arnout
> +else
> +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF
> +endif
> +
> +$(eval $(cmake-package))
>
--
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] 8+ messages in thread
* [Buildroot] [PATCH 4/4] uhttpd: new package
2016-09-16 21:13 ` Arnout Vandecappelle
@ 2016-09-23 6:08 ` Rahul Jain
0 siblings, 0 replies; 8+ messages in thread
From: Rahul Jain @ 2016-09-23 6:08 UTC (permalink / raw)
To: buildroot
Hi Arnout,
Thanks for your review comments.
> Does it work with luajit as well?
yes
I have fixed review comments in following patch
http://patchwork.ozlabs.org/patch/673249/
Thanks,
Rahul Jain
On Saturday 17 September 2016 02:43 AM, Arnout Vandecappelle wrote:
> Hi Rahul,
>
> Just a few small remarks, otherwise looks good.
>
> On 16-09-16 11:16, Rahul Jain wrote:
> [snip]
>> diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
>> new file mode 100644
>> index 0000000..ec105ee
>> --- /dev/null
>> +++ b/package/uhttpd/Config.in
>> @@ -0,0 +1,18 @@
>> +config BR2_PACKAGE_UHTTPD
>> + bool "uhttpd"
>> + depends on !BR2_STATIC_LIBS # dlopen()
>> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
>> + depends on BR2_USE_MMU # fork()
>
> It's incredible that a tiny HTTP server has all these arch dependencies :-)
>
>> + select BR2_PACKAGE_LIBUBOX
>> + select BR2_PACKAGE_JSON_C
>> + help
>> + uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
>> + support. It is intended as a drop-in replacement for the Busybox
>> + HTTP daemon.
>> +
>> + https://git.openwrt.org/?p=project/uhttpd.git;a=summary
>
> Perhaps this is a slightly more useful URL:
>
> https://wiki.openwrt.org/doc/howto/http.uhttpd
>
>> +
>> +comment "uhttpd needs a toolchain w/ dynamic library"
>> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
>> + depends on BR2_USE_MMU
>> + depends on BR2_STATIC_LIBS
>> diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
>> new file mode 100644
>> index 0000000..d336ff1
>> --- /dev/null
>> +++ b/package/uhttpd/uhttpd.mk
>> @@ -0,0 +1,32 @@
>> +################################################################################
>> +#
>> +# uhttpd
>> +#
>> +################################################################################
>> +
>> +UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
>> +UHTTPD_SITE = git://git.openwrt.org/project/uhttpd.git
>
> We prefer http URLs, they have a better chance of passing company firewalls.
>
> Also, please add a hash file.
>
>> +UHTTPD_LICENSE = ISC
>> +UHTTPD_DEPENDENCIES = libubox json-c
>> +
>> +ifeq ($(BR2_PACKAGE_LUA_5_1),y)
>
> Does it work with luajit as well? We don't do it anywhere else at the moment,
> but perhaps a condition like
>
> ifeq ($(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION),"5.1")
>
> would be fitting.
>
>> +UHTTPD_DEPENDENCIES += lua
>> +UHTTPD_CONF_OPTS += -DLUAPATH=/usr/lib/lua/$(LUAINTERPRETER_ABIVER) \
>
> I don't see LUAPATH used anywhere?
>
> I would add an explicit -DLUA_SUPPORT=ON
>
>> + -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
>
> Is this really needed? It looks like CMakeLists will discover this itself with
> its home-grown variant of pkg_check_modules. And you don't specify LUA_LIBS so
> it will use pkg-config for that anyway.
>
>> +else
>> +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF
>> +endif
>> +
>> +ifeq ($(BR2_PACKAGE_USTREAM_SSL),y)
>> +UHTTPD_DEPENDENCIES += ustream-ssl
>
> Explicit -DTLS_SUPPORT=ON
>
>> +else
>> +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF
>> +endif
>> +
>> +ifeq ($(BR2_PACKAGE_UBUS),y)
>> +UHTTPD_DEPENDENCIES += ubus
>
> Same here.
>
> Regards,
> Arnout
>
>> +else
>> +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF
>> +endif
>> +
>> +$(eval $(cmake-package))
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-09-23 6:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-16 9:16 [Buildroot] [PATCH 1/4] ustream-ssl: new package Rahul Jain
2016-09-16 9:16 ` [Buildroot] [PATCH 2/4] libubox: bump version Rahul Jain
2016-09-16 16:38 ` Thomas Petazzoni
2016-09-16 9:16 ` [Buildroot] [PATCH 3/4] libubox: update legal info Rahul Jain
2016-09-16 16:39 ` Thomas Petazzoni
2016-09-16 9:16 ` [Buildroot] [PATCH 4/4] uhttpd: new package Rahul Jain
2016-09-16 21:13 ` Arnout Vandecappelle
2016-09-23 6:08 ` Rahul Jain
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.