projects
/
feed
/
telephony.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtpengine: update libwebsockets dependency
[feed/telephony.git]
/
net
/
rtpengine
/
Makefile
diff --git
a/net/rtpengine/Makefile
b/net/rtpengine/Makefile
index 1b84d79b177b26d34c2b593e435deaf891c257cf..fdd396c3d87c390895c12ad0dae358a2e82ade14 100644
(file)
--- a/
net/rtpengine/Makefile
+++ b/
net/rtpengine/Makefile
@@
-9,12
+9,14
@@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=rtpengine
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=rtpengine
-PKG_VERSION:=
mr8.5.1.2
-PKG_RELEASE:=
1
+PKG_VERSION:=
10.5.2.6
+PKG_RELEASE:=
3
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=ffc85d736ee58c4f74374ebc336fd14e43031be7bbd6acff27447cc25aff9558
+PKG_SOURCE:=$(PKG_NAME)-mr$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/mr$(PKG_VERSION)?
+PKG_HASH:=6f6d5cc2ebf27b6361ed2bd2f86a0ca74103503fd1a14af69ed423dba8340bc4
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-mr$(PKG_VERSION)
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE
@@
-27,7
+29,11
@@
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
# errors.
PKG_BUILD_PARALLEL:=0
# errors.
PKG_BUILD_PARALLEL:=0
-PKG_BUILD_DEPENDS:=gperf/host
+PKG_BUILD_DEPENDS:=gperf/host perl/host
+
+# With below variable set, $(PKG_SYMVERS_DIR)/rtpengine.symvers gets generated
+# from kernel-module/Module.symvers.
+PKG_EXTMOD_SUBDIRS:=kernel-module
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@@
-39,9
+45,11
@@
ENGINE_DEPENDS := \
+libevent2-pthreads \
+libhiredis \
+libip4tc \
+libevent2-pthreads \
+libhiredis \
+libip4tc \
+ +libmosquitto \
+libopenssl \
+libpcap \
+libpcre \
+libopenssl \
+libpcap \
+libpcre \
+ +libwebsockets-openssl \
+xmlrpc-c-client \
+zlib
+xmlrpc-c-client \
+zlib
@@
-50,15
+58,18
@@
ENGINE_DEPENDS_TRANSCODING := \
+bcg729 \
+libffmpeg-full \
+libmariadb \
+bcg729 \
+libffmpeg-full \
+libmariadb \
- +libspandsp
+ +libspandsp
3
RECORDING_DEPENDS := \
RECORDING_DEPENDS := \
+ +bcg729 \
+glib2 \
+libffmpeg-full \
+libmariadb \
+libopenssl
+glib2 \
+libffmpeg-full \
+libmariadb \
+libopenssl
-RTPENGINE_USERID:=$(PKG_NAME)=378:$(PKG_NAME)=378
+RTPENGINE_USERID:=378
+RTPENGINE_GROUPID:=$(RTPENGINE_USERID)
+RTPENGINE_USER:=$(PKG_NAME)=$(RTPENGINE_USERID):$(PKG_NAME)=$(RTPENGINE_GROUPID)
define Package/rtpengine/Default
URL:=https://github.com/sipwise/rtpengine
define Package/rtpengine/Default
URL:=https://github.com/sipwise/rtpengine
@@
-70,7
+81,7
@@
$(call Package/rtpengine/Default)
CATEGORY:=Network
SECTION:=net
SUBMENU:=Telephony
CATEGORY:=Network
SECTION:=net
SUBMENU:=Telephony
- USERID:=$(RTPENGINE_USER
ID
)
+ USERID:=$(RTPENGINE_USER)
endef
define Package/rtpengine/description/Template
endef
define Package/rtpengine/description/Template
@@
-112,7
+123,7
@@
define Package/rtpengine/install
$(INSTALL_CONF) ./files/rtpengine.conf $(1)/etc/config/rtpengine
$(INSTALL_DIR) $(1)/etc/rtpengine
$(INSTALL_CONF) ./files/rtpengine.conf $(1)/etc/config/rtpengine
$(INSTALL_DIR) $(1)/etc/rtpengine
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/rtpengine.
sample.
conf \
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/rtpengine.conf \
$(1)/etc/rtpengine/rtpengine.conf
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
$(1)/etc/rtpengine/rtpengine.conf
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
@@
-149,7
+160,7
@@
$(call Package/rtpengine/Default)
CATEGORY:=Network
SECTION:=net
SUBMENU:=Telephony
CATEGORY:=Network
SECTION:=net
SUBMENU:=Telephony
- USERID:=$(RTPENGINE_USER
ID
)
+ USERID:=$(RTPENGINE_USER)
DEPENDS:=$(patsubst +%,+PACKAGE_rtpengine-recording:%,$(RECORDING_DEPENDS))
endef
DEPENDS:=$(patsubst +%,+PACKAGE_rtpengine-recording:%,$(RECORDING_DEPENDS))
endef
@@
-173,7
+184,7
@@
define Package/rtpengine-recording/install
$(1)/etc/config/rtpengine-recording
$(INSTALL_DIR) $(1)/etc/rtpengine
$(1)/etc/config/rtpengine-recording
$(INSTALL_DIR) $(1)/etc/rtpengine
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/rtpengine-recording.
sample.
conf \
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/rtpengine-recording.conf \
$(1)/etc/rtpengine/rtpengine-recording.conf
endef
$(1)/etc/rtpengine/rtpengine-recording.conf
endef
@@
-200,11
+211,17
@@
$(call Package/rtpengine/Default)
FILES:=$(PKG_BUILD_DIR)/kernel-module/xt_RTPENGINE.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoProbe,xt_RTPENGINE)
DEPENDS := \
FILES:=$(PKG_BUILD_DIR)/kernel-module/xt_RTPENGINE.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoProbe,xt_RTPENGINE)
DEPENDS := \
+ +PACKAGE_kmod-ipt-rtpengine:kmod-crypto-aead \
+PACKAGE_kmod-ipt-rtpengine:kmod-crypto-hash \
+PACKAGE_kmod-ipt-rtpengine:kmod-ipt-core
MODPARAMS.xt_RTPENGINE := \
+PACKAGE_kmod-ipt-rtpengine:kmod-crypto-hash \
+PACKAGE_kmod-ipt-rtpengine:kmod-ipt-core
MODPARAMS.xt_RTPENGINE := \
- proc_uid=$(PKG_NAME) \
- proc_gid=$(PKG_NAME)
+ proc_uid=$(RTPENGINE_USERID) \
+ proc_gid=$(RTPENGINE_GROUPID)
+ USERID:=$(RTPENGINE_USER)
+endef
+
+define KernelPackage/ipt-rtpengine/conffiles
+/etc/modules.d/ipt-rtpengine
endef
define KernelPackage/ipt-rtpengine/description
endef
define KernelPackage/ipt-rtpengine/description
@@
-226,7
+243,9
@@
ifeq ($(QUILT),)
cd "$(PKG_BUILD_DIR)" && \
$(FIND) . -maxdepth 2 -name "*Makefile" | \
xargs -I{} $(SED) \
cd "$(PKG_BUILD_DIR)" && \
$(FIND) . -maxdepth 2 -name "*Makefile" | \
xargs -I{} $(SED) \
- '/shell which dpkg-/s/dpkg/OpenWrt-has-no-dpkg/' {}
+ '/shell which dpkg-/s/dpkg/OpenWrt-has-no-dpkg/' {} && \
+ $(SED) 's|#!/usr/bin/perl|#!$(STAGING_DIR_HOSTPKG)/usr/bin/perl|' \
+ utils/const_str_hash
endif
endef
endif
endef
@@
-237,10
+256,10
@@
define Build/Compile
ifneq ($(CONFIG_PACKAGE_kmod-ipt-rtpengine),)
RTPENGINE_VERSION=$(PKG_VERSION) $(MAKE) \
ifneq ($(CONFIG_PACKAGE_kmod-ipt-rtpengine),)
RTPENGINE_VERSION=$(PKG_VERSION) $(MAKE) \
+ $(PKG_JOBS) \
-C $(PKG_BUILD_DIR)/kernel-module \
KSRC=$(LINUX_DIR) \
-C $(PKG_BUILD_DIR)/kernel-module \
KSRC=$(LINUX_DIR) \
- ARCH=$(LINUX_KARCH) \
- CROSS_COMPILE=$(TARGET_CROSS)
+ $(KERNEL_MAKE_FLAGS)
endif
ifneq ($(CONFIG_PACKAGE_iptables-mod-rtpengine),)
endif
ifneq ($(CONFIG_PACKAGE_iptables-mod-rtpengine),)
@@
-260,8
+279,10
@@
endef
define Build/InstallDev
endef
define Build/InstallDev
endef
-$(eval $(call BuildPackage,rtpengine-no-transcode))
+# KernelPackage calls need to go first, otherwise hooks like
+# collect_module_symvers won't get added.
$(eval $(call KernelPackage,ipt-rtpengine))
$(eval $(call KernelPackage,ipt-rtpengine))
+$(eval $(call BuildPackage,rtpengine-no-transcode))
$(eval $(call BuildPackage,iptables-mod-rtpengine))
$(eval $(call BuildPackage,rtpengine))
$(eval $(call BuildPackage,rtpengine-recording))
$(eval $(call BuildPackage,iptables-mod-rtpengine))
$(eval $(call BuildPackage,rtpengine))
$(eval $(call BuildPackage,rtpengine-recording))