summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-11 14:52:41 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-11 14:52:41 +0100
commitbd3ed52d07929c644ca5c5180689f503c349b5ba (patch)
tree70b49bafee2bb1572bfcc2a73f47ff126c928afc /Makefile
parent14247c27c1446241a64da713f885b57dc82e3228 (diff)
parent5a98ca315ef96d4553c1530a1bb66d5458f38fe8 (diff)
downloadvyos-1x-bd3ed52d07929c644ca5c5180689f503c349b5ba.tar.gz
vyos-1x-bd3ed52d07929c644ca5c5180689f503c349b5ba.zip
Merge branch 'ripng' of github.com:c-po/vyos-1x into current
* 'ripng' of github.com:c-po/vyos-1x: smoketest: static-routes: enable VRF table leaking test rip: T2547: fix indention of distribute-list in FRR template Makefile: remove "interfaces ip" node as all components have been migrated ripng: T3281: migrate to get_config_dict() and FRR reload frr: T2638: remove dedicated per protocol debugging
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ad71219eb..abe4524d1 100644
--- a/Makefile
+++ b/Makefile
@@ -45,18 +45,14 @@ interface_definitions: $(config_xml_obj)
rm -f $(TMPL_DIR)/vpn/node.def
rm -f $(TMPL_DIR)/vpn/ipsec/node.def
rm -rf $(TMPL_DIR)/vpn/nipsec
- rm -rf $(TMPL_DIR)/protocols/nripng
# XXX: required until OSPF and RIP is migrated from vyatta-cfg-quagga to vyos-1x
mkdir $(TMPL_DIR)/interfaces/loopback/node.tag/ipv6
mkdir $(TMPL_DIR)/interfaces/dummy/node.tag/ipv6
- mkdir $(TMPL_DIR)/interfaces/openvpn/node.tag/ip
- mkdir -p $(TMPL_DIR)/interfaces/vti/node.tag/ip
mkdir -p $(TMPL_DIR)/interfaces/vti/node.tag/ipv6
cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def $(TMPL_DIR)/interfaces/loopback/node.tag/ipv6
cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def $(TMPL_DIR)/interfaces/dummy/node.tag/ipv6
- cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ip/node.def $(TMPL_DIR)/interfaces/openvpn/node.tag/ip
- cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ip/node.def $(TMPL_DIR)/interfaces/vti/node.tag/ip
+
cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def $(TMPL_DIR)/interfaces/vti/node.tag/ipv6
.PHONY: op_mode_definitions