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

[nodemanager.git] / Makefile

diff --git a/Makefile b/Makefile
index c9e0d91..d7c2bae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,45 +5,81 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.2 2006/11/13 20:04:44 mlhuang Exp $
-#
 
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
+systemddir := /usr/lib/systemd/system
+
+PYTHON = python3
 
+####################
 all: forward_api_calls
-       python setup.py build
+       $(PYTHON) setup.py build
 
 forward_api_calls: forward_api_calls.c
        $(CC) -Wall -Os -o $@ $?
        strip $@
 
-install:
-       python setup.py install \
-           --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-           --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-           --install-scripts=$(DESTDIR)/$(bindir)
-       install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
-
+#################### install
+install: install-miscell install-startup
+       $(PYTHON) setup.py install \
+               --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+               --install-platlib=$(DESTDIR)/$(datadir)/NodeManager
+       chmod +x $(DESTDIR)/$(datadir)/NodeManager/conf_files.py
+
+
+# might be better in setup.py ?
+# NOTE: the sliver-initscripts/ and sliver-systemd stuff, being, well, for slivers,
+# need to ship on all nodes regardless of WITH_INIT and WITH_SYSTEMD that
+# impacts how nodemanager itself gets started
+install-miscell:
+       install -D -m 755 forward_api_calls $(DESTDIR)/$(bindir)/forward_api_calls
+       install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+       install -D -m 644 /dev/null $(DESTDIR)/etc/sysconfig/nodemanager
+       install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
+       install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
+       mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
+       rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+       chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+       mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd
+       rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
+       chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
+
+install-startup: install-systemd
+
+install-systemd:
+       mkdir -p $(DESTDIR)/$(systemddir)
+       rsync -av systemd/ $(DESTDIR)/$(systemddir)
+
+#################### clean
 clean:
-       python setup.py clean
+       $(PYTHON) setup.py clean
        rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
 
-##########
+################################################## devel-oriented
 tags:
-       (find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
+       git ls-files | xargs etags
 
 .PHONY: tags
 
 ########## sync
 # for use with the test framework; push local stuff on a test node
-# make sync NODE=vnode01.inria.fr
-# specify TESTMASTER and BUILD if the key is not available yet
-
-LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
+# howto use: go on testmaster in the build you want to use and just run
+# $ exp
+# cut'n paste the result in a terminal in your working dir, e.g. (although all are not required)
+# $ export BUILD=2013.07.02--lxc18
+# $ export PLCHOSTLXC=gotan.pl.sophia.inria.fr
+# $ export GUESTNAME=2013.07.02--lxc18-1-vplc01
+# $ export GUESTHOSTNAME=vplc01.pl.sophia.inria.fr
+# $ export KVMHOST=kvm64-6.pl.sophia.inria.fr
+# $ export NODE=vnode01.pl.sophia.inria.fr
+# and then just run
+# $ make sync
+
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc'
 RSYNC_EXCLUDES         := --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN     := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync -e "ssh -i $(NODE).key.rsa" -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
@@ -52,15 +88,27 @@ ifdef NODE
 NODEURL:=root@$(NODE):/
 endif
 
-sync: $(NODE).key.rsa
+# this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
+# WARNING: keep this in sync with setup.spec
+LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py --exclude drl.py
+
+# run with make SYNC_RESTART=false if you want to skip restarting nm
+SYNC_RESTART=true
+
+sync:synclxc
+
+synclxc: $(NODE).key.rsa
 ifeq (,$(NODEURL))
        @echo "sync: You must define NODE on the command line"
        @echo "  e.g. make sync NODE=vnode01.inria.fr"
        @exit 1
 else
-       +$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
-       +$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
-       ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+       @echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+       @echo WARNING : this target might not be very reliable - use with care
+       @echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+       +$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
+       +$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+       -$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 endif
 
 ### fetching the key
@@ -84,15 +132,10 @@ else
        +scp $(KEYURL) $@
 endif
 
-### utility - find out the node name for a given BUILD
-
-ifdef BUILD
-NODEIPCOMMAND:=ssh root@$(TESTMASTER) cat $(BUILD)/arg-ips-node
-endif
+########## exp. too
+SLICE=inri_sl1
 
-nodename:
-ifeq (,$(NODEIPCOMMAND))
-       @echo "nodename: You must define TESTMASTER and BUILD on the command line"
-else
-       $(NODEIPCOMMAND)
-endif
+syncvinit:
+       $(RSYNC) sliver-systemd/vinit.st* $(NODEURL)/vservers/$(SLICE)/usr/bin/
+       $(RSYNC) sliver-systemd/vinit.service $(NODEURL)/vservers/$(SLICE)/usr/lib/systemd/system/
+       echo "remember to run 'systemctl --system daemon-reload' within this slice"