]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: do not fails for unpackaged files
authorLoic Dachary <ldachary@redhat.com>
Thu, 12 Nov 2015 19:16:02 +0000 (20:16 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 12 Nov 2015 19:17:53 +0000 (20:17 +0100)
Older versions of Ceph have that problem failing would break all upgrade suites.

Signed-off-by: Loic Dachary <loic@dachary.org>
tasks/buildpackages/make-rpm.sh

index a86a046c17601337c1782d3ac5c6c51ca81b768a..7e5579980e6e51658da7663d06f6329a61941bff 100755 (executable)
@@ -105,13 +105,7 @@ function build_package() {
         ccache=$(echo /usr/lib*/ccache)
         # Build RPMs
         buildarea=`readlink -fn ${releasedir}`   ### rpm wants absolute path
-        local unpackaged
-        if echo $vers | grep 0.87 ; then # giant has unpackaged files
-            unpackaged='--define=_unpackaged_files_terminate_build 0'
-        else
-            unpackaged='--define=_unpackaged_files_terminate_build 1'
-        fi
-        PATH=$ccache:$PATH rpmbuild -ba "$unpackaged" --define "_topdir ${buildarea}" ceph.spec
+        PATH=$ccache:$PATH rpmbuild -ba --define "_unpackaged_files_terminate_build 0" --define "_topdir ${buildarea}" ceph.spec
     )
 }