]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: fix RPM generation script to support opensuse spec file
authorRicardo Dias <rdias@suse.com>
Fri, 1 Jul 2016 09:16:07 +0000 (10:16 +0100)
committerNathan Cutler <ncutler@suse.com>
Thu, 1 Sep 2016 15:48:58 +0000 (17:48 +0200)
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 4692f995ba6967796d5dd2f5fd85fde8705a1ccc)
(cherry picked from commit 494b623602f0b09f10d788e6de6ddcf8d92700e3)

tasks/buildpackages/make-rpm.sh

index f44efc432076f88537cecea6776d1c59b0587199..fd264b09631c58b58c9188afddbe0001decb1226 100755 (executable)
@@ -87,7 +87,7 @@ function build_package() {
     # options (otherwise parts of the source tree will be left out).
     #
     if [ "$suse" = true ] ; then
-        sudo zypper -n install bzip2 
+        sudo zypper -n install bzip2
     else
         sudo yum install -y bzip2
     fi
@@ -118,6 +118,10 @@ function build_package() {
         cd ${buildarea}/SPECS
         ccache=$(echo /usr/lib*/ccache)
         # Build RPMs
+        if [ "$suse" = true ]; then
+          sed -i -e '0,/%package/s//%debug_package\n&/' \
+                  -e 's/%{epoch}://g' -e '/^Epoch:/d' ceph.spec
+        fi
         buildarea=`readlink -fn ${releasedir}`   ### rpm wants absolute path
         PATH=$ccache:$PATH rpmbuild -ba --define "_unpackaged_files_terminate_build 0" --define "_topdir ${buildarea}" ceph.spec
     )