summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2026-09-22 13:11:14 -0500
committerJohn Estabrook <jestabro@vyos.io>2026-09-23 11:49:32 -0500
commit51ad0fe1ffaee509d042d780422c3da96b65bfdd (patch)
treec1b008f63b16154973aff46fbe96ab4c623c81ce
parent0476f58f8ddf16708e3fdaa476abd96e836a0381 (diff)
downloadvyos-1x-51ad0fe1ffaee509d042d780422c3da96b65bfdd.tar.gz
vyos-1x-51ad0fe1ffaee509d042d780422c3da96b65bfdd.zip
T9341: exclude paths when generating XML caches
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9cd2a21f5..5f8ea4022 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,6 @@ interface_definitions: libvyosconfig $(config_xml_obj)
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 --internal-cache $(DATA_DIR)/reftree.cache || 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
@@ -48,6 +46,11 @@ interface_definitions: libvyosconfig $(config_xml_obj)
# T2773 - EIGRP support for VRF
rm -rf $(TMPL_DIR)/vrf/name/node.tag/protocols/eigrp
+ # Pass excluded paths in format above for ease of comparison, as they
+ # will be converted by script.
+ $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions --internal-cache $(DATA_DIR)/reftree.cache \
+ --exclude-paths '/vpn/ipsec/remote-access/radius/source-address' '/protocols/eigrp' '/vrf/name/node.tag/protocols/eigrp' || exit 1
+
# XXX: test if there are empty node.def files - this is not allowed as these
# could mask help strings or mandatory priority statements
find $(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'