diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/vyatta-cfg-quagga-extra.install | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg-quagga-extra.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg-quagga.install | 2 |
6 files changed, 16 insertions, 5 deletions
@@ -16,6 +16,7 @@ debian/vyatta-cfg-quagga debian/vyatta-cfg-quagga-serial debian/vyatta-cfg-quagga-dataplane debian/vyatta-cfg-quagga-wireless +debian/vyatta-cfg-quagga-extra debian/*.debhelper.log debian/*.substvars INSTALL diff --git a/debian/control b/debian/control index 3e391041..d125cef8 100644 --- a/debian/control +++ b/debian/control @@ -27,17 +27,21 @@ Description: Vyatta configuration templates/scripts for Quagga Package: vyatta-cfg-quagga-serial Architecture: all Depends: vyatta-cfg-quagga, vyatta-serial -Replaces: vyatta-cfg-quagga Description: vyatta-cfg-quagga serial templates Vyatta configuration templates for Quagga use on serial devices Package: vyatta-cfg-quagga-wireless Architecture: all Depends: vyatta-cfg-quagga, vyatta-wireless -Replaces: vyatta-cfg-quagga Description: vyatta-cfg-quagga wireless templates Vyatta configuration templates for Quagga use on wireless devices +Package: vyatta-cfg-quagga-extra +Architecture: all +Depends: vyatta-cfg-quagga +Description: vyatta-cfg-quagga extra templates + Vyatta configuration templates for Quagga use on additional pseudo-devices + Package: vyatta-cfg-quagga-dataplane Architecture: all Depends: vyatta-cfg-quagga, vyatta-cfg-dataplane diff --git a/debian/rules b/debian/rules index 9c91ff49..e5457e3c 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +SUBPKGS= vyatta-cfg-quagga \ + vyatta-cfg-quagga-serial \ + vyatta-cfg-quagga-wireless \ + vyatta-cfg-quagga-extra # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -71,7 +75,7 @@ install: build $(MAKE) DESTDIR=$(PKGDIR) install - for p in vyatta-cfg-quagga vyatta-cfg-quagga-serial vyatta-cfg-quagga-wireless; do \ + for p in $(SUBPKGS); do \ install -D --mode=0644 debian/$$p.lintian-overrides \ debian/$$p/usr/share/lintian/overrides/$$p; \ done diff --git a/debian/vyatta-cfg-quagga-extra.install b/debian/vyatta-cfg-quagga-extra.install new file mode 100644 index 00000000..55def17a --- /dev/null +++ b/debian/vyatta-cfg-quagga-extra.install @@ -0,0 +1,2 @@ +opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet +opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding diff --git a/debian/vyatta-cfg-quagga-extra.lintian-overrides b/debian/vyatta-cfg-quagga-extra.lintian-overrides new file mode 100644 index 00000000..d5325536 --- /dev/null +++ b/debian/vyatta-cfg-quagga-extra.lintian-overrides @@ -0,0 +1,2 @@ +vyatta-cfg-quagga-extra: file-in-unusual-dir +vyatta-cfg-quagga-extra: dir-or-file-in-opt diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install index 66a58602..a03998f8 100644 --- a/debian/vyatta-cfg-quagga.install +++ b/debian/vyatta-cfg-quagga.install @@ -4,11 +4,9 @@ opt/vyatta/share/perl5 opt/vyatta/share/vyatta-cfg/templates/policy opt/vyatta/share/vyatta-cfg/templates/protocols opt/vyatta/share/vyatta-cfg/templates/system/gateway-address -opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet opt/vyatta/share/vyatta-cfg/templates/interfaces/loopback opt/vyatta/share/vyatta-cfg/templates/interfaces/openvpn -opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel opt/vyatta/share/vyatta-cfg/templates/interfaces/vti |