commit a674281947f3ec52ae22176900baa2ad62e678cc
Author: Elan Ruusamäe <[email protected]>
Date: Thu Dec 15 10:34:42 2016 +0200
DRY: move cleanup-la to standalone script
cleanbuild | 3 +--
docker-builder.sh | 8 +-------
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/cleanbuild b/cleanbuild
index e7da70a..3502a74 100755
--- a/cleanbuild
+++ b/cleanbuild
@@ -491,8 +491,7 @@ fi
while true; do
info "Building $build_pkg in $CHNAME"
rebuilddb
- find $CHDIR/usr/lib{,64} -name "*.la" -print0 | \
- xargs -0 -r sed -i -e "s@dependency_libs=.*@dependency_libs='
'@"
+ ./cleanup-la $CHDIR
buildlog="buildlogs/$build_pkg"
if [ -r $buildlog ]; then
i=1
diff --git a/docker-builder.sh b/docker-builder.sh
index 71bbf54..d88e580 100755
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -42,13 +42,7 @@ git_tag=$(GIT_DIR=$topdir/packages/$package/.git git
describe --tags --always)
buildlog=${git_tag#auto/*/}.log
# remove .la dependencies
-cat > $topdir/bin/cleanup-la <<'EOF'
-#!/bin/sh
-find /usr/lib{,64} -name "*.la" -print0 | xargs -0 grep -El
"dependency_libs='.+'"
-exit 0
-EOF
-chmod +x $topdir/bin/cleanup-la
-docker exec $name sh -xc '~/rpm/bin/cleanup-la'
+docker exec $name cleanbuild/cleanup-la
while true; do
docker exec $name cleanbuild/teeboth cleanbuild/$buildlog builder -nn
-bb -R $package && rc=$? || rc=$?
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/a674281947f3ec52ae22176900baa2ad62e678cc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
