Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions libs/libprom/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#
# Copyright (C) 2010-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

include $(TOPDIR)/rules.mk

PKG_NAME:=libprom
PKG_VERSION:=0.1.3
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/digitalocean/prometheus-client-c.git
PKG_MIRROR_HASH:=e3c5d90dff57fca810abd46e65b46ac1205f7049d4022d8244180b68c43b4320

PKG_MAINTAINER:=Vladimir Ermakov <vooon341@gmail.com>
PKG_LICENSE:=Apache-2.0

PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1

CMAKE_INSTALL:=1
CMAKE_SOURCE_SUBDIR:=prom

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

define Package/libprom
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Prometheus instrumentation library for C
URL:=https://github.com/digitalocean/prometheus-client-c
endef

define Package/libprom/description
This project provides shared libraries for instrumenting software via Prometheus.
endef

define Package/libprom/install
$(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprom.so* $(1)/usr/lib/
endef

$(eval $(call BuildPackage,libprom))
22 changes: 16 additions & 6 deletions net/coturn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=coturn
PKG_VERSION:=4.6.2
PKG_VERSION:=4.7.0
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/coturn/coturn
PKG_MIRROR_HASH:=55a7d63edfde6548cd6d6f1b62f6997beeebc66e0ff07b0afd175829434cbf3a
PKG_MIRROR_HASH:=d98e18fe023fc4fc21386e837e0b57540d805f1ca519d88d2c31081015f7c9ab

PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
PKG_LICENSE:=BSD-COTURN-CITRIX COMBINED-CITRIX-VIVOCHA-BSD MIT-HASH
Expand All @@ -26,7 +26,8 @@ PKG_CONFIG_DEPENDS+= \
CONFIG_COTURN_ENABLE_MYSQL \
CONFIG_COTURN_ENABLE_POSTGRESQL \
CONFIG_COTURN_ENABLE_REDIS \
CONFIG_COTURN_ENABLE_SQLITE
CONFIG_COTURN_ENABLE_SQLITE \
CONFIG_COTURN_ENABLE_PROMETHEUS

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
Expand All @@ -47,7 +48,10 @@ define Package/coturn
+COTURN_ENABLE_MYSQL:libmariadb \
+COTURN_ENABLE_POSTGRESQL:libpq \
+COTURN_ENABLE_REDIS:libhiredis \
+COTURN_ENABLE_SQLITE:libsqlite3
+COTURN_ENABLE_SQLITE:libsqlite3 \
+COTURN_ENABLE_PROMETHEUS:libprom \
+COTURN_ENABLE_PROMETHEUS:libmicrohttpd \
+COTURN_ENABLE_PROMETHEUS:libatomic
FILE_MODES:=/etc/turnserver:turnserver:turnserver:0750
endef

Expand Down Expand Up @@ -86,6 +90,12 @@ define Package/coturn/config
help
Enable Redis support

config COTURN_ENABLE_PROMETHEUS
bool "Prometheus support"
default n
help
Enable Prometheus exporter

endmenu
endef

Expand Down Expand Up @@ -127,14 +137,14 @@ CONFIGURE_ARGS+= \
CONFIGURE_VARS+= \
ARCHIVERCMD="$(TARGET_AR) -r" \
LIBEV_OK=1 \
TURN_NO_PROMETHEUS=1 \
TURN_NO_SCTP=1 \
TURN_NO_SYSTEMD=1 \
TURN_NO_MONGO=1 \
$(if $(CONFIG_COTURN_ENABLE_MYSQL),,TURN_NO_MYSQL=1) \
$(if $(CONFIG_COTURN_ENABLE_POSTGRESQL),,TURN_NO_PQ=1) \
$(if $(CONFIG_COTURN_ENABLE_REDIS),,TURN_NO_HIREDIS=1) \
$(if $(CONFIG_COTURN_ENABLE_SQLITE),,TURN_NO_SQLITE=1)
$(if $(CONFIG_COTURN_ENABLE_SQLITE),,TURN_NO_SQLITE=1) \
$(if $(CONFIG_COTURN_ENABLE_PROMETHEUS),,TURN_NO_PROMETHEUS=1)

define Build/InstallDev
endef
Expand Down
2 changes: 1 addition & 1 deletion net/coturn/files/turnserver.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ config turnserver 'general'
option enabled '0'
option log_stderr '0'
option log_stdout '0'
option options '--pidfile /var/run/turnserver.pid --log-file syslog --no-cli --proc-user turnserver --proc-group turnserver'
option options '-c /etc/turnserver.conf --pidfile /var/run/turnserver.pid --log-file syslog --no-cli --proc-user turnserver --proc-group turnserver'
2 changes: 1 addition & 1 deletion net/coturn/patches/01-includes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
-LIBEVENT_INCLUDE = -I${PREFIX}/include/ -I/usr/local/include/
+LIBEVENT_INCLUDE =

INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE}
INCFLAGS = -Isrc -Isrc/apps/common -Isrc/server -Isrc/client -Isrc/client++ ${LIBEVENT_INCLUDE}

2 changes: 1 addition & 1 deletion net/coturn/patches/02-fix-flags-dupes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -1049,9 +1049,9 @@ ${ECHO_CMD} "# Generated by configure sc
@@ -1046,9 +1046,9 @@ ${ECHO_CMD} "# Generated by configure sc
${ECHO_CMD} "#################################" >> Makefile
${ECHO_CMD} "ECHO_CMD = ${ECHO_CMD}" >> Makefile
${ECHO_CMD} "CC = ${CC}" >> Makefile
Expand Down