Merge pull request #311 from micmac1/asterisk-fix-package-names

Asterisk: fix package names
This commit is contained in:
Jiri Slachta 2018-04-14 07:48:06 +02:00 committed by GitHub
commit bf8164ad0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions

View file

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.19.2 PKG_VERSION:=13.19.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
@ -54,7 +54,7 @@ MODULES_AVAILABLE:= \
app-controlplayback \ app-controlplayback \
app-dahdiras \ app-dahdiras \
app-dictate \ app-dictate \
app-directed_pickup \ app-directed-pickup \
app-directory \ app-directory \
app-disa \ app-disa \
app-dumpchan \ app-dumpchan \
@ -310,7 +310,7 @@ AST_ENABLE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(UTILS_AVAILABLE)) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(subst _,-,$(UTILS_AVAILABLE))) \
CONFIG_ASTERISK13_LOW_MEMORY CONFIG_ASTERISK13_LOW_MEMORY
include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/uclibc++.mk
@ -380,29 +380,29 @@ $(foreach b,$(8),$(call Package/asterisk13/install/sbin,$$(1),$(b));)
endef endef
define BuildAsterisk13Util define BuildAsterisk13Util
define Package/asterisk13-util-$(1) define Package/asterisk13-util-$(subst _,-,$(1))
$$(call Package/asterisk13/Default) $$(call Package/asterisk13/Default)
TITLE:=$(1) utility TITLE:=$(1) utility
DEPENDS:=asterisk13 $(patsubst +%,+PACKAGE_asterisk13-util-$(1):%,$(3)) DEPENDS:=asterisk13 $(patsubst +%,+PACKAGE_asterisk13-util-$(subst _,-,$(1)):%,$(3))
ifneq ($$(CONFIG_PACKAGE_asterisk13-util-$(1)),) ifneq ($$(CONFIG_PACKAGE_asterisk13-util-$(subst _,-,$(1))),)
AST_ENABLE+=$(1) AST_ENABLE+=$(1)
endif endif
endef endef
define Package/asterisk13-util-$(1)/conffiles define Package/asterisk13-util-$(subst _,-,$(1))/conffiles
$(subst $(space),$(newline),$(foreach c,$(4),/etc/$(c))) $(subst $(space),$(newline),$(foreach c,$(4),/etc/$(c)))
endef endef
define Package/asterisk13-util-$(1)/description define Package/asterisk13-util-$(subst _,-,$(1))/description
$(2) $(2)
endef endef
define Package/asterisk13-util-$(1)/install define Package/asterisk13-util-$(subst _,-,$(1))/install
$(call Package/asterisk13/install/sbin,$$(1),$(1)) $(call Package/asterisk13/install/sbin,$$(1),$(1))
$(foreach c,$(4),$(call Package/asterisk13/install/util-conffile,$$(1),$(c));) $(foreach c,$(4),$(call Package/asterisk13/install/util-conffile,$$(1),$(c));)
endef endef
$$(eval $$(call BuildPackage,asterisk13-util-$(1))) $$(eval $$(call BuildPackage,asterisk13-util-$(subst _,-,$(1))))
endef endef
define Package/asterisk13/Default define Package/asterisk13/Default
@ -740,7 +740,7 @@ $(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge fo
$(eval $(call BuildAsterisk13Module,app-controlplayback,Control playback,trivial application to control playback of a sound file,,,app_controlplayback,,)) $(eval $(call BuildAsterisk13Module,app-controlplayback,Control playback,trivial application to control playback of a sound file,,,app_controlplayback,,))
$(eval $(call BuildAsterisk13Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk13-chan-dahdi,,app_dahdiras,,)) $(eval $(call BuildAsterisk13Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk13-chan-dahdi,,app_dahdiras,,))
$(eval $(call BuildAsterisk13Module,app-dictate,Virtual dictation machine,virtual dictation machine application,,,app_dictate,,)) $(eval $(call BuildAsterisk13Module,app-dictate,Virtual dictation machine,virtual dictation machine application,,,app_dictate,,))
$(eval $(call BuildAsterisk13Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk13Module,app-directed-pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,))
$(eval $(call BuildAsterisk13Module,app-directory,Extension directory,provide a directory of extensions,,,app_directory,,)) $(eval $(call BuildAsterisk13Module,app-directory,Extension directory,provide a directory of extensions,,,app_directory,,))
$(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,))
$(eval $(call BuildAsterisk13Module,app-dumpchan,Dump info about channel,application to dump channel variables,,,app_dumpchan,,)) $(eval $(call BuildAsterisk13Module,app-dumpchan,Dump info about channel,application to dump channel variables,,,app_dumpchan,,))

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk15 PKG_NAME:=asterisk15
PKG_VERSION:=15.2.2 PKG_VERSION:=15.2.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
@ -53,7 +53,7 @@ MODULES_AVAILABLE:= \
app-controlplayback \ app-controlplayback \
app-dahdiras \ app-dahdiras \
app-dictate \ app-dictate \
app-directed_pickup \ app-directed-pickup \
app-directory \ app-directory \
app-disa \ app-disa \
app-dumpchan \ app-dumpchan \
@ -316,7 +316,7 @@ AST_ENABLE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-%,$(MODULES_AVAILABLE)) \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(UTILS_AVAILABLE)) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(subst _,-,$(UTILS_AVAILABLE))) \
CONFIG_ASTERISK15_LOW_MEMORY CONFIG_ASTERISK15_LOW_MEMORY
include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/uclibc++.mk
@ -386,29 +386,29 @@ $(foreach b,$(8),$(call Package/asterisk15/install/sbin,$$(1),$(b));)
endef endef
define BuildAsterisk15Util define BuildAsterisk15Util
define Package/asterisk15-util-$(1) define Package/asterisk15-util-$(subst _,-,$(1))
$$(call Package/asterisk15/Default) $$(call Package/asterisk15/Default)
TITLE:=$(1) utility TITLE:=$(1) utility
DEPENDS:=asterisk15 $(patsubst +%,+PACKAGE_asterisk15-util-$(1):%,$(3)) DEPENDS:=asterisk15 $(patsubst +%,+PACKAGE_asterisk15-util-$(subst _,-,$(1)):%,$(3))
ifneq ($$(CONFIG_PACKAGE_asterisk15-util-$(1)),) ifneq ($$(CONFIG_PACKAGE_asterisk15-util-$(subst _,-,$(1))),)
AST_ENABLE+=$(1) AST_ENABLE+=$(1)
endif endif
endef endef
define Package/asterisk15-util-$(1)/conffiles define Package/asterisk15-util-$(subst _,-,$(1))/conffiles
$(subst $(space),$(newline),$(foreach c,$(4),/etc/$(c))) $(subst $(space),$(newline),$(foreach c,$(4),/etc/$(c)))
endef endef
define Package/asterisk15-util-$(1)/description define Package/asterisk15-util-$(subst _,-,$(1))/description
$(2) $(2)
endef endef
define Package/asterisk15-util-$(1)/install define Package/asterisk15-util-$(subst _,-,$(1))/install
$(call Package/asterisk15/install/sbin,$$(1),$(1)) $(call Package/asterisk15/install/sbin,$$(1),$(1))
$(foreach c,$(4),$(call Package/asterisk15/install/util-conffile,$$(1),$(c));) $(foreach c,$(4),$(call Package/asterisk15/install/util-conffile,$$(1),$(c));)
endef endef
$$(eval $$(call BuildPackage,asterisk15-util-$(1))) $$(eval $$(call BuildPackage,asterisk15-util-$(subst _,-,$(1))))
endef endef
define Package/asterisk15/Default define Package/asterisk15/Default
@ -756,7 +756,7 @@ $(eval $(call BuildAsterisk15Module,app-confbridge,ConfBridge,Software bridge fo
$(eval $(call BuildAsterisk15Module,app-controlplayback,Control playback,trivial application to control playback of a sound file,,,app_controlplayback,,)) $(eval $(call BuildAsterisk15Module,app-controlplayback,Control playback,trivial application to control playback of a sound file,,,app_controlplayback,,))
$(eval $(call BuildAsterisk15Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk15-chan-dahdi,,app_dahdiras,,)) $(eval $(call BuildAsterisk15Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk15-chan-dahdi,,app_dahdiras,,))
$(eval $(call BuildAsterisk15Module,app-dictate,Virtual dictation machine,virtual dictation machine application,,,app_dictate,,)) $(eval $(call BuildAsterisk15Module,app-dictate,Virtual dictation machine,virtual dictation machine application,,,app_dictate,,))
$(eval $(call BuildAsterisk15Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk15Module,app-directed-pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,))
$(eval $(call BuildAsterisk15Module,app-directory,Extension directory,provide a directory of extensions,,,app_directory,,)) $(eval $(call BuildAsterisk15Module,app-directory,Extension directory,provide a directory of extensions,,,app_directory,,))
$(eval $(call BuildAsterisk15Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk15Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,))
$(eval $(call BuildAsterisk15Module,app-dumpchan,Dump info about channel,application to dump channel variables,,,app_dumpchan,,)) $(eval $(call BuildAsterisk15Module,app-dumpchan,Dump info about channel,application to dump channel variables,,,app_dumpchan,,))