Merge branch 'current' into T5014-dnat

3 files changed, 11 insertions, 6 deletions

diff --git a/debian/control b/debian/control
index 7880bd317..772edb540 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Depends:
   libqmi-utils,
   libstrongswan-extra-plugins (>=5.9),
   libstrongswan-standard-plugins (>=5.9),
-  libvppinfra,
+  libvppinfra [amd64],
   libvyosconfig0,
   linux-cpupower,
   lldpd,
@@ -116,7 +116,6 @@ Depends:
   openvpn,
   openvpn-auth-ldap,
   openvpn-auth-radius,
-  openvpn-dco,
   openvpn-otp,
   owamp-client,
   owamp-server,
@@ -146,7 +145,7 @@ Depends:
   python3-tabulate,
   python3-vici (>= 5.7.2),
   python3-voluptuous,
-  python3-vpp-api,
+  python3-vpp-api [amd64],
   python3-xmltodict,
   python3-zmq,
   qrencode,
@@ -181,9 +180,9 @@ Depends:
   uidmap,
   usb-modeswitch,
   usbutils,
-  vpp,
-  vpp-plugin-core,
-  vpp-plugin-dpdk,
+  vpp [amd64],
+  vpp-plugin-core [amd64],
+  vpp-plugin-dpdk [amd64],
   vyatta-bash,
   vyatta-cfg,
   vyos-http-api-tools,
diff --git a/debian/rules b/debian/rules
index 9ada2bf87..39185f1e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ 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
@@ -35,6 +36,8 @@ 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
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 93e7ced9b..b1bd23ff2 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -180,6 +180,9 @@ systemctl enable vyos-config-cloud-init.service
 # Generate API GraphQL schema
 /usr/libexec/vyos/services/api/graphql/generate/generate_schema.py
 
+# Update XML cache
+python3 /usr/lib/python3/dist-packages/vyos/xml_ref/update_cache.py
+
 # T1797: disable VPP support for rolling release, should be used by developers
 # only (in the initial phase). If you wan't to enable VPP use the below command
 # on your VyOS installation: