Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure

diff --git a/scripts/5.0-rc12.sh b/scripts/5.0-rc12.sh
new file mode 100755 (executable)
index 0000000..233e41a
--- /dev/null
+++ b/scripts/5.0-rc12.sh
@@ -0,0 +1,9 @@
+function liquid () { hostname | grep liquid >& /dev/null ; }
+function reed () { hostname | grep reed >& /dev/null ; }
+function velvet () { hostname | grep velvet >& /dev/null ; }
+
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc12 -d onelab -f f8 -p linux64 -b onelab--5.0-rc12-f8-64
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc12 -d onelab -f f12 -p linux64 -b onelab--5.0-rc12-f12-64 -t onelab-k27-tags.mk
+
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc12 -d onelab -f f8 -p linux32 -b onelab--5.0-rc12-f8-32
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc12 -d onelab -f f12 -p linux32 -b onelab--5.0-rc12-f12-32 -t onelab-k27-tags.mk

diff --git a/scripts/5.0-rc13.sh b/scripts/5.0-rc13.sh
new file mode 100755 (executable)
index 0000000..f1056fa
--- /dev/null
+++ b/scripts/5.0-rc13.sh
@@ -0,0 +1,9 @@
+function liquid () { hostname | grep liquid >& /dev/null ; }
+function reed () { hostname | grep reed >& /dev/null ; }
+function velvet () { hostname | grep velvet >& /dev/null ; }
+
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc13 -d onelab -f f8 -p linux64 -b onelab--5.0-rc13-f8-64
+reed && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc13 -d onelab -f f12 -p linux64 -b onelab--5.0-rc13-f12-64 -t onelab-k27-tags.mk
+
+velvet && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc13 -d onelab -f f8 -p linux32 -b onelab--5.0-rc13-f8-32
+liquid && /root/bin/vbuild-nightly.sh -m build@onelab.eu -s git://git.onelab.eu/build@5.0-rc13 -d onelab -f f12 -p linux32 -b onelab--5.0-rc13-f12-32 -t onelab-k27-tags.mk

diff --git a/scripts/git-AUTHORS b/scripts/git-AUTHORS
new file mode 100644 (file)
index 0000000..b1d4fad
--- /dev/null
+++ b/scripts/git-AUTHORS
@@ -0,0 +1,52 @@
+root = root <root@planet-lab.org>
+deisenst = David E. Eisenstat <deisenst@cs.princeton.edu>
+acb = Andy Bavier <acb@cs.princeton.edu>
+alk = Aaron Klingaman <alk@cs.princeton.edu>
+alk-pl_rpm = Aaron Klingaman <alk@cs.princeton.edu>
+alk-alpina = Aaron Klingaman <alk@cs.princeton.edu>
+anil = Anil-Kumar Vengalil <Anil-Kumar.Vengalil@sophia.inria.fr>
+bakers = Scott Baker <bakers@cs.arizona.edu>
+baris = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+Baris Metin = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+Baris = Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
+caglar = S.Çağlar Onur <caglar@cs.princeton.edu>
+carrano = Ricardo Carrano <carrano@laptop.org>
+ckong = Colin Kong <ckong@cs.princeton.edu>
+dhozac = Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
+ejaffe = Elliot Jaffe <elliot.jaffe@mail.huji.ac.il>
+faiyaza = Faiyaz Ahmed <faiyaza@cs.princeton.edu>
+feamster = Nick Feamster <feamster@cc.gatech.edu>
+giovanni = Giovanni Gherdovich <Giovanni.Gherdovich@sophia.inria.fr>
+guthemberg = Guthemberg Silvestre <guthemberg.silvestre@lip6.fr>
+herbert = Herbert Pötzl <herbert@13thfloor.at>
+jduarte = Jairo Lino Duarte <jduarte@ic.uff.br>
+jkarlin = Josh Karlin <jkarlin@bbn.com>
+jrex = Jennifer Rexford <jrex@cs.princeton.edu>
+kcwebb = Kevin Webb <kcwebb@ucsd.edu>
+kyoungso = KyoungSoo Park <kyoungso@cs.princeton.edu>
+llp = Larry Peterson <llp@cs.princeton.edu>
+lniccolini = Luca Niccolini <luca.niccolini@quantavis.com>
+marta = Marta Carbone <marta@prova.iet.unipi.it>
+martinm = Martin Makowiecki <martinm@cs.princeton.edu>
+mef = Marc Fiuczynski <mef@cs.princeton.edu>
+mff = Mary Fernández <mff@research.att.com>
+mhw = Michael Wawrzoniak <mhw@cs.princeton.edu>
+mlhuang = Mark Huang <mlhuang@cs.princeton.edu>
+mlh-pl_rpm = Mark Huang <mlhuang@cs.princeton.edu>
+msun = Mike Sun <msun@gatech.edu>
+nakao = Akihiro Nakao <nakao@iii.u-tokyo.ac.jp>
+rizzo = Luigi Rizzo <rizzo@iet.unipi.it>
+rmoran = Reed Moran <rmoran@cs.princeton.edu>
+sapanb = Sapan Bhatia <sapanb@cs.princeton.edu>
+scott = Scott Karlin <scott@cs.princeton.edu>
+smuir = Steve Muir <smuir@cs.princeton.edu>
+soltesz = Stephen Soltesz <soltesz@cs.princeton.edu>
+ssevinc = Soner Sevinc <ssevinc@cs.princeton.edu>
+thierry = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+Thierry Parmentelat = Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
+tmack = Tony Mack <tmack@cs.princeton.edu>
+tmitchell = Tom Mitchell <tmitchel@bbn.com>
+valas = Vytautas Valancius <valas@gatech.edu>
+xcuvellier = Xavier Cuvellier <Xavier.Cuvellier@lip6.fr>
+mchaoui = mchaoui
+(no author) = Planet-Lab Support <support@planet-lab.org>
\ No newline at end of file

