From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Sep 2012 06:25:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.8.90-0~36
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dec7bc0972110acd1425df8e5b443d007c6b9e1c;hp=-c;p=sliver-openvswitch.git

Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
---

dec7bc0972110acd1425df8e5b443d007c6b9e1c
diff --combined planetlab/exp-tool/Makefile
index 74a0d3a28,d13c405d2..492471801
--- a/planetlab/exp-tool/Makefile
+++ b/planetlab/exp-tool/Makefile
@@@ -1,14 -1,16 +1,16 @@@
  include conf.mk
  
+ 
  # proj1(x@y) = x
  proj1=$(word 1,$(subst @, ,$(1)))
  
  # proj2(x@y) = y
  proj2=$(word 2,$(subst @, ,$(1)))
  
+ SEP?=-
  # get(x-y@1) = x
  # get(x-y@2) = y
- get=$(word $(call proj2,$(1)),$(subst -, ,$(call proj1,$(1))))
+ get=$(word $(call proj2,$(1)),$(subst $(SEP), ,$(call proj1,$(1))))
  
  # flip(1) = 2
  # flip(2) = 1
@@@ -23,7 -25,6 +25,7 @@@ opp=$(call proj1,$(1))@$(call flip,$(ca
  rget=$(call get,$(call opp,$(1)))
  
  solve=$(HOST_$(1))
 +solve_ip=$(IP_$(1))
  # can be redefined in conf.mk if that's not the expected behaviour
  display?=host $(1) aka $(call solve,$(1))
  
@@@ -109,9 -110,9 +111,9 @@@ del-bridge.%: cache/db.
  		$(SSH) $(HOST_$*) sudo sliver-ovs del-bridge $$(cat cache/bridge.$*);\
  	 fi
  	@rm -f cache/bridge.$* \
- 	      cache/iface.$*-*@1 cache/iface.*-$*@2 \
- 	      cache/link.$*-*@?  cache/link.*-$*@?  \
- 	      L/$*-*		 L/*-$*
+ 	      cache/iface.$*$(SEP)*@1 cache/iface.*$(SEP)$*@2 \
+ 	      cache/link.$*$(SEP)*@?  cache/link.*$(SEP)$*@?  \
+ 	      L/$*$(SEP)*	      L/*$(SEP)$*
  
  del-switchd.%: del-bridge.%
  	@echo "Shutting down switchd on $(call display,$*)"
@@@ -139,7 -140,7 +141,7 @@@ shutdown: del-switches del-db
  
  ####################
  graph.dot:
- 	( echo "digraph $(SLICE) {"; ls L | sed 's/-/->/;s/$$/;/'; echo "}" ) > $@
+ 	( echo "digraph $(SLICE) {"; ls L | sed 's/$(SEP)/->/;s/$$/;/'; echo "}" ) > $@
  graph.ps: graph.dot
  	dot -Tps < $^ > $@