X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=6069f413493a0f9141185f03a144c3486d0f0eac;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hp=694ae929d3b9df1a9efa01a719bb1c20bc226d62;hpb=ca3702d15c6992bcb3779f4c9097db32f42dbfa1;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 694ae92..6069f41 100644
--- a/Makefile
+++ b/Makefile
@@ -9,55 +9,54 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-initdir=/etc/init.d
+initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
-####################
 # call with either WITH_SYSTEMD=true or WITH_INIT=true
-ifneq "$(WITH_SYSTEMD)" ""
-use_sytemd=true
+# otherwise we try to guess some reasonable default
+ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
+ifeq "$(wildcard $systemddir/*)" ""
+WITH_INIT=true
 else
-ifneq "$(WITH_INIT)" ""
-use_systemd=""
-else # if not set then try to guess
-use_systemd=$(bash -c 'type -p systemctl')
+WITH_SYSTEMD=true
 endif
 endif
-
 ####################
-lib: forward_api_calls
-	python setup-lib.py build
-
-vs: 
-	python setup-vs.py build
-
-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)
 
 # 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 -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 	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
-	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
 	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
-	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
-	chmod 755 $(DESTDIR)/$(datadir)/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/
 
-ifneq "$use_systemd" ""
+# this now is for the startup of nodemanager itself
+ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
-else
+endif
+ifneq "$(WITH_INIT)" ""
 install-startup: install-init
 endif
 
@@ -70,30 +69,43 @@ 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
 
-##########
+#################### 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 
 
@@ -126,6 +138,9 @@ endif
 # keep this in sync with setup-vs.spec
 LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
 
+# run with make SYNC_RESTART=false if you want to skip restarting nm
+SYNC_RESTART=true
+
 sync:synclxc
 
 synclxc: $(NODE).key.rsa
@@ -137,11 +152,10 @@ 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) $(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
 
 ### fetching the key