X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=0b29c8469452f3b7bc0d4f91c4d296bb4095a8f1;hb=7b8fc390afd0349706c45c3ae970770cdf9dceae;hp=78e93b773ee094be651a8c8007e1451bd18b73d6;hpb=3ae0ff6424b515491ab698baa946b33947fac188;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 78e93b7..0b29c84 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ bindir := /usr/bin
 initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
+PYTHON = python3
+
 # call with either WITH_SYSTEMD=true or WITH_INIT=true
 # otherwise we try to guess some reasonable default
 ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
@@ -23,7 +25,7 @@ endif
 endif
 ####################
 all: forward_api_calls
-	python setup.py build
+	$(PYTHON) setup.py build
 
 forward_api_calls: forward_api_calls.c
 	$(CC) -Wall -Os -o $@ $?
@@ -31,18 +33,18 @@ forward_api_calls: forward_api_calls.c
 
 #################### install
 install: install-miscell install-startup
-	python setup.py install \
+	$(PYTHON) setup.py install \
 		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
 		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
 		--install-scripts=$(DESTDIR)/$(bindir)
 
 # 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 $(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
@@ -71,42 +73,14 @@ install-systemd:
 
 #################### clean
 clean:
-	python setup.py clean
+	$(PYTHON) setup.py clean
 	rm -f forward_api_calls *.pyc build
 
 .PHONY: all install clean
 
-#################### debian-related
-# This is called from the build with the following variables set 
-# (see build/Makefile and target_debian)
-# (.) RPMTARBALL
-# (.) RPMVERSION
-# (.) RPMRELEASE
-# (.) RPMNAME
-DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
-DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
-DATE=$(shell date -u +"%a, %d %b %Y %T")
-force:
-
-debian: forward_api_calls install debian/changelog debian.source debian.package
-
-debian/changelog: debian/changelog.in
-	sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
-
-debian.source: force 
-	rsync -a $(RPMTARBALL) $(DEBTARBALL)
-
-debian.package:
-	debuild --set-envvar PREFIX=/usr -uc -us -b
-
-debian.clean:
-	$(MAKE) -f debian/rules clean
-	rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
-	find . -name '*.pyc' -delete
-
 ################################################## devel-oriented
 tags:
-	(find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
+	git ls-files | xargs etags
 
 .PHONY: tags
 
@@ -124,7 +98,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)
@@ -134,8 +108,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
 
@@ -151,9 +128,29 @@ else
 	+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
 #	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
 	+$(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
 
+# this is for vs only, we need to exclude the lxc stuff that otherwise messes up everything on node
+# xxx keep this in sync with setup.spec
+VS_EXCLUDES= --exclude sliver_libvirt.py --exclude sliver_lxc.py --exclude cgroups.py --exclude coresched_lxc.py --exclude privatebridge.py
+
+syncvs: $(NODE).key.rsa
+ifeq (,$(NODEURL))
+	@echo "syncvs: You must define NODE on the command line"
+	@echo "  e.g. make sync NODE=vnode01.inria.fr"
+	@exit 1
+else
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	@echo WARNING : this target might not be very reliable - use with care
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	+$(RSYNC) $(VS_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+#	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
+endif
+
+
 ### fetching the key
 
 TESTMASTER ?= testmaster.onelab.eu
@@ -174,3 +171,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"