From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 13 Aug 2014 01:21:12 +0000 (-0700)
Subject: build-ceph-rpm.sh: copy "*.patch" from topdir into SOURCES
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=43a57ce249201f0e3e960bdc601d12c39fdc884a;p=autobuild-ceph.git

build-ceph-rpm.sh: copy "*.patch" from topdir into SOURCES

This allows patches to be applied when building the RPMs; the addition
of the ceph patch to disable /etc/init.d/ceph from autostarting Ceph
daemons leads to the desire for a .patch file, conditionally applied
by the .spec.  See the Ceph sources.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index 85c8d28..e197552 100755
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -86,6 +86,7 @@ mkdir -p ${BUILDAREA}/SPECS
 mkdir -p ${BUILDAREA}/RPMS
 mkdir -p ${BUILDAREA}/BUILD
 cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
+cp -a *.patch ${BUILDAREA}/SOURCES || true
 
 # If this is a release candidate, identified by having -rc[0-9] appended to
 # the version number, then fix up the generated rpm spec file by moving the