diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-09 21:55:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-09 21:57:45 -0400 |
| commit | 8cf1212d4aa79959e46974bf1e3532af1ffe4b41 (patch) | |
| tree | 574e571f2291f27079b26876ab534cf3aa55e9ba /debian/rules | |
| parent | ea732e69516983b1d9838b0d80540a832594748a (diff) | |
| parent | 37527ac38c2829dba6d284f23ed40f007a7ee176 (diff) | |
| download | vyos-cloud-init-8cf1212d4aa79959e46974bf1e3532af1ffe4b41.tar.gz vyos-cloud-init-8cf1212d4aa79959e46974bf1e3532af1ffe4b41.zip | |
Merge branch 'ubuntu/devel' into ubuntu/xenial
- debian/cloud-init.templates fix capitalisation in template so
dpkg-reconfigure works to select OpenStack. (LP: #1575727)
- d/README.source, d/control, d/new-upstream-snapshot, d/rules: sync
with yakkety for changes due to move to git.
- d/rules: change PYVER=python3 to PYVER=3 to adjust to upstream change.
- debian/rules, debian/cloud-init.install: remove install file
to ensure expected files are collected into cloud-init deb.
(LP: #1615745)
- debian/dirs: remove obsolete / unused file.
LP: #1575727
LP: #1615745
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 4008d73f..ef13251f 100755 --- a/debian/rules +++ b/debian/rules @@ -7,10 +7,15 @@ export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - http_proxy= make PYVER=3 check + http_proxy= make PYVER=python3 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 + +override_dh_auto_install: + dh_auto_install --destdir=debian/cloud-init + install -D ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf + install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh |