From 64bac337c78faf11694db9d238bed1c7953f661b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 8 Aug 2014 16:06:37 +0200 Subject: [PATCH] docs: gluon-mesh-batman-adv split --- docs/releases/v2014.4.rst | 2 ++ docs/site-example/site.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/releases/v2014.4.rst b/docs/releases/v2014.4.rst index 8339b9de..5471d419 100644 --- a/docs/releases/v2014.4.rst +++ b/docs/releases/v2014.4.rst @@ -23,6 +23,7 @@ Site changes - Obsolete packages: + ``gluon-config-mode`` + + ``gluon-mesh-batman-adv`` - Recommended new packages: @@ -31,6 +32,7 @@ Site changes + ``gluon-config-mode-mesh-vpn`` + ``gluon-config-mode-geo-location`` + ``gluon-config-mode-contact-info`` + + ``gluon-mesh-batman-adv-14`` or ``gluon-mesh-batman-adv-15`` (specify this before all other packages in the list) Internals ~~~~~~~~~ diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index bbdf0b25..f7304337 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -2,8 +2,10 @@ ## GLUON_SITE_PACKAGES # specify gluon/openwrt packages to include here +# The gluon-mesh-batman-adv-* package must come first because of the dependency resolution GLUON_SITE_PACKAGES := \ + gluon-mesh-batman-adv-15 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ @@ -18,7 +20,6 @@ GLUON_SITE_PACKAGES := \ gluon-luci-autoupdater \ gluon-luci-portconfig \ gluon-next-node \ - gluon-mesh-batman-adv \ gluon-mesh-vpn-fastd \ gluon-radvd \ gluon-status-page \