]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: giant has some unpackaged files
authorLoic Dachary <ldachary@redhat.com>
Wed, 11 Nov 2015 20:24:18 +0000 (21:24 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 12 Nov 2015 11:32:54 +0000 (12:32 +0100)
And there really is nothing we can do about it expect ignore them.

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

index 4abb16a21c44830e145072aec8eec5fd94968552..a86a046c17601337c1782d3ac5c6c51ca81b768a 100755 (executable)
@@ -105,7 +105,13 @@ function build_package() {
         ccache=$(echo /usr/lib*/ccache)
         # Build RPMs
         buildarea=`readlink -fn ${releasedir}`   ### rpm wants absolute path
-        PATH=$ccache:$PATH rpmbuild -ba --define "_topdir ${buildarea}" ceph.spec
+        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
     )
 }