diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-08 16:42:45 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-10-08 16:42:45 -0700 |
| commit | 4a3eab9f5a49f8ebdf30b8378fa58c342b3d9c8a (patch) | |
| tree | 5f6f6ad6d8b9fd35066feceda146a3a1b34ba27a | |
| parent | 8ff6ba4aaef8fc9a6b5c522cf26854e93f9107f0 (diff) | |
| parent | 8b7b89a7aa0e1110ef8eb6ab46160dbc0a646019 (diff) | |
| download | vyos-cloud-init-4a3eab9f5a49f8ebdf30b8378fa58c342b3d9c8a.tar.gz vyos-cloud-init-4a3eab9f5a49f8ebdf30b8378fa58c342b3d9c8a.zip | |
Merge rpm subrelease branch.
| -rwxr-xr-x | packages/brpm | 11 | ||||
| -rw-r--r-- | packages/redhat/cloud-init.spec.in | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/packages/brpm b/packages/brpm index 7975e05c..e6b03609 100755 --- a/packages/brpm +++ b/packages/brpm @@ -106,6 +106,10 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn): subs['version'] = version subs['revno'] = revno subs['release'] = "bzr%s" % (revno) + if args.sub_release is not None: + subs['subrelease'] = "." + str(args.sub_release) + else: + subs['subrelease'] = '' subs['archive_name'] = arc_fn cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')] @@ -175,6 +179,13 @@ def main(): " (default: %(default)s)"), default=False, action='store_true') + parser.add_argument('-s', "--sub-release", dest="sub_release", + metavar="RELEASE", + help=("a 'internal' release number to concat" + " with the bzr version number to form" + " the final version number"), + type=int, + default=None) parser.add_argument("-p", "--patch", dest="patches", help=("include the following patch when building"), default=[], diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in index 12f0b144..30bcd050 100644 --- a/packages/redhat/cloud-init.spec.in +++ b/packages/redhat/cloud-init.spec.in @@ -11,7 +11,7 @@ Name: cloud-init Version: ${version} -Release: ${release}%{?dist} +Release: ${release}${subrelease}%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base |