From cc852f559b886f1d4236e8de1c538e54ea23457f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 20 Feb 2013 15:58:33 -0800 Subject: Split out pseudo devices into separate package --- .gitignore | 1 + debian/control | 9 +++++++-- debian/rules | 6 +++++- debian/vyatta-cfg-qos-extra.install | 3 +++ debian/vyatta-cfg-qos-extra.lintian-overrides | 2 ++ debian/vyatta-cfg-qos.install | 3 --- 6 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 debian/vyatta-cfg-qos-extra.install create mode 100644 debian/vyatta-cfg-qos-extra.lintian-overrides diff --git a/.gitignore b/.gitignore index 78242a1..1a67ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ debian/*.postinst debian/vyatta-cfg-qos debian/vyatta-cfg-qos-serial debian/vyatta-cfg-qos-wireless +debian/vyatta-cfg-qos-extra debian/*.debhelper.log debian/*.substvars INSTALL diff --git a/debian/control b/debian/control index e4b5290..3b08a3b 100644 --- a/debian/control +++ b/debian/control @@ -24,13 +24,18 @@ Description: Vyatta Qos configuration templates/scripts Package: vyatta-cfg-qos-serial Architecture: all Depends: ${perl:Depends}, ${shlibs:Depends}, vyatta-cfg-qos, vyatta-serial -Replaces: vyatta-cfg-qos Description: vyatta-cfg-qos serial templates Vyatta Qos configuration templates for serial devices Package: vyatta-cfg-qos-wireless Architecture: all Depends: ${perl:Depends}, ${shlibs:Depends}, vyatta-cfg-qos, vyatta-wireless -Replaces: vyatta-cfg-qos Description: vyatta-cfg-qos wireless templates Vyatta Qos configuration templates for wireless devices + +Package: vyatta-cfg-qos-extra +Architecture: all +Depends: ${perl:Depends}, ${shlibs:Depends}, vyatta-cfg-qos, vyatta-wireless +Description: vyatta-cfg-qos extra templates + Vyatta Qos configuration templates for pseudo devices + diff --git a/debian/rules b/debian/rules index 4364da5..14ffa71 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-qos \ + vyatta-cfg-qos-serial \ + vyatta-cfg-qos-wireless \ + vyatta-cfg-qos-extra # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -61,7 +65,7 @@ install: build $(MAKE) DESTDIR=$(PKGDIR) install - for p in vyatta-cfg-qos vyatta-cfg-qos-serial vyatta-cfg-qos-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-qos-extra.install b/debian/vyatta-cfg-qos-extra.install new file mode 100644 index 0000000..b767859 --- /dev/null +++ b/debian/vyatta-cfg-qos-extra.install @@ -0,0 +1,3 @@ +opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding +opt/vyatta/share/vyatta-cfg/templates/interfaces/input +opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet diff --git a/debian/vyatta-cfg-qos-extra.lintian-overrides b/debian/vyatta-cfg-qos-extra.lintian-overrides new file mode 100644 index 0000000..9c9a763 --- /dev/null +++ b/debian/vyatta-cfg-qos-extra.lintian-overrides @@ -0,0 +1,2 @@ +vyatta-cfg-qos-extra: file-in-unusual-dir +vyatta-cfg-qos-extra: dir-or-file-in-opt diff --git a/debian/vyatta-cfg-qos.install b/debian/vyatta-cfg-qos.install index 6e8a704..4ca4c92 100644 --- a/debian/vyatta-cfg-qos.install +++ b/debian/vyatta-cfg-qos.install @@ -3,12 +3,9 @@ opt/vyatta/etc opt/vyatta/sbin opt/vyatta/share/perl5 opt/vyatta/share/vyatta-cfg/templates/traffic-policy -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/input 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 -- cgit v1.2.3