summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackages/brpm7
-rw-r--r--packages/redhat/cloud-init.spec.in7
2 files changed, 14 insertions, 0 deletions
diff --git a/packages/brpm b/packages/brpm
index 77de0cf2..616ae021 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -149,6 +149,7 @@ def generate_spec_contents(args, tmpl_fn, arc_fn):
subs['systemd'] = False
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 +165,10 @@ def main():
" (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:
@@ -197,6 +202,8 @@ def main():
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))
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 35b27beb..6604b1ac 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -36,6 +36,13 @@ Requires: shadow-utils
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