diff options
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autogen.sh | 26 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/vyatta-quagga.preinst | 6 |
4 files changed, 10 insertions, 28 deletions
diff --git a/debian/autogen.sh b/debian/autogen.sh index ff125d1d..e8c94af8 100755 --- a/debian/autogen.sh +++ b/debian/autogen.sh @@ -1,32 +1,6 @@ #!/bin/sh -if [ -d .git ] ; then -# generate GNU/Debian format ChangeLog from git log - - rm -f ChangeLog - - if which git2cl >/dev/null ; then - git-log --pretty --numstat --summary | git2cl >> ChangeLog - else - git-log --pretty=short >> ChangeLog - fi - -# append repository reference - - url=` git repo-config --get remote.origin.url` - test "x$url" = "x" && url=`pwd` - - branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'` - test "x$branch" = "x" && branch=master - - sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8` - test "x$sha" = "x" && sha=00000000 - - echo "$url#$branch-$sha" >> ChangeLog - -fi - rm -rf config rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL diff --git a/debian/control b/debian/control index bfd9db1e..26491df3 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 5), imagemagick, ghostscript | gs-gpl, groff, - po-debconf + po-debconf, + libsnmp-dev Standards-Version: 3.7.2 Vcs-Git: http://suva.vyatta.git/quagga.git diff --git a/debian/rules b/debian/rules index ba47d987..e89dc246 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ PACKAGE=vyatta-quagga PKGDIR=$(CURDIR)/debian/$(PACKAGE) BUILD_STAMP=debian/build-stamp CFLAGS = -Wall -g +WANT_SNMP=1 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -107,7 +108,7 @@ install: build install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE) ifeq ($(WANT_SNMP), 1) - install -D --mode=0644 zebra/GNOME-PRODUCT-ZEBRA-MIB $(PKGDIR)/usr/share/snmp/mibs + install -D --mode=0644 zebra/GNOME-PRODUCT-ZEBRA-MIB $(PKGDIR)/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB.txt endif diff --git a/debian/vyatta-quagga.preinst b/debian/vyatta-quagga.preinst index 4222ef3b..af61947a 100644 --- a/debian/vyatta-quagga.preinst +++ b/debian/vyatta-quagga.preinst @@ -71,6 +71,12 @@ if [ "$1" = "install" ]; then EOF fi done + + + echo "smux peer .1.3.6.1.4.1.3317.1.2.5" >> $ETC_DIR/ospfd.conf + echo "smux peer .1.3.6.1.4.1.3317.1.2.2" >> $ETC_DIR/bgpd.conf + echo "smux peer .1.3.6.1.4.1.3317.1.2.3" >> $ETC_DIR/ripd.conf + if [ ! -e $ETC_DIR/vtysh.conf ] ; then touch $ETC_DIR/vtysh.conf chown quagga:quaggavty $ETC_DIR/vtysh.conf |