[projects/cleanbuild] fix findusedbr to setup timestamps on actually installed packages

[glen]

commit f5e5a14be45a4c3bb0a9b61887cab164c4c3fb72
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Oct 17 20:58:34 2017 +0300

    fix findusedbr to setup timestamps on actually installed packages
    
    requires rpm-build-tools-4.9-4

 cleanbuild-docker.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/cleanbuild-docker.sh b/cleanbuild-docker.sh
index 1775014..854140e 100755
--- a/cleanbuild-docker.sh
+++ b/cleanbuild-docker.sh
@@ -39,7 +39,7 @@ if [ -d $topdir/packages/$package ]; then
 	# chown, as it might be different owner (root) modified outside container
 	docker exec --user=root $name chown -R builder:builder rpm/packages/$package
 fi
-docker exec $name builder -g -R $package
+docker exec $name builder -g $package
 
 # prevent network access like pld builders do
 docker exec --user=root $name setfacl -m u:builder:--- /etc/resolv.conf
@@ -47,15 +47,18 @@ docker exec --user=root $name setfacl -m u:builder:--- /etc/resolv.conf
 git_tag=$(GIT_DIR=$topdir/packages/$package/.git git describe --tags --always)
 buildlog=rpm/logs/${git_tag#auto/*/}.log
 
-# remove .la dependencies
-docker exec --user=root $name cleanbuild/cleanup-la
 
 while true; do
-	docker exec $name cleanbuild/teeboth $buildlog builder -nn -bb -R $package --define 'clean exit 0' && rc=$? || rc=$?
-
+	# install deps
+	docker exec $name builder -g -nn -R $package
+	# remove .la dependencies
+	docker exec --user=root $name cleanbuild/cleanup-la
 	# reset findunusedbr state after deps install
 	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=$?
+
 	findbr=$package.findbr.log
 	builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
 	if [ -z "$builddir" ]; then
================================================================

---- gitweb:

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