From 62db4481b263c796cbed90902c28d5f4b2a78b69 Mon Sep 17 00:00:00 2001
From: Julien Bonjean <julien@bonjean.info>
Date: Thu, 14 May 2009 16:25:17 -0400
Subject: [PATCH] [#1422] Moved distribution update to specific file
---
tools/build-system/launch-build-machine.sh | 7 +------
tools/build-system/remote/build-package-ubuntu.sh | 6 +++++-
tools/build-system/sfl-git-dch.sh | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index 874e68abcc..adcf2320e8 100755
--- a/tools/build-system/launch-build-machine.sh
+++ b/tools/build-system/launch-build-machine.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-04-20
-# Last Modified: 2009-05-14 16:16:49 -0400
+# Last Modified: 2009-05-14 16:24:40 -0400
#####################################################
#
@@ -208,7 +208,6 @@ if [ ${DO_PREPARE} ]; then
echo "Clone repository"
git clone ssh://repos-sflphone-git@sflphone.org/~/sflphone.git ${REPOSITORY_DIR} >/dev/null 2>&1
-
if [ "$?" -ne "0" ]; then
echo " !! Cannot clone repository"
exit -1
@@ -303,10 +302,6 @@ if [ ${DO_MAIN_LOOP} ]; then
sleep ${STARTUP_WAIT}
fi
- echo "Doing updates"
- ${SSH_BASE} 'sudo apt-get update >/dev/null'
- ${SSH_BASE} 'sudo apt-get upgrade -y >/dev/null'
-
echo "Clean remote directory"
${SSH_BASE} "rm -rf ${REMOTE_DEPLOY_DIR} 2>/dev/null"
diff --git a/tools/build-system/remote/build-package-ubuntu.sh b/tools/build-system/remote/build-package-ubuntu.sh
index 8228b78e29..b16a3b5418 100755
--- a/tools/build-system/remote/build-package-ubuntu.sh
+++ b/tools/build-system/remote/build-package-ubuntu.sh
@@ -52,7 +52,7 @@ if [ "$?" -ne "0" ]; then
exit -1
fi
-# decompress reppository
+# decompress repository
echo "Untar repository"
cd ${BUILD_DIR} && tar xf ${REPOSITORY_ARCHIVE}
@@ -82,6 +82,10 @@ exec 2>&3
echo "SFLPhone version is ${VER}"
+echo "Do updates"
+sudo apt-get update >/dev/null
+sudo apt-get upgrade -y >/dev/null
+
# generate the changelog, according to the distribution
echo "Generate changelogs"
sed -i 's/SYSTEM/'${OS_VERSION}'/g' ${REPOSITORY_SFLPHONE_COMMON_DIR}/debian/changelog && \
diff --git a/tools/build-system/sfl-git-dch.sh b/tools/build-system/sfl-git-dch.sh
index cae9803dca..67bf9012ee 100755
--- a/tools/build-system/sfl-git-dch.sh
+++ b/tools/build-system/sfl-git-dch.sh
@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info)
#
# Creation Date: 2009-05-13
-# Last Modified: 2009-05-14 16:13:47 -0400
+# Last Modified: 2009-05-14 16:24:44 -0400
#####################################################
# set -x
--
GitLab