diff options
| author | Chad Smith <chad.smith@canonical.com> | 2017-06-14 17:11:43 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-06-14 17:11:43 -0600 |
| commit | b23d9d7c5c112612dbaaf8c8371c9e735500b2eb (patch) | |
| tree | 2560246463557fdf73720558c0d996732e84d5b5 /packages | |
| parent | 55a006afca73633c607c537dee62097e85011443 (diff) | |
| download | vyos-cloud-init-b23d9d7c5c112612dbaaf8c8371c9e735500b2eb.tar.gz vyos-cloud-init-b23d9d7c5c112612dbaaf8c8371c9e735500b2eb.zip | |
ci deps: Add --test-distro to read-dependencies to install all deps
read-dependencies now takes --test-distro param to indicate we want to install
all system package depenencies to allow for testing and building for our
continous integration environment. It allows us to install all needed deps on
a fresh system with:
python3 ./tools/read-dependencies --distro ubuntu --test-distro [--dry-run].
Additionally read-dependencies now looks at what version of python is running
the script (py2 vs p3) and opts to install python 2 or 3 system deps
respectively. This behavior can still be overridden with
python3 ./tools/read-dependencies ... --python-version 2.
There are also some distro-specific packaging and test dependencies, like
devscripts, tox and libssl-dev on debian or ubuntu. Those pkg dependencies
have now been broken out from common pkg deps to avoid trying to install them
on centos/redhat/suse.
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/bddeb b/packages/bddeb index e45af6ee..609a94fb 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -72,7 +72,9 @@ def write_debian_folder(root, templ_data, is_python2, cloud_util_deps): requires = ['cloud-utils | cloud-guest-utils'] if cloud_util_deps else [] # We consolidate all deps as Build-Depends as our package build runs all # tests so we need all runtime dependencies anyway. - requires.extend(reqs + test_reqs + [python]) + # NOTE: python package was moved to the front after debuild -S would fail with + # 'Please add apropriate interpreter' errors (as in debian bug 861132) + requires.extend([python] + reqs + test_reqs) templater.render_to_file(util.abs_join(find_root(), 'packages', 'debian', 'control.in'), util.abs_join(deb_dir, 'control'), |