Merge branch 'master' of atreus.informatik.uni-tuebingen.de:advanced_computer_architecture/vagrant

.vagrant/machines/default/virtualbox/action_provision

+1.5:2118eeba-c3ea-4107-b353-f603b0ccb998
\ No newline at end of file

.vagrant/machines/default/virtualbox/action_set_name

+1453652530
\ No newline at end of file

.vagrant/machines/default/virtualbox/id

+2118eeba-c3ea-4107-b353-f603b0ccb998
\ No newline at end of file

.vagrant/machines/default/virtualbox/index_uuid

+8556f7653d114ce991351e253f49aa17
\ No newline at end of file

.vagrant/machines/default/virtualbox/private_key

+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA47lfmYE7EVXjn9Tr4CzZa8YtOE/t/eYPmmG7CnmpVYkYCAur
+sbF4BnAw+qhNLZneFG375csJ1godIlfIGD58Rie5YBSMG1NCE8715EnpnTTW8A3s
+jMW/3D9SCRC5d2iUpJUXZbEtwR2F/nBx+OEIgnuFeiYpOdd2UVN3o63OSSx8d/b1
+XoQX/aHmc6bcLwqbn9ZsouhC09inkhPThU9K6yDqnOc0cvr2xpJl5/Rhdv4AB0co
+tJegej0I/CGgNwiPGV9T+HCo9sFGsMD+O0Uq5GZ8/M+HSZysXLr/IqRx7WCrNwiI
+YMjJCTkaPUxMvVyfCOmX9TrMeL57fjIPjMGVVQIDAQABAoIBAQCUlVpMJWbt+7WG
+jv3MilbenDLbIEPvuxGJMKVCw3j6R3Y3oa3IRjxDLya2FeQtkcy2VcDbAayMTJMP
+2mjDcNnTSI4Ko717AssFc6864gMcwOJRRTSH8WsrAOG86n2o7MK31FOs1Xs+Gs5X
+4vRqaCIOSRwhRA74H56il6xjTr9fO/1gYgqyICQrMcMDDoK0zSDtoDKbzAocxZcG
+RG/pOZK7dMjd45CLjkNvjU/+B4FoEnnssTW4qDIjgZrtC1GLuL4ofEGvxRIiVNEE
+zJuaFQ0XUB2CxkXlTs8k+HQ2WUrgpJWon/ltn1SIDqODs6i9Y1qooiIh3gvRisgK
+W86vkO5tAoGBAPaHbjBYD1+Ox3bdRWZzkVqH2KgLCfNXSXpG5Z6YlAoSoGXeI0H2
+dNtzKlvSFuegDGCacKOg0dOzRuyxJppERwlfDuZl8vVvaVREKiSSG5KNMpUGL6RZ
+xEctsOzsqLBHCRbEfQmXePALZ8xlSRiddB9KjlRJjCa+jcEKm0Ntk+NnAoGBAOx5
+AAHtdMjXOhdWbtXzIKnsZRkbwL+W/6U+zZdd+uw8Dw4yfjLltNn4K20Xq4/KJRQ5
+1HbB+FLMdXC+iR2T6XLl5ryV22aUElrPysuEE5lCqruBntvVRx4j4F3CT2VrB0oh
+6tibs0A8pESp/0ketEzVDC47Zj7OKiInRUydC+fjAoGAVGl66UK9wNJ6qdCJ+tKH
+aqApJyDgf1nb5upvpSZJSkmmcjrlh6iDysBcOKRvA1Bh7JH1D5H5RquUFWdy+E94
+o1TRHUK7Nh63ygqtA2ij2EJQl4ZOuc+izVxvwDAocnNgQVN2HNqopkjBedMUfEEt
+ialVorasLngAwaCIGUZj5PECgYBUOSyFgzurJO0tzr0fOr8Rhn7jmHzoQDHBe0Li
+fLiYVzPNjLJiEmp9j+R3sIyMZCUctRQ1UBTP+L6Db3mKrVnicHvkA0PnnymCaqwC
+HIKWfaYtrpcUGTyBQanx+vkoWBx6jOYGTD5lzLN9OUcRlfwFuYPjG4jpKajcDTyj
+cvQAnQKBgQCH8qlKy33BlMX9PWoGGU42q36FKNChhvEzhrcGHdO8A2AZXe2S655h
+g6fWp8LaZahdcCt7G7tEihYYCEq88sGS8RjPEb2pReXQ3e52WpfRpJICL7EK1ep+
+MvoXJw5UcV6NOKjLRRwX5UbMg/FbEI1dv8aqx3H4tf5JHgZoR9vMVw==
+-----END RSA PRIVATE KEY-----

