[projects/cleanbuild] use different macro to skip buildroot cleanup

glen glen at pld-linux.org
Sun Dec 30 21:41:57 CET 2018


commit 6203a84cc53f9a74020c6ddd003af15bbad90903
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Sep 26 14:51:10 2018 +0300

    use different macro to skip buildroot cleanup
    
    otherwise there's build error:
    
    error: Could not open %files file /home/builder/rpm/BUILD/haproxy-1.8.14/debugfiles.list: No such file or directory

 cleanbuild-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/cleanbuild-docker.sh b/cleanbuild-docker.sh
index f3d645c..43e550c 100755
--- a/cleanbuild-docker.sh
+++ b/cleanbuild-docker.sh
@@ -57,7 +57,7 @@ while true; do
 	docker exec --user=root $name cleanbuild/findunusedbr -c / rpm/packages/$package/$package.spec
 
 	# actual build
-	docker exec $name cleanbuild/teeboth $buildlog builder -nn -bb $package --define 'clean exit 0' && rc=$? || rc=$?
+	docker exec $name cleanbuild/teeboth $buildlog builder -nn -bb $package --define '__spec_clean_body %{nil}' && rc=$? || rc=$?
 
 	findbr=$package.findbr.log
 	builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/dd308d9f6069710bc67d8c27c7ae8b66e00fe2dd



More information about the pld-cvs-commit mailing list