From e0b3f5f7285adfadacd86dc365260982a11941e6 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sun, 3 Dec 2017 13:31:46 -0800 Subject: [PATCH] Upgrade to kernel 4.9.66 optimized for Docker Signed-off-by: Dieter Reuter --- builder/chroot-script.sh | 2 ++ .../test-integration/spec/hypriotos-image/base/kernel_spec.rb | 4 ++-- versions.config | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 4d2346a..55b7751 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -285,6 +285,8 @@ HYPRIOT_OS_VERSION="${HYPRIOT_OS_VERSION:-v1.2.3}" cat <> /etc/os-release HYPRIOT_OS="HypriotOS/${BUILD_ARCH}" HYPRIOT_OS_VERSION="${HYPRIOT_OS_VERSION}" +HYPRIOT_KERNEL_BUILD="${KERNEL_BUILD}" +HYPRIOT_KERNEL_VERSION="${KERNEL_VERSION}" HYPRIOT_DEVICE="$HYPRIOT_DEVICE" HYPRIOT_IMAGE_VERSION="$HYPRIOT_IMAGE_VERSION" EOF 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 fe631c7..7fcf9f5 100644 --- a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe command('uname -r') do - its(:stdout) { should match /4.9.65-hypriotos-v8/ } + its(:stdout) { should match /4.9.66-hypriotos-v8/ } its(:exit_status) { should eq 0 } end -describe file('/lib/modules/4.9.65-hypriotos-v8/kernel') do +describe file('/lib/modules/4.9.66-hypriotos-v8/kernel') do it { should be_directory } end diff --git a/versions.config b/versions.config index d1dcc11..da06af5 100644 --- a/versions.config +++ b/versions.config @@ -9,8 +9,8 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1 # specific versions of kernel/firmware and docker tools export BOOTLOADER_BUILD="20171203-203920" -export KERNEL_BUILD="20171128-062501" -export KERNEL_VERSION="4.9.65" +export KERNEL_BUILD="20171203-204525" +export KERNEL_VERSION="4.9.66" export DOCKER_ENGINE_VERSION="17.11.0~ce" export DOCKER_COMPOSE_VERSION="1.17.1" export DOCKER_MACHINE_VERSION="0.13.0"