summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-12 19:00:50 +0200
committerGitHub <noreply@github.com>2023-10-12 19:00:50 +0200
commitbf0ade04be9fcb1bade3624758603f6043d914cc (patch)
treed6ee792483fa5061af758fb3c4500a0548b63695
parente65117532b486253e6417c4e0e047a04de767dc3 (diff)
parent126a67ade9cd045e0ff60b0b9eb9b5680e8a29d0 (diff)
downloadvyos-1x-bf0ade04be9fcb1bade3624758603f6043d914cc.tar.gz
vyos-1x-bf0ade04be9fcb1bade3624758603f6043d914cc.zip
Merge pull request #2358 from jestabro/schema-check
xml: T5649: catch errors from schema validation before generating cache
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 97f4de6c7..1a08d1680 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ interface_definitions: $(config_xml_obj)
$(CURDIR)/scripts/override-default $(BUILD_DIR)/interface-definitions
- $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions || exit 1
-
find $(BUILD_DIR)/interface-definitions -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1
+ $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions || exit 1
+
# XXX: delete top level node.def's that now live in other packages
# IPSec VPN EAP-RADIUS does not support source-address
rm -rf $(TMPL_DIR)/vpn/ipsec/remote-access/radius/source-address