From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 13 Aug 2014 01:23:15 +0000 (-0700)
Subject: build-rpms.sh: copy "*.patch" from topdir into SOURCES
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12%2Fhead;p=ceph-build.git

build-rpms.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_rpms.sh b/build_rpms.sh
index cd4ed8ba..6093d62b 100755
--- a/build_rpms.sh
+++ b/build_rpms.sh
@@ -25,6 +25,7 @@ BUILDAREA=./rpm/$dist
 mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
 cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
 cp -a ceph.spec ${BUILDAREA}/SPECS/.
+cp -a *.patch ${BUILDAREA}/SOURCES/. || true
 
 # Build RPMs
 BUILDAREA=`readlink -fn ${BUILDAREA}`   ### rpm wants absolute path