diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-08 09:33:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-08 09:33:49 -0400 |
| commit | f242ba437ce814e43e919e647ff0216e182329b8 (patch) | |
| tree | 7f177f3eb4a1771efcc48fe04424ac91f71b8fa7 /packages | |
| parent | a2b25e33dff19ef5d60c9a9292529d25b76fc998 (diff) | |
| parent | 058dd753b91126a504a82d4a48305e9d56116f73 (diff) | |
| download | vyos-cloud-init-f242ba437ce814e43e919e647ff0216e182329b8.tar.gz vyos-cloud-init-f242ba437ce814e43e919e647ff0216e182329b8.zip | |
merge from master at 0.7.7-26-g058dd75
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 13 | ||||
| -rw-r--r-- | packages/debian/changelog.in | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/packages/bddeb b/packages/bddeb index 94496c74..abb7b607 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -67,7 +67,7 @@ def run_helper(helper, args=None, strip=True): return stdout -def write_debian_folder(root, version_data, pkgmap, pyver="3", +def write_debian_folder(root, templ_data, pkgmap, pyver="3", append_requires=[]): deb_dir = util.abs_join(root, 'debian') @@ -79,7 +79,7 @@ def write_debian_folder(root, version_data, pkgmap, pyver="3", templater.render_to_file(util.abs_join(find_root(), 'packages', 'debian', 'changelog.in'), util.abs_join(deb_dir, 'changelog'), - params=version_data) + params=templ_data) # Write out the control file template reqs = run_helper('read-dependencies').splitlines() @@ -147,6 +147,10 @@ def main(): default=os.environ.get("INIT_SYSTEM", "upstart,systemd")) + parser.add_argument("--release", dest="release", + help=("build with changelog referencing RELEASE"), + default="UNRELEASED") + for ent in DEBUILD_ARGS: parser.add_argument(ent, dest="debuild_args", action='append_const', const=ent, default=[], @@ -184,6 +188,7 @@ def main(): pkgmap[p] = "python3-" + p pyver = "3" + templ_data = {'debian_release': args.release} with util.tempdir() as tdir: # output like 0.7.6-1022-g36e92d3 @@ -208,7 +213,9 @@ def main(): append_requires = ['cloud-utils | cloud-guest-utils'] else: append_requires = [] - write_debian_folder(xdir, ver_data, pkgmap, + + templ_data.update(ver_data) + write_debian_folder(xdir, templ_data, pkgmap, pyver=pyver, append_requires=append_requires) print("Running 'debuild %s' in %r" % (' '.join(args.debuild_args), diff --git a/packages/debian/changelog.in b/packages/debian/changelog.in index f8e98258..bdf8d56f 100644 --- a/packages/debian/changelog.in +++ b/packages/debian/changelog.in @@ -1,5 +1,5 @@ ## template:basic -cloud-init (${version_long}-1~bddeb) UNRELEASED; urgency=low +cloud-init (${version_long}-1~bddeb) ${debian_release}; urgency=low * build |