From 348faac87a359fb7fcec91befd56f19b01956eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Tue, 27 Nov 2018 04:21:10 +0100 Subject: [PATCH] gluon-mesh-batman-adv-14: remove CONFLICTs line with v15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- package/gluon-mesh-batman-adv/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index 4b158f5a..b80f8634 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -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