From 8e04679be670a2f4fb537d38654bd937c26eea0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue> Date: Mon, 18 Feb 2019 18:34:38 +0100 Subject: [PATCH] gluon-mesh-batman-adv: add batctl dependency to gluon-mesh-batman-adv-14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The batctl v2013.4 build was removed from the batman-adv-legacy package as the current, upstream batctl releases work with batman-adv-legacy, too. As a replacement we need to add the upstream batctl dependency to gluon-mesh-batman-adv-14 to have a batctl available again here. Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> --- package/gluon-mesh-batman-adv/Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index 4b158f5a1..8841d5c41 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -7,7 +7,20 @@ include ../gluon.mk define Package/gluon-mesh-batman-adv/common PROVIDES:=gluon-mesh-batman-adv - DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C + DEPENDS:= \ + +gluon-core \ + +libgluonutil \ + +gluon-client-bridge \ + +gluon-ebtables \ + +firewall \ + +libiwinfo \ + +kmod-dummy \ + +libnl-tiny \ + +libbatadv \ + +batctl \ + +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY \ + +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 \ + +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C endef define Package/gluon-mesh-batman-adv-14 @@ -20,7 +33,7 @@ endef define Package/gluon-mesh-batman-adv-15 $(Package/gluon-mesh-batman-adv/common) TITLE:=Support for batman-adv meshing (compat level 15) - DEPENDS+=+kmod-batman-adv +batctl + DEPENDS+=+kmod-batman-adv endef define Package/gluon-mesh-batman-adv-14/install -- GitLab