[SQUASH ME] rebased; fixed Makefile and topology definition

RIOT-OS · Apr 28, 2015 · 9c71ef6 · 9c71ef6
1 parent eaa86e6
commit 9c71ef6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/tools/desvirt/0001-add-example-topology.patch b/dist/tools/desvirt/0001-add-example-topology.patch
@@ -25,9 +25,9 @@ index 0000000..e8d0244
 +            </nodeType>
 +        </nodeTypes>
 +        <nodes>
-+            <node binary="../../../examples/default/bin/native/default.elf" name="a1" type="riot_native"/>
-+            <node binary="../../../examples/default/bin/native/default.elf" name="a2" type="riot_native"/>
-+            <node binary="../../../examples/default/bin/native/default.elf" name="a3" type="riot_native"/>
++            <node binary="../../../../examples/default/bin/native/default.elf" name="a1" type="riot_native"/>
++            <node binary="../../../../examples/default/bin/native/default.elf" name="a2" type="riot_native"/>
++            <node binary="../../../../examples/default/bin/native/default.elf" name="a3" type="riot_native"/>
 +        </nodes>
 +        <links>
 +            <link broadcast_loss="0.0" from_if="wlan0" from_node="a1" loss="0.0" to_if="wlan0" to_node="a2" uni="false"/>

diff --git a/dist/tools/desvirt/Makefile b/dist/tools/desvirt/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=desvirt
 PKG_URL=https://github.com/des-testbed/desvirt.git
-PKG_VERSION=17e50ba2c653adcf3ba9911f0a629a05dc970d24
+PKG_VERSION=master
 PKG_DIR=$(CURDIR)/$(PKG_NAME)
 
 .PHONY: all clean patch distclean desvirtdefine