summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-22 20:51:55 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-23 09:51:36 +0200
commitef882e25667540bea8e1165e5907f58382f7fc0a (patch)
treef4a2895c22b56f46b8bc0a64be557ac0799dc4e6 /Makefile
parent7c172523d632bc2b0683aa9000fb25b682453e74 (diff)
downloadvyos-1x-ef882e25667540bea8e1165e5907f58382f7fc0a.tar.gz
vyos-1x-ef882e25667540bea8e1165e5907f58382f7fc0a.zip
Makefile: T3165: do not allow empty node.def files for op-mode commands
Commit 99440fc0 ("Makefile: fix logic to detect empty "node.def" files") disabled the detection of empty node.def files for op-mode commands. The generation of a duplicate and thus empty node.def file is not prohibited by commit 17b5ac14 ("T3165: op-mode: prevent override of populated node.def file with empty content") and thus the check is re-enabled! (cherry picked from commit e99cdf40c72dec8b9019eca728aaad0f82c6030b)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3e6489c4b..65f0cfdf7 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,10 @@ op_mode_definitions: $(op_xml_obj)
# options are provided from the script itself
ln -s ../node.tag $(OP_TMPL_DIR)/ping/node.tag/node.tag/
+ # XXX: test if there are empty node.def files - this is not allowed as these
+ # could mask help strings or mandatory priority statements
+ find $(OP_TMPL_DIR) -name node.def -type f -empty -exec false {} + || sh -c 'echo "There are empty node.def files! Check your interface definitions." && exit 1'
+
.PHONY: vyshim
vyshim:
$(MAKE) -C $(SHIM_DIR)