Skip to content

Commit

Permalink
Merge pull request #2484 from phiros/pkg_desvirt
Browse files Browse the repository at this point in the history
dist: add desvirt
  • Loading branch information
phiros committed Apr 30, 2015
2 parents 195a8d8 + cb84729 commit 86d4497
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 0 deletions.
1 change: 1 addition & 0 deletions dist/tools/desvirt/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/desvirt
43 changes: 43 additions & 0 deletions dist/tools/desvirt/0001-add-example-topology.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 7a98a45da47846f0379cfbd477936f67a2af75b3 Mon Sep 17 00:00:00 2001
From: Philipp Rosenkranz <[email protected]>
Date: Thu, 2 Oct 2014 17:09:32 +0200
Subject: [PATCH 1/1] add example topology

---
.desvirt/example.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 .desvirt/example.xml

diff --git a/.desvirt/example.xml b/.desvirt/example.xml
new file mode 100644
index 0000000..e8d0244
--- /dev/null
+++ b/.desvirt/example.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<topology version="1">
+ <net description="two client nodes and one probing node" name="example">
+ <nodeTypes>
+ <nodeType name="riot_native">
+ <interfaces>
+ <interface name="wlan0" type="802.11bg"/>
+ </interfaces>
+ </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"/>
+ </nodes>
+ <links>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a1" loss="0.0" to_if="wlan0" to_node="a2" uni="false"/>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a1" loss="0.0" to_if="wlan0" to_node="a3" uni="false"/>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a2" loss="0.0" to_if="wlan0" to_node="a1" uni="false"/>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a2" loss="0.0" to_if="wlan0" to_node="a3" uni="false"/>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a3" loss="0.0" to_if="wlan0" to_node="a1" uni="false"/>
+ <link broadcast_loss="0.0" from_if="wlan0" from_node="a3" loss="0.0" to_if="wlan0" to_node="a2" uni="false"/>
+ </links>
+ </net>
+</topology>
--
1.9.1
35 changes: 35 additions & 0 deletions dist/tools/desvirt/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
PKG_NAME=desvirt
PKG_URL=https://github.com/des-testbed/desvirt.git
PKG_VERSION=master
PKG_DIR=$(CURDIR)/$(PKG_NAME)

.PHONY: all clean patch distclean desvirtdefine

all: clean $(PKG_NAME) patch desvirtdefine

patch:
cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch

desvirtdefine: patch
$(foreach topology,$(shell ls $(PKG_NAME)/.desvirt/*.xml), \
cd $(PKG_NAME) && \
./vnet --define --name "$(basename $(notdir $(topology)))";)

$(PKG_NAME):
# Get $(PKG_VERSION) of package from $(PKG_URL)
$(if $(wildcard $(PKG_NAME)),cd $(CURDIR)/$(PKG_NAME) && \
git clean -x -f && \
git reset --hard $(PKG_VERSION) \
, git clone $(PKG_URL) $(PKG_NAME) && \
cd $(PKG_NAME) && \
git reset --hard $(PKG_VERSION))

clean::
# Reset package to checkout state.
$(if $(wildcard $(PKG_NAME)),cd $(CURDIR)/$(PKG_NAME) && \
git clean -x -f && \
git reset --hard $(PKG_VERSION) \
, )

distclean::
rm -rf $(CURDIR)/$(PKG_NAME)

0 comments on commit 86d4497

Please sign in to comment.