From 8dd77211e025709bef36d4994fcf08ccc9107422 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 27 Apr 2018 21:32:52 +0200 Subject: [PATCH] asterisk-chan-lantiq: fix dep for nonshared builds Despite all previous efforts chan-lantiq is not built by the build bots. Checking the logs of a target build reveals that the chan-lantiq builds are not even attempted. During the target builds CONFIG_ALL is not set, meaning no regular package gets selected. CONFIG_ALL_NONSHARED on the other hand is set. But chan-lantiq still will not be selected, because it depends on "asterisk", meaning asterisk needs to be selected first for chan-lantiq to become available. This commit changes the asterisk depend to "+asterisk", meaning asterisk will be selected if chan-lantiq is selected. This was tested with the SDK. A seed config file was added with the following: CONFIG_ALL_NONSHARED=y Running menuselect showed that now chan-lantiq is selected automatically. This should fix the problem. The problem with "+asterisk" is that this breaks the asterisk menus for all asterisk plugins/utilities that follow chan-lantiq alphabetically. To address this put the chan-lantiq modules into their own sub menu "Telephony Lantiq". This is not nice, but the alternative would be to rename the packages to something like asterisk13-z-chan-lantiq. This would make it harder to find the packages. Maybe somebody has a better idea in the future. Signed-off-by: Sebastian Kemper --- net/asterisk-13.x-chan-lantiq/Makefile | 6 +++--- net/asterisk-15.x-chan-lantiq/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/asterisk-13.x-chan-lantiq/Makefile b/net/asterisk-13.x-chan-lantiq/Makefile index a2fc266..7776487 100644 --- a/net/asterisk-13.x-chan-lantiq/Makefile +++ b/net/asterisk-13.x-chan-lantiq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13-chan-lantiq PKG_VERSION:=20180215 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git @@ -27,12 +27,12 @@ PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SUBMENU:=Telephony + SUBMENU:=Telephony Lantiq SECTION:=net CATEGORY:=Network TITLE:=Lantiq channel driver URL:=https://github.com/kochstefan/asterisk_channel_lantiq - DEPENDS:=asterisk13 +kmod-ltq-vmmc + DEPENDS:=+asterisk13 +kmod-ltq-vmmc endef define Package/$(PKG_NAME)/description diff --git a/net/asterisk-15.x-chan-lantiq/Makefile b/net/asterisk-15.x-chan-lantiq/Makefile index 8527c4c..cef4cf7 100644 --- a/net/asterisk-15.x-chan-lantiq/Makefile +++ b/net/asterisk-15.x-chan-lantiq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk15-chan-lantiq PKG_VERSION:=20180215 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git @@ -27,12 +27,12 @@ PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SUBMENU:=Telephony + SUBMENU:=Telephony Lantiq SECTION:=net CATEGORY:=Network TITLE:=Lantiq channel driver URL:=https://github.com/kochstefan/asterisk_channel_lantiq - DEPENDS:=asterisk15 +kmod-ltq-vmmc + DEPENDS:=+asterisk15 +kmod-ltq-vmmc endef define Package/$(PKG_NAME)/description -- 2.30.2