summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-01 13:54:40 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-01 13:54:40 -0500
commitdc7ca08e68a7504cfb256770ff55a424b7e9b9b5 (patch)
tree73d705d946f65b078738da5cb114d34b5188a259
parent1429fe3750258cbbd947c065d92b867c785d461f (diff)
downloadvyos-1x-dc7ca08e68a7504cfb256770ff55a424b7e9b9b5.tar.gz
vyos-1x-dc7ca08e68a7504cfb256770ff55a424b7e9b9b5.zip
xml: T5403: drop unnecessary copy of xml_cache
-rw-r--r--.gitignore1
-rw-r--r--Makefile5
-rwxr-xr-xdebian/rules3
3 files changed, 1 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index d781beead..7707e94ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,7 +109,6 @@ ENV/
templates-cfg/*
templates-op/*
tests/templates/*
-xml_cache/*
# Debian packaging
debian/files
diff --git a/Makefile b/Makefile
index 6dfa516e1..fe17ce994 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ OP_TMPL_DIR := templates-op
BUILD_DIR := build
DATA_DIR := data
SHIM_DIR := src/shim
-CACHE_DIR := xml_cache
LIBS := -lzmq
CFLAGS :=
BUILD_ARCH := $(shell dpkg-architecture -q DEB_BUILD_ARCH)
@@ -24,11 +23,10 @@ op_xml_obj = $(op_xml_src:.xml.in=.xml)
.ONESHELL:
interface_definitions: $(config_xml_obj)
mkdir -p $(TMPL_DIR)
- mkdir -p $(CACHE_DIR)
$(CURDIR)/scripts/override-default $(BUILD_DIR)/interface-definitions
- $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions --package-name vyos-1x --output-path $(CACHE_DIR)
+ $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions
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
@@ -98,7 +96,6 @@ clean:
rm -rf $(BUILD_DIR)
rm -rf $(TMPL_DIR)
rm -rf $(OP_TMPL_DIR)
- rm -rf $(CACHE_DIR)
$(MAKE) -C $(SHIM_DIR) clean
.PHONY: test
diff --git a/debian/rules b/debian/rules
index 39185f1e6..9ada2bf87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates
VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates
VYOS_MIBS_DIR := usr/share/snmp/mibs
VYOS_LOCALUI_DIR := srv/localui
-VYOS_XML_CACHE_DIR := python/vyos/xml_ref/pkg_cache
MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate
SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system
@@ -36,8 +35,6 @@ override_dh_auto_install:
# convert the XML to dictionaries
env PYTHONPATH=python python3 python/vyos/xml/generate.py
- cp xml_cache/vyos_1x_cache.py python/vyos/xml_ref/pkg_cache
-
cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
# Install scripts