diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-03 19:10:18 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-03 19:10:18 -0500 |
| commit | 2231c45ac3712c5cb7c1b810c838d3f91f424bf2 (patch) | |
| tree | 00d339c733f026d8802586d90869776392b64e0a | |
| parent | b1046db66bbed6a063f218992449b8abfd1ae99b (diff) | |
| download | vyos-cloud-init-2231c45ac3712c5cb7c1b810c838d3f91f424bf2.tar.gz vyos-cloud-init-2231c45ac3712c5cb7c1b810c838d3f91f424bf2.zip | |
packages/debian: make trunk packaging closer to ubuntu
The big difference is using:
${python3:Depends} or ${python:Depends}
rather than explicitly listing the dependencies (via template ${requires}).
which means we get paths of
/usr/lib/python3/dist-packages/..
rather than
/usr/lib/python3.5/dist-packages/..
when built on xenial.
Additionally it seems we no longer need this strange line.
# Because setup tools didn't copy data...
| -rw-r--r-- | packages/debian/control.in | 2 | ||||
| -rwxr-xr-x | packages/debian/rules.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/debian/control.in b/packages/debian/control.in index 5fe16e43..1c4f522c 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -18,8 +18,8 @@ Package: cloud-init Architecture: all Depends: procps, ${python}, - ${requires}, ${misc:Depends}, + ${${python}:Depends} Recommends: eatmydata, sudo, software-properties-common, gdisk XB-Python-Version: ${python:Versions} Description: Init scripts for cloud instances diff --git a/packages/debian/rules.in b/packages/debian/rules.in index d6cd23ae..66e80946 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,7 @@ 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= make check + +override_dh_systemd_start: + dh_systemd_start --no-restart-on-upgrade --no-start |