git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12eac49
)
fix 'make sync'
author
parmentelat
<thierry.parmentelat@inria.fr>
Thu, 13 Dec 2018 15:04:45 +0000
(16:04 +0100)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Thu, 13 Dec 2018 15:04:45 +0000
(16:04 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
ca74d45
..
dc89c4c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,9
+21,9
@@
SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
endif
LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc'
-RSYNC_EXCLUDES := --exclude
.svn --exclude CVS --exclude
'*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES := --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC := rsync -a
-v
$(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC := rsync -a
i
$(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
sync:
ifeq (,$(SSHURL))
sync:
ifeq (,$(SSHURL))
@@
-33,7
+33,8
@@
ifeq (,$(SSHURL))
@echo " make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
@exit 1
else
@echo " make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
@exit 1
else
- +$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
+ +$(RSYNC) systemd/plc-ctl $(SSHURL)/usr/bin/plc-ctl
+ +$(RSYNC) systemd/plc.service $(SSHURL)/usr/lib/systemd/system/plc.service
+$(RSYNC) bin/ $(SSHURL)/usr/bin/
+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+$(RSYNC) bin/ $(SSHURL)/usr/bin/
+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/