summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-07-24 08:49:42 -0400
committerScott Moser <smoser@ubuntu.com>2014-07-24 08:49:42 -0400
commit84ee0821f32c652fd377663c2e73658437ae99ab (patch)
treecbebe02dbaa15307c9992d068a714613be2fdce1 /packages
parenta000671207ee4a445261b05d22c2f3357b413053 (diff)
parent27ce1e10692e93cfb9b87df547de4e0930ec4d28 (diff)
downloadvyos-cloud-init-84ee0821f32c652fd377663c2e73658437ae99ab.tar.gz
vyos-cloud-init-84ee0821f32c652fd377663c2e73658437ae99ab.zip
merge from trunk
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/bddeb14
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/bddeb b/packages/bddeb
index e731d23f..9d264f92 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -39,7 +39,7 @@ PKG_MP = {
'pyyaml': 'python-yaml',
'requests': 'python-requests',
}
-DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
+DEBUILD_ARGS = ["-S", "-d"]
def write_debian_folder(root, version, revno, append_requires=[]):
@@ -105,10 +105,17 @@ def main():
for ent in DEBUILD_ARGS:
parser.add_argument(ent, dest="debuild_args", action='append_const',
- const=ent, help=("pass through '%s' to debuild" % ent))
+ const=ent, help=("pass through '%s' to debuild" % ent),
+ default=[])
+
+ parser.add_argument("--sign", default=False, action='store_true',
+ help="sign result. do not pass -us -uc to debuild")
args = parser.parse_args()
+ if not args.sign:
+ args.debuild_args.extend(['-us', '-uc'])
+
os.environ['INIT_SYSTEM'] = args.init_system
capture = True
@@ -168,7 +175,8 @@ def main():
print("Copied that archive to %r for local usage (if desired)." %
(util.abs_join(os.getcwd(), tar_fn)))
- print("Running 'debuild' in %r" % (xdir))
+ print("Running 'debuild %s' in %r" % (' '.join(args.debuild_args),
+ xdir))
with util.chdir(xdir):
cmd = ['debuild', '--preserve-envvar', 'INIT_SYSTEM']
if args.debuild_args: