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

Merge pull request #312 from micmac1/baresip2-fix-package-names

Browse source 
baresip: remove underscores from package names
This commit is contained in:
Jiri Slachta 2018-04-14 07:49:19 +02:00 committed by GitHub
commit 187aa78b80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/baresip/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=baresip PKG_NAME:=baresip
PKG_VERSION:=0.5.8 PKG_VERSION:=0.5.8
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
@ -46,7 +46,7 @@ baresip-mods:= \
v4l2 v4l2
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(baresip-mods)) \ $(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(subst _,-,$(baresip-mods)))
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -94,7 +94,7 @@ baresip-mod-v4l2 := USE_V4L2
BARESIP_MOD_OPTIONS:= \ BARESIP_MOD_OPTIONS:= \
MOD_AUTODETECT= \ MOD_AUTODETECT= \
EXTRA_MODULES="dtmfio" \ EXTRA_MODULES="dtmfio" \
$(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1)) $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(subst _,-,$(m))),1))
MAKE_FLAGS+= \ MAKE_FLAGS+= \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
@ -163,13 +163,13 @@ endef
define BuildPlugin define BuildPlugin
define Package/baresip-mod-$(1) define Package/baresip-mod-$(subst _,-,$(1))
$$(call Package/baresip/Default) $$(call Package/baresip/Default)
TITLE:=$(2) TITLE:=$(2)
DEPENDS:=baresip $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(1):%,$(4)) DEPENDS:=baresip $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(subst _,-,$(1)):%,$(4))
endef endef
define Package/baresip-mod-$(1)/install define Package/baresip-mod-$(subst _,-,$(1))/install
[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules
for f in $(3); do \ for f in $(3); do \
$(INSTALL_DATA) \ $(INSTALL_DATA) \
@ -178,7 +178,7 @@ define BuildPlugin
done done
endef endef
$$(eval $$(call BuildPackage,baresip-mod-$(1))) $$(eval $$(call BuildPackage,baresip-mod-$(subst _,-,$(1))))
endef endef
$(eval $(call BuildPackage,baresip)) $(eval $(call BuildPackage,baresip))