diff options
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 9 | ||||
| -rwxr-xr-x | packages/brpm | 2 | ||||
| -rw-r--r-- | packages/debian/manpages | 3 | ||||
| -rw-r--r-- | packages/pkg-deps.json | 12 | ||||
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 4 | ||||
| -rw-r--r-- | packages/suse/cloud-init.spec.in | 4 |
6 files changed, 24 insertions, 10 deletions
diff --git a/packages/bddeb b/packages/bddeb index 95602a02..209765a5 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -177,6 +177,11 @@ def main(): # output like 0.7.6-1022-g36e92d3 ver_data = read_version() + if ver_data['is_release_branch_ci']: + # If we're performing CI for a new release branch, we don't yet + # have the tag required to generate version_long; use version + # instead. + ver_data['version_long'] = ver_data['version'] # This is really only a temporary archive # since we will extract it then add in the debian @@ -192,7 +197,9 @@ def main(): break if path is None: print("Creating a temp tarball using the 'make-tarball' helper") - run_helper('make-tarball', ['--long', '--output=' + tarball_fp]) + run_helper('make-tarball', + ['--version', ver_data['version_long'], + '--output=' + tarball_fp]) print("Extracting temporary tarball %r" % (tarball)) cmd = ['tar', '-xvzf', tarball_fp, '-C', tdir] diff --git a/packages/brpm b/packages/brpm index a154ef29..4004fd0e 100755 --- a/packages/brpm +++ b/packages/brpm @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import glob diff --git a/packages/debian/manpages b/packages/debian/manpages new file mode 100644 index 00000000..605cfd67 --- /dev/null +++ b/packages/debian/manpages @@ -0,0 +1,3 @@ +doc/man/cloud-id.1 +doc/man/cloud-init-per.1 +doc/man/cloud-init.1 diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json index 72409dd8..cf065219 100644 --- a/packages/pkg-deps.json +++ b/packages/pkg-deps.json @@ -29,27 +29,27 @@ ], "renames" : { "jinja2" : { - "3" : "python34-jinja2" + "3" : "python36-jinja2" }, "jsonschema" : { - "3" : "python34-jsonschema" + "3" : "python36-jsonschema" }, "pyflakes" : { "2" : "pyflakes", - "3" : "python34-pyflakes" + "3" : "python36-pyflakes" }, "pyyaml" : { "2" : "PyYAML", - "3" : "python34-PyYAML" + "3" : "python36-PyYAML" }, "pyserial" : { "2" : "pyserial" }, "requests" : { - "3" : "python34-requests" + "3" : "python36-requests" }, "six" : { - "3" : "python34-six" + "3" : "python36-six" } }, "requires" : [ diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 6b2022ba..057a5784 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -205,7 +205,9 @@ fi %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf -%{_sysconfdir}/bash_completion.d/cloud-init + +# Bash completion script +%{_datadir}/bash-completion/completions/cloud-init %{_libexecdir}/%{name} %dir %{_sharedstatedir}/cloud diff --git a/packages/suse/cloud-init.spec.in b/packages/suse/cloud-init.spec.in index 26894b34..004b875f 100644 --- a/packages/suse/cloud-init.spec.in +++ b/packages/suse/cloud-init.spec.in @@ -120,7 +120,9 @@ version_pys=$(cd "%{buildroot}" && find . -name version.py -type f) %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/README %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* -%{_sysconfdir}/bash_completion.d/cloud-init + +# Bash completion script +%{_datadir}/bash-completion/completions/cloud-init %{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient %{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager |