For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index cefcd32..539c8f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,9 @@ MA_DIR ?= /usr/share/modass
 
 DATAPATH_CONFIGURE_OPTS = --enable-snat
 
+# Official build number.  Leave set to 0 if not an official build.
+BUILD_NUMBER = 0
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -37,6 +40,7 @@ configure-stamp:
        cd _debian && ( \
                test -e Makefile || \
                ../configure --prefix=/usr --localstatedir=/var --enable-ssl \
+                       --with-build-number=$(BUILD_NUMBER) \
                        $(DATAPATH_CONFIGURE_OPTS))
        $(ext_configure)
        touch configure-stamp
@@ -89,7 +93,7 @@ binary-modules: prep-deb-files
        dh_testroot
        dh_clean -k
        tar xzf openflow.tar.gz
-       cd openflow && ./configure --with-$(l2x)=$(KSRC) $(DATAPATH_CONFIGURE_OPTS)
+       cd openflow && ./configure --with-$(l2x)=$(KSRC) $(DATAPATH_CONFIGURE_OPTS) --with-build-number=$(BUILD_NUMBER)
        cd openflow && $(MAKE) -C $(dpdir)
        install -d -m755 $(DSTDIR)
        install -m644 openflow/$(dpdir)/*_mod.$(KO)o $(DSTDIR)/
@@ -121,6 +125,7 @@ install-arch: build-arch
        dh_installdirs -s
        $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openflow install
        cp debian/openflow-switch-config.overrides debian/openflow-switch-config/usr/share/lintian/overrides/openflow-switch-config
+       cp debian/openflow-switch.template debian/openflow-switch/usr/share/openflow/switch/default.template
        dh_install -s
        $(ext_install_arch)
 
@@ -139,7 +144,7 @@ binary-common:
        dh_installcron
        dh_installman
        dh_link
-       dh_strip
+       dh_strip --dbg-package=openflow-dbg
        dh_compress 
        dh_fixperms -X var/log/core
        dh_perl