git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Thomas's change to ensure tighter synchro between conf_files lxc_sliceimage and nodem...
[nodemanager.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0bea07a
..
6069f41
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-9,10
+9,18
@@
# autoconf compatible variables
datadir := /usr/share
bindir := /usr/bin
# 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
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
####################
all: forward_api_calls
python setup.py build
####################
all: forward_api_calls
python setup.py build
@@
-80,7
+88,8
@@
DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
DATE=$(shell date -u +"%a, %d %b %Y %T")
force:
DATE=$(shell date -u +"%a, %d %b %Y %T")
force:
-debian: debian/changelog debian.source debian.package
+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/changelog: debian/changelog.in
sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
@@
-129,6
+138,9
@@
endif
# keep this in sync with setup-vs.spec
LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
# 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
sync:synclxc
synclxc: $(NODE).key.rsa
@@
-143,7
+155,7
@@
else
+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
# +$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+$(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
endif
### fetching the key