From 865d93ccb81eefdd4149e3447fe2d2baff31ff40 Mon Sep 17 00:00:00 2001
From: Govinda Fichtner <govindaf@Govindas-MBP.fritz.box>
Date: Mon, 4 Apr 2016 23:39:45 +0200
Subject: [PATCH 1/2] upgrade kernel and firmware for rpi3

---
 builder/build.sh                                   |  4 ++--
 .../spec/hypriotos-image/base/kernel_spec.rb       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index eb38d4b..4586765 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -32,8 +32,8 @@ HYPRIOT_IMAGE_NAME="sd-card-rpi-${HYPRIOT_IMAGE_VERSION}.img"
 export HYPRIOT_IMAGE_VERSION
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="20151102-222318"
-export KERNEL_VERSION="4.1.12"
+export KERNEL_BUILD="20160404-055934"
+export KERNEL_VERSION="4.1.20"
 export DOCKER_ENGINE_VERSION="1.10.1-1"
 export DOCKER_COMPOSE_VERSION="1.6.0-27"
 export DOCKER_MACHINE_VERSION="0.4.1-72"
diff --git a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb
index 059c2dd..b862ad8 100644
--- a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe command('uname -r') do
-  its(:stdout) { should match /4.1.12(-v7)?+/ }
+  its(:stdout) { should match /4.1.20(-v7)?+/ }
   its(:exit_status) { should eq 0 }
 end
 
@@ -46,20 +46,20 @@
 end
 
 # with installed kernel headers
-describe file('/lib/modules/4.1.12-hypriotos+/build') do
+describe file('/lib/modules/4.1.20-hypriotos+/build') do
   it { should be_symlink }
-#  it { should be_linked_to '/usr/src/linux-headers-4.1.12-hypriotos+' }
+#  it { should be_linked_to '/usr/src/linux-headers-4.1.20-hypriotos+' }
 end
 
-describe file('/lib/modules/4.1.12-hypriotos-v7+/build') do
+describe file('/lib/modules/4.1.20-hypriotos-v7+/build') do
   it { should be_symlink }
-#  it { should be_linked_to '/usr/src/linux-headers-4.1.12-hypriotos-v7+' }
+#  it { should be_linked_to '/usr/src/linux-headers-4.1.20-hypriotos-v7+' }
 end
 
-describe file('/usr/src/linux-headers-4.1.12-hypriotos-v7+') do
+describe file('/usr/src/linux-headers-4.1.20-hypriotos-v7+') do
   it { should be_directory }
 end
 
-describe file('/usr/src/linux-headers-4.1.12-hypriotos+') do
+describe file('/usr/src/linux-headers-4.1.20-hypriotos+') do
   it { should be_directory }
 end

From 4ed7e791e5474ce39e1b3789dad44ac599194870 Mon Sep 17 00:00:00 2001
From: Govinda Fichtner <govindaf@Govindas-MBP.fritz.box>
Date: Mon, 4 Apr 2016 23:45:52 +0200
Subject: [PATCH 2/2] fix docker swarm tests

---
 .../spec/hypriotos-docker/docker-swarm_spec.rb                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
index 029fc7d..7b10213 100644
--- a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
+++ b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
@@ -5,11 +5,11 @@
 end
 
 describe command('docker run --rm -t hypriot/rpi-swarm --version') do
-  its(:stdout) { should match /swarm version 1.1.0 \(HEAD\)/ }
+  its(:stdout) { should match /swarm version 1.1.3 \(HEAD\)/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker images hypriot/rpi-swarm') do
-  its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*5eab982fa301 / }
+  its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*298de062190 / }
   its(:exit_status) { should eq 0 }
 end