Bug #529: don't build packages for serial and dataplane interfaces.

6 files changed, 2 insertions, 37 deletions

diff --git a/debian/control b/debian/control
index c10ca0c3..38498f47 100644
--- a/debian/control
+++ b/debian/control
@@ -23,16 +23,3 @@ Suggests: util-linux (>= 2.13-5),
  ntpdate
 Description: VyOS configuration templates/scripts for Quagga
  VyOS configuration templates and scripts for Quagga
-
-Package: vyatta-cfg-quagga-serial
-Architecture: all
-Depends:  vyatta-cfg-quagga, vyatta-serial
-Replaces:  vyatta-cfg-quagga
-Description: VyOS Quagga serial templates
- VyOS configuration templates for Quagga use on serial devices
-
-Package: vyatta-cfg-quagga-dataplane
-Architecture: all
-Depends:  vyatta-cfg-quagga, vyatta-cfg-dataplane
-Description: VyOS Quagga dataplane templates
- VyOS configuration templates for Quagga use on dataplane devices
diff --git a/debian/rules b/debian/rules
index 682108fc..787ca5bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,10 +71,8 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	for p in vyatta-cfg-quagga vyatta-cfg-quagga-serial; do \
-	  install -D --mode=0644 debian/$$p.lintian-overrides \
-		debian/$$p/usr/share/lintian/overrides/$$p; \
-	done
+	install -D --mode=0644 debian/vyatta-cfg-quagga.lintian-overrides \
+		debian/vyatta-cfg-quagga/usr/share/lintian/overrides/vyatta-cfg-quagga
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/debian/vyatta-cfg-quagga-dataplane.install b/debian/vyatta-cfg-quagga-dataplane.install
deleted file mode 100644
index 57f6ffcd..00000000
--- a/debian/vyatta-cfg-quagga-dataplane.install
+++ /dev/null
@@ -1,2 +0,0 @@
-opt/vyatta/share/vyatta-cfg/templates/interfaces/dataplane
-
diff --git a/debian/vyatta-cfg-quagga-serial.install b/debian/vyatta-cfg-quagga-serial.install
deleted file mode 100644
index 74b0475f..00000000
--- a/debian/vyatta-cfg-quagga-serial.install
+++ /dev/null
@@ -1,3 +0,0 @@
-opt/vyatta/share/vyatta-cfg/templates/interfaces/adsl
-opt/vyatta/share/vyatta-cfg/templates/interfaces/multilink
-opt/vyatta/share/vyatta-cfg/templates/interfaces/serial
diff --git a/debian/vyatta-cfg-quagga-serial.lintian-overrides b/debian/vyatta-cfg-quagga-serial.lintian-overrides
deleted file mode 100644
index 250f5718..00000000
--- a/debian/vyatta-cfg-quagga-serial.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-vyatta-cfg-quagga-serial: file-in-unusual-dir
-vyatta-cfg-quagga-serial: dir-or-file-in-opt
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
index 71ec95da..6573937d 100755
--- a/gen-interface-templates.pl
+++ b/gen-interface-templates.pl
@@ -51,22 +51,9 @@ my %interface_hash = (
     'bridge/node.tag'                                             => '$VAR(@)',
     'openvpn/node.tag'                                            => '$VAR(@)',
     'wirelessmodem/node.tag'                                      => '$VAR(@)',
-    'multilink/node.tag/vif/node.tag'                             => '$VAR(../@)',
     'dummy/node.tag'                                              => '$VAR(@)',
     'l2tpv3/node.tag'                                             => '$VAR(@)',
     'vxlan/node.tag'                                              => '$VAR(@)',
-
-    'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../@)',
-    'adsl/node.tag/pvc/node.tag/classical-ipoa'   => '$VAR(../../@)',
-    'adsl/node.tag/pvc/node.tag/pppoa/node.tag'   => '$VAR(../../@)',
-    'adsl/node.tag/pvc/node.tag/pppoe/node.tag'   => '$VAR(../../@)',
-
-    'serial/node.tag/cisco-hdlc/vif/node.tag'  => '$VAR(../../@).$VAR(@)',
-    'serial/node.tag/frame-relay/vif/node.tag' => '$VAR(../../@).$VAR(@)',
-    'serial/node.tag/ppp/vif/node.tag'         => '$VAR(../../@).$VAR(@)',
-
-    'dataplane/node.tag'                      => '$VAR(@)',
-    'dataplane/node.tag/vif/node.tag'         => '$VAR(../@).$VAR(@)',
 );
 
 # Hash table to check if the priority needs to set @ root