summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-07-21 04:43:07 +0700
committerGitHub <noreply@github.com>2018-07-21 04:43:07 +0700
commit34f4d01d447c300e9dce824f822eae4b9cdbd705 (patch)
tree660b2853e7c13aaac45b66f96269d08d678fa1d3
parentd53c4d50e1722a3b5857bd437f5f996b6b9b557f (diff)
parentdc13bec450f18aa5341d92e1358135c9b1e1a7ac (diff)
downloadvyos-1x-34f4d01d447c300e9dce824f822eae4b9cdbd705.tar.gz
vyos-1x-34f4d01d447c300e9dce824f822eae4b9cdbd705.zip
Merge pull request #22 from hagbard-01/current
Only look for XML files in interface and op template definitions
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 50710af47..7447275ca 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ OP_TMPL_DIR := templates-op
interface_definitions:
mkdir -p $(TMPL_DIR)
- find $(CURDIR)/interface-definitions/ -type f | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1
+ find $(CURDIR)/interface-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1
# XXX: delete top level node.def's that now live in other packages
rm -f $(TMPL_DIR)/system/node.def
@@ -20,7 +20,7 @@ interface_definitions:
op_mode_definitions:
mkdir -p $(OP_TMPL_DIR)
- find $(CURDIR)/op-mode-definitions/ -type f | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1
+ find $(CURDIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1
# XXX: delete top level op mode node.def's that now live in other packages
rm -f $(OP_TMPL_DIR)/show/node.def