]> git.pld-linux.org Git - projects/cleanbuild.git/commitdiff
fix findusedbr to setup timestamps on actually installed packages
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 17 Oct 2017 17:58:34 +0000 (20:58 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 17 Oct 2017 17:58:56 +0000 (20:58 +0300)
requires rpm-build-tools-4.9-4

cleanbuild-docker.sh

index 1775014b06ce08c5119ad4a1890b23772e05a5ad..854140eab35d81c96c8153aa6be1ade0ef7d25ae 100755 (executable)
@@ -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
This page took 0.569845 seconds and 4 git commands to generate.