diff --git a/scripts/git-check.sh b/scripts/git-check.sh
index c15c3c4..4593317 100755 (executable)
--- a/scripts/git-check.sh
+++ b/scripts/git-check.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+MLIST="git@onelab.eu"
+
 cd /git
 
 gitwebfiles="git-favicon.png git-logo.png gitweb.cgi gitweb.css"
@@ -61,9 +63,9 @@ function check_configs () {
        git config core.sharedrepository >& /dev/null || { git config core.sharedrepository true; echo -n "sharedrepository "; }
        git config daemon.uploadpack >& /dev/null || { git config daemon.uploadpack true; echo -n "uploadpack "; }
        git config daemon.uploadarch >& /dev/null || { git config daemon.uploadarch true; echo -n "uploadarch "; }
-       git config hooks.mailinglist >& /dev/null || { git config hooks.mailinglist git@onelab.eu; echo -n "mailinglist "; }
-        git config hooks.announcelist >& /dev/null  || { git config hooks.announcelist  git@onelab.eu; echo -n "announcelist "; }
-        git config hooks.envelopesender >& /dev/null  || { git config hooks.envelopesender  git@onelab.eu; echo -n "envelopesender "; }
+       (git config hooks.mailinglist|grep $MLIST) >& /dev/null || { git config hooks.mailinglist $MLIST; echo -n "mailinglist "; }
+        (git config hooks.announcelist|grep $MLIST) >& /dev/null || { git config hooks.announcelist $MLIST; echo -n "announcelist "; }
+        (git config hooks.envelopesender|grep $MLIST) >& /dev/null || { git config hooks.envelopesender $MLIST; echo -n "envelopesender "; }
         git config hooks.emailprefix >& /dev/null || { git config hooks.emailprefix ''; echo -n "emailprefix "; }
        cd - >& /dev/null
     done
@@ -78,7 +80,7 @@ function check_hooks () {
        git=${b}.git
        echo -n "$git "
        # standard version is in /usr/share/doc/git-1.5.5.6/hooks/post-receive-email
-       (cd $git/hooks; cp -f /root/bin/post-receive-email-with-diffs post-receive )
+        (cd $git/hooks; cp -f /root/bin/post-receive-email-with-diffs post-receive; chmod 755 post-receive )
     done
     echo ""
 }

diff --git a/scripts/git-clone-svn.sh b/scripts/git-clone-svn.sh
index bdd86f6..bfa3e01 100755 (executable)
--- a/scripts/git-clone-svn.sh
+++ b/scripts/git-clone-svn.sh
@@ -9,6 +9,8 @@
 # so run locally at princeton
 SVNROOT="file:///svn"
 
+AUTHORS=$(dirname $0)/git-AUTHORS
+
 function clone () {
     for arg in "$@" ; do
        SVN_MODULE=$(basename $arg)
@@ -22,7 +24,7 @@ function clone () {
 
        mkdir -p $GIT_WORKDIR
        pushd $GIT_WORKDIR
-       svn2git $SVN_PATH
+        svn2git $SVN_PATH --authors $AUTHORS
        popd
 
         mv ${GIT_WORKDIR}/.git ${GIT_REPO}