Repository : ssh://git@diktynna/batman-adv

On branch : master

commit c6928918808ece0423022ce657fc1fe4c2d98c3e Author: Sven Eckelmann sven@narfation.org Date: Tue Jun 2 08:35:08 2020 +0200

batman-adv: Use alphabetical order for external build config options

The lists in README.external.rst, gen-compat-autoconf.sh and Makefile were ordered differently. This makes comparing and editing them unnecessary hard and errorprone.

Avoid this by using alphabetical ordering for all of them.

Signed-off-by: Sven Eckelmann sven@narfation.org

c6928918808ece0423022ce657fc1fe4c2d98c3e Makefile | 16 ++++++++-------- README.external.rst | 6 +++--- gen-compat-autoconf.sh | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile index 448a14d6..b518db1f 100644 --- a/Makefile +++ b/Makefile @@ -4,24 +4,24 @@ # Marek Lindner, Simon Wunderlich

# read README.external for more information about the configuration -# batman-adv DebugFS entries: -export CONFIG_BATMAN_ADV_DEBUGFS=n -# B.A.T.M.A.N. debugging: -export CONFIG_BATMAN_ADV_DEBUG=n +# B.A.T.M.A.N. V routing algorithm (experimental): +export CONFIG_BATMAN_ADV_BATMAN_V=y # B.A.T.M.A.N. bridge loop avoidance: export CONFIG_BATMAN_ADV_BLA=y # B.A.T.M.A.N. distributed ARP table: export CONFIG_BATMAN_ADV_DAT=y -# B.A.T.M.A.N network coding (catwoman): -export CONFIG_BATMAN_ADV_NC=n +# B.A.T.M.A.N. debugging: +export CONFIG_BATMAN_ADV_DEBUG=n +# batman-adv DebugFS entries: +export CONFIG_BATMAN_ADV_DEBUGFS=n # B.A.T.M.A.N. multicast optimizations: export CONFIG_BATMAN_ADV_MCAST=y +# B.A.T.M.A.N network coding (catwoman): +export CONFIG_BATMAN_ADV_NC=n # B.A.T.M.A.N. sysfs support: export CONFIG_BATMAN_ADV_SYSFS=n # B.A.T.M.A.N. tracing support: export CONFIG_BATMAN_ADV_TRACING=n -# B.A.T.M.A.N. V routing algorithm (experimental): -export CONFIG_BATMAN_ADV_BATMAN_V=y

PWD:=$(shell pwd) KERNELPATH ?= /lib/modules/$(shell uname -r)/build diff --git a/README.external.rst b/README.external.rst index 1d4bf16a..d8465aa8 100644 --- a/README.external.rst +++ b/README.external.rst @@ -43,15 +43,15 @@ option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are (default marked with an "*")

- * ``CONFIG_BATMAN_ADV_DEBUGFS=[y|n*]`` (B.A.T.M.A.N. debugfs entries) - * ``CONFIG_BATMAN_ADV_DEBUG=[y|n*]`` (B.A.T.M.A.N. debugging) + * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm) * ``CONFIG_BATMAN_ADV_BLA=[y*|n]`` (B.A.T.M.A.N. bridge loop avoidance) * ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table) + * ``CONFIG_BATMAN_ADV_DEBUG=[y|n*]`` (B.A.T.M.A.N. debugging) + * ``CONFIG_BATMAN_ADV_DEBUGFS=[y|n*]`` (B.A.T.M.A.N. debugfs entries) * ``CONFIG_BATMAN_ADV_MCAST=[y*|n]`` (B.A.T.M.A.N. multicast optimizations) * ``CONFIG_BATMAN_ADV_NC=[y|n*]`` (B.A.T.M.A.N. Network Coding) * ``CONFIG_BATMAN_ADV_SYSFS=[y|n*]`` (B.A.T.M.A.N. sysfs support) * ``CONFIG_BATMAN_ADV_TRACING=[y|n*]`` (B.A.T.M.A.N. tracing support) - * ``CONFIG_BATMAN_ADV_BATMAN_V=[y*|n]`` (B.A.T.M.A.N. V routing algorithm)

e.g., debugging can be enabled by::

diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 90482433..0f95d140 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -40,15 +40,15 @@ gen_config() { }

# write config variables -gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="n"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_MCAST' ${CONFIG_BATMAN_ADV_MCAST:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_NC' ${CONFIG_BATMAN_ADV_NC:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_SYSFS' ${CONFIG_BATMAN_ADV_SYSFS:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_TRACING' ${CONFIG_BATMAN_ADV_TRACING:="n"} >> "${TMP}" -gen_config 'CONFIG_BATMAN_ADV_BATMAN_V' ${CONFIG_BATMAN_ADV_BATMAN_V:="y"} >> "${TMP}"

# only regenerate compat-autoconf.h when config was changed diff "${TMP}" "${TARGET}" > /dev/null 2>&1 || cp "${TMP}" "${TARGET}"