From f3fb7f7d7c83d277634cfe43b82912801ef67311 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 13 Nov 2012 12:07:03 -0500 Subject: sort PKG_MP entries --- packages/bddeb | 6 +++--- packages/brpm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/bddeb b/packages/bddeb index 2cfddb99..bda3170d 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -28,13 +28,13 @@ import argparse # use in our debian 'control' file, this is a translation of the 'requires' # file pypi package name to a debian/ubuntu package name. PKG_MP = { + 'argparse': 'python-argparse', 'boto': 'python-boto', + 'cheetah': 'python-cheetah', 'configobj': 'python-configobj', 'oauth': 'python-oauth', - 'pyyaml': 'python-yaml', 'prettytable': 'python-prettytable', - 'argparse': 'python-argparse', - 'cheetah': 'python-cheetah', + 'pyyaml': 'python-yaml', } DEBUILD_ARGS = ["-us", "-S", "-uc"] diff --git a/packages/brpm b/packages/brpm index e6b03609..eea2a046 100755 --- a/packages/brpm +++ b/packages/brpm @@ -34,13 +34,13 @@ from cloudinit import util # this is a translation of the 'requires' # file pypi package name to a redhat/fedora package name. PKG_MP = { + 'argparse': 'python-argparse', 'boto': 'python-boto', 'cheetah': 'python-cheetah', - 'prettytable': 'python-prettytable', - 'oauth': 'python-oauth', 'configobj': 'python-configobj', + 'oauth': 'python-oauth', + 'prettytable': 'python-prettytable', 'pyyaml': 'PyYAML', - 'argparse': 'python-argparse', } # Subdirectories of the ~/rpmbuild dir -- cgit v1.2.3 From 517f52af3c7fa39b0303f337681f77e2d2a4ff6f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 13 Nov 2012 12:08:45 -0500 Subject: add dependency for 'pkg_resources' --- ChangeLog | 2 +- packages/bddeb | 1 + packages/brpm | 1 + packages/debian/control.in | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/ChangeLog b/ChangeLog index 21584bb7..14efc4b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,7 +40,7 @@ dictionary and force it to full expand so that if cloud-init blocks the ec2 metadata port the lazy loaded dictionary will continue working properly instead of trying to make additional url calls which will fail (LP: #1068801) - - Added dependency on distribute's python-pkg-resources + - Added dependency: python-pkg-resources (deb), python-setuptools (rpm) - use a set of helper/parsing classes to perform system configuration for easier test. (/etc/sysconfig, /etc/hostname, resolv.conf, /etc/hosts) 0.7.0: diff --git a/packages/bddeb b/packages/bddeb index bda3170d..a92dad70 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -33,6 +33,7 @@ PKG_MP = { 'cheetah': 'python-cheetah', 'configobj': 'python-configobj', 'oauth': 'python-oauth', + 'pkg_resources': 'python-pkg-resources', 'prettytable': 'python-prettytable', 'pyyaml': 'python-yaml', } diff --git a/packages/brpm b/packages/brpm index eea2a046..0b1e33cf 100755 --- a/packages/brpm +++ b/packages/brpm @@ -39,6 +39,7 @@ PKG_MP = { 'cheetah': 'python-cheetah', 'configobj': 'python-configobj', 'oauth': 'python-oauth', + 'pkg_resources': 'python-setuptools', 'prettytable': 'python-prettytable', 'pyyaml': 'PyYAML', } diff --git a/packages/debian/control.in b/packages/debian/control.in index dace0356..edb5aff5 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -19,7 +19,6 @@ Standards-Version: 3.9.3 Package: cloud-init Architecture: all Depends: cloud-utils, - distribute, procps, python, #for $r in $requires -- cgit v1.2.3 From f97befb58244a4b3e72e73fe6d90772a4b3584c9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Nov 2012 15:28:16 -0500 Subject: add debian watch --- ChangeLog | 1 + packages/debian/watch | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 packages/debian/watch (limited to 'packages') diff --git a/ChangeLog b/ChangeLog index 427aadc5..cac92bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 0.7.2: + - add a debian watch file 0.7.1: - sysvinit: fix missing dependency in cloud-init job for RHEL 5.6 - config-drive: map hostname to local-hostname (LP: #1061964) diff --git a/packages/debian/watch b/packages/debian/watch new file mode 100644 index 00000000..0f7a600b --- /dev/null +++ b/packages/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/cloud-init/+download .*/\+download/cloud-init-(.+)\.tar.gz -- cgit v1.2.3 From 48abaf6a72dca4485f0bc64af075febac6ef590d Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Wed, 20 Feb 2013 17:13:38 +0100 Subject: 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. --- packages/bddeb | 17 +++++++++++++---- packages/debian/control.in | 3 +-- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/bddeb b/packages/bddeb index bda3170d..61399739 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -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... diff --git a/packages/debian/control.in b/packages/debian/control.in index edb5aff5..b9352f5b 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -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}, -- cgit v1.2.3