.vagrant/machines/default/virtualbox/synced_folders

+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/home/michael/Dokumente/uni/tutorium/praktikum/vagrant","disabled":false,"__vagrantfile":true}}}
\ No newline at end of file

README.md

@@ -16,4 +16,9 @@
      vagrant up
      vagrant ssh
 
-     
\ No newline at end of file
+## TODO:
+- [x] exercises repository klonen
+- [x] m5term kompilieren, umgebungsvariable setzen
+- [x] beim Einrichten git installieren
+- [x] full system files runterladen, entpacken, M5_PATH setzen
+- [x] arm-cross-compiler installieren

bootstrap.sh

@@ -17,8 +17,10 @@ apt-get install protobuf-compiler -y
 apt-get install gcc-arm-linux-gnueabihf -y
 apt-get install ipython -y
 apt-get install python-pandas python-matplotlib -y
+apt-get install libncurses5 libncurses5-dev libelf-dev -y
+apt-get install git -y
 
 echo ${PWD}
 
 sudo -u vagrant  /vagrant/userconfig.sh
-\necho "Setting local configuration"
+echo "Setting local configuration"

init_local_config.sh

@@ -4,7 +4,11 @@ mkdir -p local_config
 mkdir -p local_config/ssh 
 ssh-keygen -f local_config/ssh/id_rsa -N ""
 
-echo "#!/bin/bash" > local_config/local_booststrap.sh
-echo "  "  >> local_config/local_booststrap.sh
-echo 'echo "Setting local configuration"' >> local_config/local_bootstrap.sh
-chmod ugo+x bootstrap.sh
\ No newline at end of file
+
+cat << EOF > local_config/local_bootstrap.sh
+#!/bin/bash  
+echo "Setting local configuration"
+EOF
+
+chmod ugo+x bootstrap.sh
+chmod ugo+x local_config/local_bootstrap.sh

userconfig.sh

 #!/bin/bash
 
-vagranthome=${PWD}
-ca_dir="${vagranthomw}/advanced_computer_architecture"
+cd $HOME
+ca_dir="${HOME}/advanced_computer_architecture"
+
 
-mkdir -p advanced_computer_architecture
-cd  
 if [ ! -d gem5 ]; then
  hg clone http://repo.gem5.org/gem5
 fi
 
 cd gem5
 hg pull 
-#scons build/ARM/gem5.debug
-scons build/ARM/gem5.opt
-#scons build/X86/gem5.debug
-#scons build/X86/gem5.opt
+hg update
+
+#scons build/ARM/gem5.debug --jobs 2
+scons build/ARM/gem5.opt --jobs 2
+#scons build/X86/gem5.debug --jobs 2
+#scons build/X86/gem5.opt --jobs 2
+
+cd util/term/
+make
+echo 'alias m5term="/home/vagrant/gem5/util/term/m5term"' >> /home/vagrant/.bashrc
 
 cd $ca_dir
-sudo wget http://www.gem5.org/dist/current/arm/aarch-system-2014-10.tar.xz
+mkdir -p system
+cd system
+wget http://www.gem5.org/dist/current/arm/aarch-system-2014-10.tar.xz
+
 tar xvJf aarch-system-2014-10.tar.xz
 
-cd $vagranthome
-cp -r /vagrant/local_config/ssh ~/.ssh
-/vagrant/local_config/local_bootstrap.sh
\ No newline at end of file
+if [ $? == 0 ]; then
+ rm aarch-system-2014-10.tar.xz
+fi
+
+cd $HOME
+echo 'export M5_PATH="/home/vagrant/advanced_computer_architecture/system"' >> .bashrc
+cp -r /vagrant/local_config/ssh/* ~/.ssh
+
+mkdir -p $ca_dir
+cd $ca_dir
+git clone git@atreus.informatik.uni-tuebingen.de:advanced_computer_architecture/exercises.git
+
+/vagrant/local_config/local_bootstrap.sh