Merge lp:~harlowja/cloud-init/rpm-patch-inputs into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

Allow the brpm package to be ran with a set of patch files to include when building.

[lp:~harlowja/cloud-init/rpm-patch-inputs]

673. By Joshua Harlow on 2012-09-26

Add a top_dir define.

674. By Joshua Harlow on 2012-09-26

Clean doesn't seem needed.

675. By Joshua Harlow on 2012-09-26

Ensure the patches get activated.

676. By Joshua Harlow on 2012-09-27

Add a nice '-p1'

677. By Joshua Harlow on 2012-09-28

Stop the bad habit of using 'or'.

678. By Joshua Harlow on 2012-09-28

Also ensure that if mirror info is not invalid
before we start iterating over it (it could
be sent is as none).

=== modified file 'cloudinit/distros/__init__.py'
--- cloudinit/distros/__init__.py	2012-09-25 03:45:56 +0000
+++ cloudinit/distros/__init__.py	2012-09-28 18:11:24 +0000
@@ -82,7 +82,7 @@
         return arch
 
     def _get_arch_package_mirror_info(self, arch=None):
-        mirror_info = self.get_option("package_mirrors", None)
+        mirror_info = self.get_option("package_mirrors", [])
         if arch == None:
             arch = self.get_primary_arch()
         return _get_arch_package_mirror_info(mirror_info, arch)
@@ -92,7 +92,6 @@
         # this resolves the package_mirrors config option
         # down to a single dict of {mirror_name: mirror_url}
         arch_info = self._get_arch_package_mirror_info(arch)
-
         return _get_package_mirror_info(availability_zone=availability_zone,
                                         mirror_info=arch_info)
 
@@ -353,6 +352,8 @@
     # given a arch specific 'mirror_info' entry (from package_mirrors)
     # search through the 'search' entries, and fallback appropriately
     # return a dict with only {name: mirror} entries.
+    if not mirror_info:
+        mirror_info = {}
 
     ec2_az_re = ("^[a-z][a-z]-(%s)-[1-9][0-9]*[a-z]$" %
         "north|northeast|east|southeast|south|southwest|west|northwest")

=== modified file 'packages/brpm'
--- packages/brpm	2012-07-09 20:41:45 +0000
+++ packages/brpm	2012-09-28 18:11:24 +0000
@@ -91,7 +91,7 @@
     return "* %s" % (d)
 
 
-def generate_spec_contents(args, tmpl_fn, arc_fn):
+def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn):
 
     # Figure out the version and revno
     cmd = [util.abs_join(find_root(), 'tools', 'read-version')]
@@ -148,7 +148,9 @@
     else:
         subs['systemd'] = False
 
+    subs['defines'] = ["_topdir %s" % (top_dir)]
     subs['init_sys'] = args.boot
+    subs['patches'] = [os.path.basename(p) for p in args.patches]
     return templater.render_from_file(tmpl_fn, params=subs)
 
 
@@ -164,6 +166,10 @@
                               " (default: %(default)s)"),
                         default=False,
                         action='store_true')
+    parser.add_argument("-p", "--patch", dest="patches",
+                        help=("include the following patch when building"),
+                        default=[],
+                        action='append')
     args = parser.parse_args()
     capture = True
     if args.verbose:
@@ -192,16 +198,17 @@
     # Form the spec file to be used
     tmpl_fn = util.abs_join(find_root(), 'packages',
                             'redhat', 'cloud-init.spec.in')
-    contents = generate_spec_contents(args, tmpl_fn,
+    contents = generate_spec_contents(args, tmpl_fn, root_dir,
                                       os.path.basename(archive_fn))
     spec_fn = util.abs_join(root_dir, 'cloud-init.spec')
     util.write_file(spec_fn, contents)
     print("Created spec file at %r" % (spec_fn))
+    for p in args.patches:
+        util.copy(p, util.abs_join(arc_dir, os.path.basename(p)))
 
     # Now build it!
     print("Running 'rpmbuild' in %r" % (root_dir))
-    cmd = ['rpmbuild', '--clean',
-           '-ba', spec_fn]
+    cmd = ['rpmbuild', '-ba', spec_fn]
     util.subp(cmd, capture=capture)
 
     # Copy the items built to our local dir

=== modified file 'packages/redhat/cloud-init.spec.in'
--- packages/redhat/cloud-init.spec.in	2012-07-09 21:09:04 +0000
+++ packages/redhat/cloud-init.spec.in	2012-09-28 18:11:24 +0000
@@ -5,6 +5,10 @@
 # Or: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets
 # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html
 
+#for $d in $defines
+%define ${d}
+#end for
+
 Name:           cloud-init
 Version:        ${version}
 Release:        ${release}%{?dist}
@@ -36,6 +40,13 @@
 Requires:       ${r}
 #end for
 
+# Custom patches
+#set $size = 0
+#for $p in $patches
+Patch${size}: $p
+#set $size += 1
+#end for
+
 #if $sysvinit
 Requires(post):       chkconfig
 Requires(postun):     initscripts
@@ -58,6 +69,13 @@
 %prep
 %setup -q -n %{name}-%{version}~${release}
 
+# Custom patches activation
+#set $size = 0
+#for $p in $patches
+%patch${size} -p1
+#set $size += 1
+#end for
+
 %build
 %{__python} setup.py build