Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #614 from micmac1/rpte-symvers

Browse source 
rtpengine: fix Module.symvers handling
This commit is contained in:
micmac1 2021-02-26 19:18:49 +01:00 committed by GitHub
commit 62328778d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/rtpengine/Makefile
View file

@ -10,13 +10,13 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=rtpengine PKG_NAME:=rtpengine
PKG_VERSION:=8.5.3.2 PKG_VERSION:=8.5.3.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-mr$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-mr$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/mr$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/mr$(PKG_VERSION)?
PKG_HASH:=7f463f1f23067d7f69c334e04710348ce95cd637c340724b3042d44083ccba07 PKG_HASH:=7f463f1f23067d7f69c334e04710348ce95cd637c340724b3042d44083ccba07
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-mr$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-mr$(PKG_VERSION)
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -31,6 +31,10 @@ PKG_BUILD_PARALLEL:=0
PKG_BUILD_DEPENDS:=gperf/host PKG_BUILD_DEPENDS:=gperf/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)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -239,10 +243,10 @@ define Build/Compile
ifneq ($(CONFIG_PACKAGE_kmod-ipt-rtpengine),) ifneq ($(CONFIG_PACKAGE_kmod-ipt-rtpengine),)
RTPENGINE_VERSION=$(PKG_VERSION) $(MAKE) \ RTPENGINE_VERSION=$(PKG_VERSION) $(MAKE) \
$(PKG_JOBS) \
-C $(PKG_BUILD_DIR)/kernel-module \ -C $(PKG_BUILD_DIR)/kernel-module \
KSRC=$(LINUX_DIR) \ KSRC=$(LINUX_DIR) \
ARCH=$(LINUX_KARCH) \ $(KERNEL_MAKE_FLAGS)
CROSS_COMPILE=$(TARGET_CROSS)
endif endif
ifneq ($(CONFIG_PACKAGE_iptables-mod-rtpengine),) ifneq ($(CONFIG_PACKAGE_iptables-mod-rtpengine),)
@ -262,8 +266,10 @@ endef
define Build/InstallDev define Build/InstallDev
endef 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,iptables-mod-rtpengine))
$(eval $(call BuildPackage,rtpengine)) $(eval $(call BuildPackage,rtpengine))
$(eval $(call BuildPackage,rtpengine-recording)) $(eval $(call BuildPackage,rtpengine-recording))