summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-12-11 10:49:46 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-12-11 10:49:46 +0100
commit75b78d6725e58605484d063929f082702feb179e (patch)
tree0cf26464cb65635635603c9b31ea2d874b1cea7f
parentdbe225bac79d2c039732e4b585edfa429d1dd817 (diff)
downloadbuildscripts-75b78d6725e58605484d063929f082702feb179e.tar.gz
buildscripts-75b78d6725e58605484d063929f082702feb179e.tar.bz2
buildscripts-75b78d6725e58605484d063929f082702feb179e.zip
wait for build if arch is i386, use ps instead of chrooted-mounted /proc
-rwxr-xr-xbin/build-rpm-package6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 31d5efb..d93928c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -256,7 +256,7 @@ build_packages() {
elif [ "x$l_DIST" = "xsles" ]; then
DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
fi
- while mount | grep /var/cache/obs-build/${l_DIST}/${l_CODENAME}/x86_64/proc 1>/dev/null; do
+ while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/" | grep "sudo obs"; do
echo "Waiting for some other build to finish..."
sleep 30
done
@@ -301,6 +301,10 @@ build_packages() {
elif [ "x$l_DIST" = "xsles" ]; then
DOWNLOAD_URL=$(echo "$SLES_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/")
fi
+ while ps ax | grep -E "build.*/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/" | grep "sudo obs"; do
+ echo "Waiting for some other build to finish..."
+ sleep 30
+ done
if linux32 sudo obs-build \
--nosignature \
--repo "http://packages.x2go.org/${l_DIST}/$l_CODENAME/extras" \