瀏覽代碼

cannelloni: make SCTP support optional

Since version 20160414 SCTP support is optional. Introduce an automatic
optional dependency for this protocol.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Yegor Yefremov 9 年之前
父節點
當前提交
85f2e13c63
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 0 1
      package/cannelloni/Config.in
  2. 7 1
      package/cannelloni/cannelloni.mk

+ 0 - 1
package/cannelloni/Config.in

@@ -5,7 +5,6 @@ config BR2_PACKAGE_CANNELLONI
 	depends on BR2_USE_MMU # lksctp-tools
 	depends on BR2_TOOLCHAIN_HAS_THREADS # lksctp-tools
 	depends on !BR2_STATIC_LIBS # lksctp-tools
-	select BR2_PACKAGE_LKSCTP_TOOLS
 	help
 	  A SocketCAN over Ethernet tunnel. The tunnel supports both
 	  UDP and SCTP protocols.

+ 7 - 1
package/cannelloni/cannelloni.mk

@@ -8,6 +8,12 @@ CANNELLONI_VERSION = 20160414
 CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION))
 CANNELLONI_LICENSE = GPLv2
 CANNELLONI_LICENSE_FILES = gpl-2.0.txt
-CANNELLONI_DEPENDENCIES = lksctp-tools
+
+ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y)
+CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON
+CANNELLONI_DEPENDENCIES += lksctp-tools
+else
+CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=OFF
+endif
 
 $(eval $(cmake-package))