summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-02-01 14:56:14 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-02-01 14:56:14 +0100
commitebd751a0a30522160af8d4e3e44cf88382c1567c (patch)
tree5dc3776fdaa3a01de8015b8f1ab12bbc03efc432 /redhat/build
parent2684939e2168b39190416af1601f3e1830771064 (diff)
downloadtde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.tar.gz
tde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.zip
RPM Packaging: update build scripts
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/install_rpm_package.sh6
-rwxr-xr-xredhat/build/update_repository.sh8
2 files changed, 13 insertions, 1 deletions
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 8c9973037..13daa1258 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -1,5 +1,11 @@
#!/bin/bash
+LOCKFILE="/tmp/lock.${0##*/}"
+while [ -e "${LOCKFILE}" ]; do
+ echo "Waiting for lock file '${LOCKFILE}' to vanish."
+ sleep 3
+done
+
PKGCATEGORY="${1%%/*}"
PKGNAME="${1##*/}"
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index bdd2f0f4f..8ffeabe93 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -2,6 +2,12 @@
WORKERS=$(getconf _NPROCESSORS_ONLN)
+LOCKFILE="/tmp/lock.${0##*/}"
+while [ -e "${LOCKFILE}" ]; do
+ echo "Waiting for lock file '${LOCKFILE}' to vanish."
+ sleep 3
+done
+
if [ -x /usr/sbin/urpmi ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
elif [ -x /usr/bin/zypper ]; then
@@ -12,4 +18,4 @@ elif [ -x /usr/bin/apt-get ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
fi
-eval ${REPOUPDATE} || exit 1
+eval "${REPOUPDATE}; rm -f ${LOCKFILE}"|| exit 1