diff options
author | Lars Kellogg-Stedman <lars@redhat.com> | 2016-07-22 15:09:24 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-08-03 16:00:52 -0400 |
commit | 72d6adcb2e4cb5911f7809b89835965d4bf04476 (patch) | |
tree | 64b33f605847b5b26f67e37882442ea0c3620552 /packages/bddeb | |
parent | eed7fccdb9e59e5b2cc9e6d94af06f075c6ced67 (diff) | |
download | vyos-cloud-init-72d6adcb2e4cb5911f7809b89835965d4bf04476.tar.gz vyos-cloud-init-72d6adcb2e4cb5911f7809b89835965d4bf04476.zip |
Update build tools to work with git
- Update HACKING.rst to include git instructions
- update MANIFEST.in and .gitignore to ignore git-related things
- replaced tarball generation scripts with git-based script
- have the spec files correctly identify themselves as cheetah templates
- make brpm work with git
Diffstat (limited to 'packages/bddeb')
-rwxr-xr-x | packages/bddeb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/packages/bddeb b/packages/bddeb index 3c77ce1d..46c07c88 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -180,13 +180,10 @@ def main(): with util.tempdir() as tdir: - cmd = [util.abs_join(find_root(), 'tools', 'read-version')] + # output like 0.7.6-1022-g36e92d3 + cmd = ['git', 'describe', '--long'] (sysout, _stderr) = util.subp(cmd) - version = sysout.strip() - - cmd = ['bzr', 'revno'] - (sysout, _stderr) = util.subp(cmd) - revno = sysout.strip() + version, extra = sysout.strip().split("-", 1) # This is really only a temporary archive # since we will extract it then add in the debian @@ -212,12 +209,12 @@ def main(): append_requires=['cloud-utils | cloud-guest-utils'] else: append_requires=[] - write_debian_folder(xdir, version, revno, pkgmap, + write_debian_folder(xdir, version, extra, pkgmap, pyver=pyver, append_requires=append_requires) # The naming here seems to follow some debian standard # so it will whine if it is changed... - tar_fn = "cloud-init_%s~bzr%s.orig.tar.gz" % (version, revno) + tar_fn = "cloud-init_%s+%s~bddeb.orig.tar.gz" % (version, extra) print("Archiving the adjusted source into %r" % (util.abs_join(tdir, tar_fn))) cmd = ['tar', '-czvf', |