X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=Makefile;h=d7c2bae816ec4c5028adbdd58228b7430acffe51;hp=6069f413493a0f9141185f03a144c3486d0f0eac;hb=HEAD;hpb=e1d8605cc9657565449010b1975596af5d7e0c96

diff --git a/Makefile b/Makefile
index 6069f41..d7c2bae 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,13 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
-# call with either WITH_SYSTEMD=true or WITH_INIT=true
-# otherwise we try to guess some reasonable default
-ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
-ifeq "$(wildcard $systemddir/*)" ""
-WITH_INIT=true
-else
-WITH_SYSTEMD=true
-endif
-endif
+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 $@ $?
@@ -31,18 +23,20 @@ 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)
+		--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
@@ -52,18 +46,7 @@ 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)
@@ -71,43 +54,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: DESTDIR=debian/tmp
-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
 
@@ -125,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)
@@ -135,8 +89,8 @@ 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
@@ -153,7 +107,6 @@ else
 	@echo WARNING : this target might not be very reliable - use with care
 	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 	+$(RSYNC) $(LXC_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
@@ -178,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"