Added arguments to packages/bddeb:
-d pass through '-d' to debuild --no-cloud-utils don't depend on cloud-utils package (default: False) These are essential for building on Debian 6, because there are no python-mocker (build dependency) and cloud-utils (install dependency) in squeeze and squeeze-backports.
This commit is contained in:
parent
2ba2369bf1
commit
5d82b78ef3
|
@ -36,10 +36,10 @@ PKG_MP = {
|
|||
'prettytable': 'python-prettytable',
|
||||
'pyyaml': 'python-yaml',
|
||||
}
|
||||
DEBUILD_ARGS = ["-us", "-S", "-uc"]
|
||||
DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
|
||||
|
||||
|
||||
def write_debian_folder(root, version, revno):
|
||||
def write_debian_folder(root, version, revno, append_requires=[]):
|
||||
deb_dir = util.abs_join(root, 'debian')
|
||||
os.makedirs(deb_dir)
|
||||
|
||||
|
@ -58,7 +58,7 @@ def write_debian_folder(root, version, revno):
|
|||
pkgs = [p.lower().strip() for p in stdout.splitlines()]
|
||||
|
||||
# Map to known packages
|
||||
requires = []
|
||||
requires = append_requires
|
||||
for p in pkgs:
|
||||
tgt_pkg = PKG_MP.get(p)
|
||||
if not tgt_pkg:
|
||||
|
@ -87,6 +87,11 @@ def main():
|
|||
" (default: %(default)s)"),
|
||||
default=False,
|
||||
action='store_true')
|
||||
parser.add_argument("--no-cloud-utils", dest="no_cloud_utils",
|
||||
help=("don't depend on cloud-utils package"
|
||||
" (default: %(default)s)"),
|
||||
default=False,
|
||||
action='store_true')
|
||||
|
||||
for ent in DEBUILD_ARGS:
|
||||
parser.add_argument(ent, dest="debuild_args", action='append_const',
|
||||
|
@ -128,7 +133,11 @@ def main():
|
|||
shutil.move(extracted_name, xdir)
|
||||
|
||||
print("Creating a debian/ folder in %r" % (xdir))
|
||||
write_debian_folder(xdir, version, revno)
|
||||
if not args.no_cloud_utils:
|
||||
append_requires=['cloud-utils']
|
||||
else:
|
||||
append_requires=[]
|
||||
write_debian_folder(xdir, version, revno, append_requires)
|
||||
|
||||
# The naming here seems to follow some debian standard
|
||||
# so it will whine if it is changed...
|
||||
|
|
|
@ -18,8 +18,7 @@ Standards-Version: 3.9.3
|
|||
|
||||
Package: cloud-init
|
||||
Architecture: all
|
||||
Depends: cloud-utils,
|
||||
procps,
|
||||
Depends: procps,
|
||||
python,
|
||||
#for $r in $requires
|
||||
${r},
|
||||
|
|
Loading…
Reference in New Issue