# autoconf compatible variables
datadir := /usr/share
bindir := /usr/bin
+systemddir := /usr/lib/systemd/system
-lib: forward_api_calls
- python setup-lib.py build
+PYTHON = python3
-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-lib:
- python setup-lib.py install \
- --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
- --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
- --install-scripts=$(DESTDIR)/$(bindir)
- install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
-
-install-vs:
- python setup-vs.py install \
+#################### 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 -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
-
-install-scripts:
- mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
- rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
- chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+ --install-platlib=$(DESTDIR)/$(datadir)/NodeManager
+ chmod +x $(DESTDIR)/$(datadir)/NodeManager/conf_files.py
- mkdir -p $(DESTDIR)/etc/init.d
- chmod 755 initscripts/*
- rsync -av initscripts/ $(DESTDIR)/etc/init.d/
+# 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
- install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
+ 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-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
# 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)
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
@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/nm $(NODEURL)/etc/init.d/nm
-# ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+ +$(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
@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"