gluon-mesh-batman-adv-14: remove CONFLICTs line with v15

batman-adv-legacy now uses its own namespaces. And whether to use v14 or
v15 is determined by the routing algorithm specified in the site
configuration. Which means both the batman-adv and batman-adv-legacy
kernel modules as well as the according glue code provided by
gluon-mesh-batman-adv-14 and gluon-mesh-batman-adv-15 can be installed
at the same time.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
This commit is contained in:
Linus Lüssing 2018-11-27 04:21:10 +01:00
parent 88d4c33890
commit 348faac87a

View File

@ -13,7 +13,6 @@ endef
define Package/gluon-mesh-batman-adv-14
$(Package/gluon-mesh-batman-adv/common)
TITLE:=Support for batman-adv meshing (compat level 14)
CONFLICTS:=gluon-mesh-batman-adv-15
DEPENDS+=+kmod-batman-adv-legacy
endef