nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 2019-07-27 07:40:29 +02:00
parent 5ae567dbdd
commit d05c93517c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-mesh-batman-adv/Makefile
View File

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