* [Buildroot] [PATCH 2/7] janus-gateway: add transports section to config.
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-20 21:13 ` Thomas Petazzoni
2017-06-15 12:13 ` [Buildroot] [PATCH 3/7] janus-gatway: add websockets to transport section Adam Duskett
` (5 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
janus-gateway supports many different transports, and currently
there is no implicit way to turn them off or on. Instead, if the
dependency happens to be built, then the transport is enabled.
Create a transports section in the config file and add
BR2_PACKAGE_JANUS_REST as the first transport.
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
package/janus-gateway/Config.in | 6 ++++++
package/janus-gateway/janus-gateway.mk | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index e07b4ad..7fc213f 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -54,6 +54,12 @@ config BR2_PACKAGE_JANUS_VOICE_MAIL
bool "voice mail"
select BR2_PACKAGE_LIBOGG
+comment "transports"
+
+config BR2_PACKAGE_JANUS_REST
+ bool "REST (HTTP/HTTPS)"
+ select BR2_PACKAGE_LIBMICROHTTPD
+
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index b79e340..01021f8 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -91,6 +91,13 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-websockets
endif
+ifeq ($(BR2_PACKAGE_JANUS_REST),y)
+JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
+JANUS_GATEWAY_CONF_OPTS += --enable-rest
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rest
+endif
+
# Parallel build broken
JANUS_GATEWAY_MAKE = $(MAKE1)
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 2/7] janus-gateway: add transports section to config.
2017-06-15 12:13 ` [Buildroot] [PATCH 2/7] janus-gateway: add transports section to config Adam Duskett
@ 2017-06-20 21:13 ` Thomas Petazzoni
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2017-06-20 21:13 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 15 Jun 2017 08:13:09 -0400, Adam Duskett wrote:
> janus-gateway supports many different transports, and currently
> there is no implicit way to turn them off or on. Instead, if the
> dependency happens to be built, then the transport is enabled.
>
> Create a transports section in the config file and add
> BR2_PACKAGE_JANUS_REST as the first transport.
>
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
> package/janus-gateway/Config.in | 6 ++++++
> package/janus-gateway/janus-gateway.mk | 7 +++++++
> 2 files changed, 13 insertions(+)
I've applied patches 2 to 7. However, it would be nice to be a little
bit more careful in the patches. I had to fix a few things:
* The title had a typo in most of the commits: gatway -> gateway
* Inconsistent ending of the titles: some ending with a final dot,
some not. The latter being the preferred choice.
* You forgot to propagate the dependencies of the packages being
selected, and adding the corresponding Config.in comment.
* You forgot to use alphabetic ordering where appropriate.
All those are minor nits, but they add up, and need to be fixed before
applying the patches.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/7] janus-gatway: add websockets to transport section.
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 2/7] janus-gateway: add transports section to config Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 4/7] janus-gatway: add rabbitmq to transports section Adam Duskett
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
package/janus-gateway/Config.in | 4 ++++
package/janus-gateway/janus-gateway.mk | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 7fc213f..eaec8a1 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -60,6 +60,10 @@ config BR2_PACKAGE_JANUS_REST
bool "REST (HTTP/HTTPS)"
select BR2_PACKAGE_LIBMICROHTTPD
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+ bool "WebSockets"
+ select BR2_PACKAGE_LIBWEBSOCKETS
+
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index 01021f8..4a13199 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -84,7 +84,7 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
endif
-ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
JANUS_GATEWAY_DEPENDENCIES += libwebsockets
JANUS_GATEWAY_CONF_OPTS += --enable-websockets
else
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/7] janus-gatway: add rabbitmq to transports section
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 2/7] janus-gateway: add transports section to config Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 3/7] janus-gatway: add websockets to transport section Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 5/7] janus-gatway: add mqtt to transport section Adam Duskett
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
package/janus-gateway/Config.in | 4 ++++
package/janus-gateway/janus-gateway.mk | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index eaec8a1..3b3d148 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -64,6 +64,10 @@ config BR2_PACKAGE_JANUS_WEBSOCKETS
bool "WebSockets"
select BR2_PACKAGE_LIBWEBSOCKETS
+config BR2_PACKAGE_JANUS_RABBITMQ
+ bool "RabbitMQ"
+ select BR2_PACKAGE_RABBITMQ_C
+
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index 4a13199..6aa824e 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -24,7 +24,6 @@ JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4
JANUS_GATEWAY_CONF_OPTS = \
--disable-data-channels \
- --disable-rabbitmq \
--disable-sample-event-handler
ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
@@ -98,6 +97,13 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-rest
endif
+ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
+JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
+JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
+endif
+
# Parallel build broken
JANUS_GATEWAY_MAKE = $(MAKE1)
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 5/7] janus-gatway: add mqtt to transport section
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
` (2 preceding siblings ...)
2017-06-15 12:13 ` [Buildroot] [PATCH 4/7] janus-gatway: add rabbitmq to transports section Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 6/7] janus-gatway: add unix-sockets " Adam Duskett
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
package/janus-gateway/Config.in | 4 ++++
package/janus-gateway/janus-gateway.mk | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 3b3d148..4122708 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -68,6 +68,10 @@ config BR2_PACKAGE_JANUS_RABBITMQ
bool "RabbitMQ"
select BR2_PACKAGE_RABBITMQ_C
+config BR2_PACKAGE_JANUS_MQTT
+ bool "MQTT"
+ select BR2_PACKAGE_PAHO_MQTT_C
+
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index 6aa824e..915f812 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -104,6 +104,13 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
endif
+ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
+JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
+JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
+endif
+
# Parallel build broken
JANUS_GATEWAY_MAKE = $(MAKE1)
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 6/7] janus-gatway: add unix-sockets to transport section
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
` (3 preceding siblings ...)
2017-06-15 12:13 ` [Buildroot] [PATCH 5/7] janus-gatway: add mqtt to transport section Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-15 12:13 ` [Buildroot] [PATCH 7/7] DEVELOPERS: Add janus-gateway to Adam Duskett Adam Duskett
2017-06-15 21:34 ` [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Thomas Petazzoni
6 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
package/janus-gateway/Config.in | 3 +++
package/janus-gateway/janus-gateway.mk | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 4122708..fcc4717 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -72,6 +72,9 @@ config BR2_PACKAGE_JANUS_MQTT
bool "MQTT"
select BR2_PACKAGE_PAHO_MQTT_C
+config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+ bool "Unix Sockets"
+ default y
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index 915f812..94fc9a4 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -111,6 +111,12 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
endif
+ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
+endif
+
# Parallel build broken
JANUS_GATEWAY_MAKE = $(MAKE1)
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 7/7] DEVELOPERS: Add janus-gateway to Adam Duskett
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
` (4 preceding siblings ...)
2017-06-15 12:13 ` [Buildroot] [PATCH 6/7] janus-gatway: add unix-sockets " Adam Duskett
@ 2017-06-15 12:13 ` Adam Duskett
2017-06-15 21:34 ` [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Thomas Petazzoni
6 siblings, 0 replies; 9+ messages in thread
From: Adam Duskett @ 2017-06-15 12:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
DEVELOPERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/DEVELOPERS b/DEVELOPERS
index 9a11f8b..c99c398 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -33,6 +33,7 @@ N: Adam Duskett <aduskett@gmail.com>
F: package/audit/
F: package/checkpolicy/
F: package/gstreamer1/gst1-vaapi/
+F: package/janus-gateway/
F: package/libselinux/
F: package/libsemanage/
F: package/libsepol/
--
2.9.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3
2017-06-15 12:13 [Buildroot] [PATCH 1/7] janus-gateway: bump to version 0.2.3 Adam Duskett
` (5 preceding siblings ...)
2017-06-15 12:13 ` [Buildroot] [PATCH 7/7] DEVELOPERS: Add janus-gateway to Adam Duskett Adam Duskett
@ 2017-06-15 21:34 ` Thomas Petazzoni
6 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2017-06-15 21:34 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 15 Jun 2017 08:13:08 -0400, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
> package/janus-gateway/janus-gateway.hash | 2 +-
> package/janus-gateway/janus-gateway.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
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] 9+ messages in thread