reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[bootmanager.git] / Makefile

diff --git a/Makefile b/Makefile
index c2540fa..f7add42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,15 @@
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
+PLCHOSTLXC ?= lxc64-1.pl.sophia.inria.fr
 
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUESTNAME)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
 else
 ifdef PLCHOSTVS
 SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
@@ -42,11 +42,22 @@ ifeq (,$(SSHURL))
 else
        $(SSHCOMMAND) mkdir -p /usr/share/bootmanager/$(DEPLOYMENT)
        +$(RSYNC) build.sh source $(SSHURL)/usr/share/bootmanager/$(DEPLOYMENT)
-       $(SSHCOMMAND) service plc start bootmanager
+       $(SSHCOMMAND) /etc/plc.d/bootmanager start
 endif
 
 ##########
 tags:
-       find . -type f | egrep -v 'TAGS|/\.svn/|\.git/|~$$' | xargs etags
+       git ls-files | xargs etags
 
 .PHONY: tags
+
+##########
+# this one is for overwriting the code in /tmp/source on a node
+# that is in debug mode
+ifndef NODE
+debugmode:
+       echo run make debugmode NODE=a-real-ple-node
+else
+debugmode:
+       rsync -av -e 'ssh -i /Users/parmentelat/.ssh/ple_debug.rsa' ./source/ root@$(NODE):/tmp/source/
+endif