From 1904a223e81cf68420be56f10a6ee5cffadef1ee Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Mon, 1 Jul 2013 11:22:59 +0200
Subject: [PATCH] Check md5 sum of initramfs file in l4lx run-script

* Always download md5sum file and check downloaded binaries
* Extend sleep time in l4linux_netperf script, so that DHCP has enough time
* Fix regexp rule in l4linux_netperf run script to work with MAC addresses
  containing only numbers

Fix #787
---
 ports-foc/run/l4android.run          | 6 ++++++
 ports-foc/run/l4linux.run            | 6 +++++-
 ports-foc/run/l4linux_ahci_bench.run | 6 +++++-
 ports-foc/run/l4linux_dynamic.run    | 2 +-
 ports-foc/run/l4linux_netperf.run    | 8 ++++++--
 ports-foc/run/linux_panda.run        | 7 +++++--
 ports-foc/run/multi_linux.run        | 4 ++++
 ports-foc/run/smp_linux_panda.run    | 4 ++++
 ports-foc/run/two_linux.run          | 4 ++++
 ports-foc/run/two_linux_panda.run    | 4 ++++
 10 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/ports-foc/run/l4android.run b/ports-foc/run/l4android.run
index f474348635..52737e2292 100644
--- a/ports-foc/run/l4android.run
+++ b/ports-foc/run/l4android.run
@@ -263,6 +263,12 @@ if {![file exists bin/system-ginger.img]} {
 	puts "Download system image ..."
 	exec curl $system_uri > bin/system-ginger.img 2> /dev/null
 }
+exec >& /dev/null wget -O bin/root-ginger.gz.md5 $initrd_uri.md5
+exec >& /dev/null wget -O bin/system-ginger.img.md5 $system_uri.md5
+cd bin
+exec md5sum -c root-ginger.gz.md5
+exec md5sum -c system-ginger.img.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
diff --git a/ports-foc/run/l4linux.run b/ports-foc/run/l4linux.run
index 67daad9acd..9e9650d1e7 100644
--- a/ports-foc/run/l4linux.run
+++ b/ports-foc/run/l4linux.run
@@ -156,6 +156,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
@@ -183,4 +187,4 @@ expect {
 }
 
 puts "Test succeeded"
-exec rm bin/initrd.gz
+exec rm bin/initrd.gz bin/initrd.gz.md5
diff --git a/ports-foc/run/l4linux_ahci_bench.run b/ports-foc/run/l4linux_ahci_bench.run
index 71bf8b36c0..1a8941b52b 100644
--- a/ports-foc/run/l4linux_ahci_bench.run
+++ b/ports-foc/run/l4linux_ahci_bench.run
@@ -114,11 +114,15 @@ set boot_modules {
 
 lappend_if $interpose_part_blk boot_modules part_blk
 
-set uri "https://github.com/m-stein/genode_related/raw/master/arndale/ahci_bench/l4lx/initrd.gz"
+set uri "http://genode.org/files/l4linux/initrd-ahci-bench.gz"
 if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 set fiasco_serial_esc_arg ""
 
diff --git a/ports-foc/run/l4linux_dynamic.run b/ports-foc/run/l4linux_dynamic.run
index cb465aec67..e47009a757 100644
--- a/ports-foc/run/l4linux_dynamic.run
+++ b/ports-foc/run/l4linux_dynamic.run
@@ -367,7 +367,7 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
-exec >& /dev/null wget -c -O bin/initrd.gz.md5 $uri.md5
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
 cd bin
 exec md5sum -c initrd.gz.md5
 cd ..
diff --git a/ports-foc/run/l4linux_netperf.run b/ports-foc/run/l4linux_netperf.run
index d6d06bc532..7626bbcce6 100644
--- a/ports-foc/run/l4linux_netperf.run
+++ b/ports-foc/run/l4linux_netperf.run
@@ -130,6 +130,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
@@ -137,7 +141,7 @@ build_boot_image  [join $boot_modules " "]
 #
 # Execute test case
 #
-set ip_match "(\[0-9]{1,3})\.(\[0-9]{1,3})\.(\[0-9]{1,3})\.(\[0-9]{1,3})"
+set ip_match "(\[0-9]{1,3})\\.(\[0-9]{1,3})\\.(\[0-9]{1,3})\\.(\[0-9]{1,3})"
 
 #
 # Local IP
@@ -151,7 +155,7 @@ regexp $ip_match $ip_string ip_local
 #
 run_genode_until "Link status is: 1.*" 220
 set serial_id $spawn_id
-sleep 3
+sleep 8
 send "ip addr show dev eth0\n"
 run_genode_until "inet.*\n" 3 $serial_id
 regexp $ip_match $output ip_remote
diff --git a/ports-foc/run/linux_panda.run b/ports-foc/run/linux_panda.run
index 572bb91b00..ae36671d7e 100644
--- a/ports-foc/run/linux_panda.run
+++ b/ports-foc/run/linux_panda.run
@@ -115,12 +115,15 @@ set boot_modules {
 	usb_drv
 }
 
-set uri "https://github.com/downloads/skalk/genode/busybox-initrd-arm-20120710.gz"
-
+set uri "http://genode.org/files/l4linux/busybox-initrd-arm-20120710.gz"
 if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
diff --git a/ports-foc/run/multi_linux.run b/ports-foc/run/multi_linux.run
index b14bba8a0a..d9ec079d4b 100644
--- a/ports-foc/run/multi_linux.run
+++ b/ports-foc/run/multi_linux.run
@@ -152,6 +152,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
diff --git a/ports-foc/run/smp_linux_panda.run b/ports-foc/run/smp_linux_panda.run
index 9176ef4b5e..c21488925c 100644
--- a/ports-foc/run/smp_linux_panda.run
+++ b/ports-foc/run/smp_linux_panda.run
@@ -162,6 +162,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
diff --git a/ports-foc/run/two_linux.run b/ports-foc/run/two_linux.run
index 8598006455..dfde09a02e 100644
--- a/ports-foc/run/two_linux.run
+++ b/ports-foc/run/two_linux.run
@@ -215,6 +215,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]
 
diff --git a/ports-foc/run/two_linux_panda.run b/ports-foc/run/two_linux_panda.run
index df4767c10b..3d30ed6d8b 100644
--- a/ports-foc/run/two_linux_panda.run
+++ b/ports-foc/run/two_linux_panda.run
@@ -252,6 +252,10 @@ if {![file exists bin/initrd.gz]} {
 	puts "Download initramfs ..."
 	exec >& /dev/null wget -c -O bin/initrd.gz $uri
 }
+exec >& /dev/null wget -O bin/initrd.gz.md5 $uri.md5
+cd bin
+exec md5sum -c initrd.gz.md5
+cd ..
 
 build_boot_image  [join $boot_modules " "]