Merge branch 'working'

.gitignore

@@ -0,0 +1,2 @@
+bin/*
+!bin/placeTaskBinariesHere.sudo

.gitmodules

@@ -10,3 +10,7 @@
 	path = operating-system
 	url = https://github.com/argos-research/operating-system
   	branch = data-generation
+[submodule "datageneration"]
+	path = datageneration
+	url = https://www.github.com/malsami/datageneration
+	branch = master

Makefile

@@ -0,0 +1,38 @@
+# will setup everything for demonstration in vagrant
+all: distributor genode binaries #datageneration
+	# should clone all the repos and build an operating system for pbxa9, then should vagrant up
+	make vagrant
+
+distributor: taskgen
+	# should clone the distributor_service repo and install dependencies (including the taskgen)
+	@git submodule update --init --remote distributor_service
+	# todo install dependencies in pyenv
+
+taskgen:
+	# should clone taskgen repo and install dependencies
+	@git submodule update --init --remote taskgen
+	# todo install dependencies in pyenv
+
+datageneration:
+	# should clone datageneration and install dependencies
+	@git submodule update --init --remote datageneration
+	# todo install dependencies in pyenv
+
+genode: 
+	# should clone operating system and build genode for specified arg
+	@git submodule update --init --remote operating-system
+	cd operating-system; make packages
+
+binaries:#takes target as arg
+	# should build operating system and taskbinaries and put them into the bin folder in client-tools
+	cd operating-system; ./setup.sh focnados_pbxa9 # should take target
+
+vagrant:
+	@vagrant up
+	@vagrant ssh
+
+#dependencies: dependencies-confirm
+	#should install the dependencies for the whole setup in pyenv
+
+#dependencies-confirm:
+	#@( read -p "This will install qemu12, bridge-utils, screen, isc-dhcp-server, htop, pkg-config, zlib1g-dev, libglib2.0, libpixman-1.0, libpixman-1-dev Are you sure?!? [Y/n]: " sure && case "$$sure" in [nN]) false;; *) true;; esac )

dhcpd.conf

@@ -32,7 +32,7 @@ log-facility local7;
 
 # Erstes Subnetz
 subnet 10.200.45.0 netmask 255.255.255.0 {
-	range 10.200.45.1 10.200.45.240;
+range 10.200.45.1 10.200.45.240;
 #	default-lease-time 600;
 #	max-lease-time 7200;
         interface "br0";	

provision.sh

@@ -12,7 +12,7 @@
 sudo apt-get update -qq 
 sudo apt-get install python3.5 python3-pip bridge-utils screen isc-dhcp-server htop pkg-config zlib1g-dev libglib2.0 libpixman-1.0 libpixman-1-dev -qq 
 sudo pip3 install --upgrade pip 
-sudo pip3 install dicttoxml 
+sudo pip3 install -r ./distributor_service/requirements.txt > /dev/null 
 sudo sh -c 'echo "\nauto br0\niface br0 inet static\n\thwaddress ether DE:AD:BE:EF:69:01\n\taddress 10.200.45.254\n\tnetmask 255.255.255.0\n\tgateway 10.200.45.254\nbridge_ports eth0\nbridge_stp off\nbridge_maxwait 0\nbridge_fd 0\n" >> /etc/network/interfaces'
 
 # compile qemu
@@ -30,7 +30,6 @@ sudo cp arm-softmmu/qemu-system-arm /usr/local/bin/
 if [ $USER == "ubuntu" ] || [ $USER == "vagrant" ]; then
   cd /vagrant
 fi
-sudo pip3 install -r ./taskgen/requirements.txt > /dev/null
 sudo cp ./dhcpd.conf /etc/dhcp/
 
 sudo /etc/init.d/networking restart