[X2Go-Commits] [buildscripts] 01/01: Avoid --local when cloning build repositories, the --local option will create hard-links object/ref files pointing to the originating Git repository. However, we want completely disjunctive copies.
git-admin at x2go.org
git-admin at x2go.org
Fri Jun 27 13:37:25 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit a4abf4402a69dba597868a4b51ca2966a1cac64e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 27 13:36:04 2014 +0200
Avoid --local when cloning build repositories, the --local option will create hard-links object/ref files pointing to the originating Git repository. However, we want completely disjunctive copies.
---
bin/build-deb-package | 3 ++-
bin/build-rpm-package | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/bin/build-deb-package b/bin/build-deb-package
index a619871..0ac9f1d 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -192,7 +192,7 @@ build_packages() {
chmod 2770 "$TEMP_DIR" -Rf
cd "$PROJECT_DIR"
- git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
+ git clone "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
cd "$TEMP_DIR/$PROJECT"
git checkout $CHECKOUT || git checkout master
find $PROJECT_DIR/../ -type f -maxdepth 0 -mindepth 0 | grep $PROJECT_*.orig.tar.gz &>/dev/null && cp $PROJECT_DIR/../$PROJECT_*.orig.tar.gz ..
@@ -329,6 +329,7 @@ wait_for_lock() {
lock_workspace() {
wait_for_lock
+
echo $$ > $LOCK_FILE
}
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 96886fb..c1efa60 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -168,7 +168,7 @@ build_packages() {
chmod 2770 "$TEMP_DIR" -Rf
cd "$PROJECT_DIR"
- git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
+ git clone "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
cd $TEMP_DIR
GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null)
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
More information about the x2go-commits
mailing list