← Back to branch summary

~ubuntu-branches/ubuntu/wily/openvswitch/wily

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-08-10 11:35:15 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20150810113515-575vj06oq29emxsn
Tags: 2.4.0~git20150810.97bab95-0ubuntu1
* New upstream snapshot from 2.4 branch:
  - d/*: Align any relevant packaging changes with upstream.
* d/*: wrap-and-sort.
* d/openvswitch-{common,vswitch}.install: Correct install location for
  bash completion files.
* d/tests/openflow.py: Explicitly use ovs-testcontroller as provided
  by 2.4.0 release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
17
17
endif
18
18
 
19
19
override_dh_auto_configure:
20
 
        dh_auto_configure -- --enable-ssl $(DATAPATH_CONFIGURE_OPTS) 
 
20
        dh_auto_configure -- --enable-ssl $(DATAPATH_CONFIGURE_OPTS)
21
21
 
22
22
override_dh_auto_test:
23
23
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
24
 
        if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL) 1-710 714-716 718-' ||\
 
24
        if $(MAKE) check TESTSUITEFLAGS='$(PARALLEL)' || \
25
25
                $(MAKE) check TESTSUITEFLAGS='--recheck'; then :; \
26
26
        else \
27
27
                cat tests/testsuite.log; \
31
31
 
32
32
override_dh_auto_build:
33
33
        dh_auto_build -- distdir=openvswitch
34
 
        
 
34
 
35
35
override_dh_auto_clean:
36
36
        rm -f python/ovs/*.pyc python/ovs/db/*.pyc
37
37
        dh_auto_clean
38
38
 
39
39
override_dh_install:
40
 
        dh_install
 
40
        dh_install --list-missing
41
41
        cp debian/openvswitch-switch.default debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
42
42
 
43
43
override_dh_installinit:
51
51
# Helper target for creating snapshots from upstream git
52
52
DATE=$(shell date +%Y%m%d)
53
53
# Upstream branch to track
54
 
BRANCH=branch-2.3
 
54
BRANCH=branch-2.4
55
55
 
56
56
get-orig-snapshot:
57
57
        rm -Rf openvswitch-upstream
58
58
        git clone https://github.com/openvswitch/ovs openvswitch-upstream
59
59
        cd openvswitch-upstream && \
60
60
                git checkout -b $(BRANCH) remotes/origin/$(BRANCH) && \
 
61
                export COMMIT=`git rev-parse --short HEAD` && \
61
62
                export UPSTREAM_VERSION=`head -1 NEWS | awk '{ print $$1 }' | sed 's/v//'` && \
62
63
                git archive --format tgz --prefix=openvswitch-$$UPSTREAM_VERSION+git$(DATE)/ \
63
 
                        -o ../../openvswitch_$$UPSTREAM_VERSION+git$(DATE).orig.tar.gz $(BRANCH)
 
64
                        -o ../../openvswitch_$$UPSTREAM_VERSION~git$(DATE).$$COMMIT.orig.tar.gz $(BRANCH)
64
65
        rm -Rf openvswitch-upstream