diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
| commit | 1a9a408a7bf6d7a1a06254ad2939bd549acba69b (patch) | |
| tree | ec4f76ea5260e269c83addbfafa4376ea2678059 /packages/debian/rules.in | |
| parent | bbf105baafbe788f7babbda188b513180424e256 (diff) | |
| parent | 8092805079d011093724d87e9485e5bf79479a72 (diff) | |
| download | vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.tar.gz vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.zip | |
merge with trunk
Diffstat (limited to 'packages/debian/rules.in')
| -rwxr-xr-x | packages/debian/rules.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packages/debian/rules.in b/packages/debian/rules.in index bb2e1d5c..cf2dd405 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules.in @@ -1,9 +1,8 @@ ## template:basic #!/usr/bin/make -f - INIT_SYSTEM ?= upstart,systemd -PYVER ?= python${pyver} export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) +PYVER ?= python${pyver} %: dh $@ --with $(PYVER),systemd --buildsystem pybuild @@ -14,6 +13,11 @@ override_dh_install: cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf override_dh_auto_test: - # Because setup tools didn't copy data... - [ ! -d .pybuild/pythonX.Y_?.?/build/tests ] || cp -r tests/data .pybuild/pythonX.Y_?.?/build/tests - http_proxy= dh_auto_test -- --test-nose +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + http_proxy= make PYVER=${pyver} check +else + @echo check disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS) +endif + +override_dh_systemd_start: + dh_systemd_start --no-restart-on-upgrade --no-start |