X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=d7c2bae816ec4c5028adbdd58228b7430acffe51;hb=e4069fdeaf5f672c866f3c9e5eb489284790c36c;hp=114bafd3d0e8c32c63edb59240afbf20d370804f;hpb=fd251de13cea2b9d8f3080a10d9d3f278100a9ae;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 114bafd..d7c2bae 100644
--- a/Makefile
+++ b/Makefile
@@ -9,38 +9,34 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-# call with either WITH_SYSTEMD=true or WITH_INIT=true
-initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
-####################
-lib: forward_api_calls
-	python setup-lib.py build
-
-vs: 
-	python setup-vs.py build
+PYTHON = python3
 
-lxc: 
-	python setup-lxc.py build
+####################
+all: forward_api_calls
+	$(PYTHON) setup.py build
 
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
 	strip $@
 
 #################### install
-install-lib: install-miscell install-startup
-	python setup-lib.py install \
+install: install-miscell install-startup
+	$(PYTHON) setup.py install \
 		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-scripts=$(DESTDIR)/$(bindir)
+		--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 
+# 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 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
@@ -50,49 +46,22 @@ install-miscell:
 	rsync -av sliver-systemd/ $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
 	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-systemd/
 
-# this now is for the startup of nodemanager itself
-ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
-endif
-ifneq "$(WITH_INIT)" ""
-install-startup: install-init
-endif
-
-install-init:
-	mkdir -p $(DESTDIR)$(initdir)
-	chmod 755 initscripts/*
-	rsync -av initscripts/ $(DESTDIR)$(initdir)/
 
 install-systemd:
 	mkdir -p $(DESTDIR)/$(systemddir)
 	rsync -av systemd/ $(DESTDIR)/$(systemddir)
 
-install-vs:
-	python setup-vs.py install \
-		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-scripts=$(DESTDIR)/$(bindir)
-	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
-
-install-lxc:
-	python setup-lxc.py install \
-		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-		--install-scripts=$(DESTDIR)/$(bindir)
-	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
-
 #################### clean
 clean:
-	python setup-lib.py clean
-	python setup-vs.py clean
-	python setup-lxc.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
 
@@ -110,7 +79,7 @@ tags:
 # and then just run
 # $ make sync
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
+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)
@@ -120,8 +89,11 @@ NODEURL:=root@$(NODE):/
 endif
 
 # this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
-# keep this in sync with setup-vs.spec
-LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
+# 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
 
@@ -134,11 +106,9 @@ else
 	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 	@echo WARNING : this target might not be very reliable - use with care
 	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	+$(RSYNC) --exclude sshsh $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
-	+$(RSYNC) ./sshsh $(NODEURL)/bin/
-#	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+	+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
 	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
-#	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 endif
 
 ### fetching the key
@@ -161,3 +131,11 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
+
+########## exp. too
+SLICE=inri_sl1
+
+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"