From 2fa092882c830dd7b24376859b2ec41655702cd0 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sun, 15 May 2016 00:24:16 +0200 Subject: [PATCH] Update kernel to 4.4.10 --- builder/build.sh | 4 ++-- builder/chroot-script.sh | 1 + .../hypriotos-image/base/device_tree_spec.rb | 2 +- .../spec/hypriotos-image/base/kernel_spec.rb | 22 +++++++++++++------ .../hypriotos-image/kernel_config_spec.rb | 9 ++++++-- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/builder/build.sh b/builder/build.sh index 62abb0e..42dc835 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="20160404-055934" -export KERNEL_VERSION="4.1.20" +export KERNEL_BUILD="20160514-190208" +export KERNEL_VERSION="4.4.10" export DOCKER_ENGINE_VERSION="1.11.1-1" export DOCKER_COMPOSE_VERSION="1.7.1-38" export DOCKER_MACHINE_VERSION="0.4.1-72" diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index cb6e59e..efb9528 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -33,6 +33,7 @@ apt-get install -y \ # install kernel- and firmware-packages apt-get install -y \ + "raspberrypi-kernel=${KERNEL_BUILD}" \ "raspberrypi-bootloader=${KERNEL_BUILD}" \ "libraspberrypi0=${KERNEL_BUILD}" \ "libraspberrypi-dev=${KERNEL_BUILD}" \ diff --git a/builder/test-integration/spec/hypriotos-image/base/device_tree_spec.rb b/builder/test-integration/spec/hypriotos-image/base/device_tree_spec.rb index f9d9b40..057a006 100644 --- a/builder/test-integration/spec/hypriotos-image/base/device_tree_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/device_tree_spec.rb @@ -20,6 +20,6 @@ end describe command('vcdbg log msg') do - its(:stderr) { should match /Loading 'bcm.*\.dtb' from SD card/ } + its(:stderr) { should match /Loading 'bcm.*\.dtb' to/ } its(:exit_status) { should eq 0 } end 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 b862ad8..c7dfffa 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.20(-v7)?+/ } + its(:stdout) { should match /4.4.10(-v7)?+/ } its(:exit_status) { should eq 0 } end @@ -45,21 +45,29 @@ it { should_not be_directory } end +describe file('/lib/modules/4.1.20+') do + it { should_not be_directory } +end + +describe file('/lib/modules/4.1.20-v7+') do + it { should_not be_directory } +end + # with installed kernel headers -describe file('/lib/modules/4.1.20-hypriotos+/build') do +describe file('/lib/modules/4.4.10-hypriotos+/build') do it { should be_symlink } -# it { should be_linked_to '/usr/src/linux-headers-4.1.20-hypriotos+' } +# it { should be_linked_to '/usr/src/linux-headers-4.4.10-hypriotos+' } end -describe file('/lib/modules/4.1.20-hypriotos-v7+/build') do +describe file('/lib/modules/4.4.10-hypriotos-v7+/build') do it { should be_symlink } -# it { should be_linked_to '/usr/src/linux-headers-4.1.20-hypriotos-v7+' } +# it { should be_linked_to '/usr/src/linux-headers-4.4.10-hypriotos-v7+' } end -describe file('/usr/src/linux-headers-4.1.20-hypriotos-v7+') do +describe file('/usr/src/linux-headers-4.4.10-hypriotos-v7+') do it { should be_directory } end -describe file('/usr/src/linux-headers-4.1.20-hypriotos+') do +describe file('/usr/src/linux-headers-4.4.10-hypriotos+') do it { should be_directory } end diff --git a/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb b/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb index 1e14df0..e86692f 100644 --- a/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb @@ -27,6 +27,7 @@ its(:stdout) { should match /CONFIG_CGROUP_SCHED=y/ } its(:stdout) { should match /CONFIG_CPUSETS=y/ } its(:stdout) { should match /CONFIG_MEMCG=y/ } + its(:stdout) { should match /CONFIG_KEYS=y/ } its(:stdout) { should match /CONFIG_MACVLAN=m/ } its(:stdout) { should match /CONFIG_VETH=m/ } its(:stdout) { should match /CONFIG_BRIDGE=m/ } @@ -41,12 +42,14 @@ its(:stdout) { should match /CONFIG_POSIX_MQUEUE=y/ } ## Optional Features: its(:stdout) { should match /CONFIG_USER_NS=y/ } + its(:stdout) { should match /CONFIG_SECCOMP=y/ } + its(:stdout) { should match /CONFIG_CGROUP_PIDS=y/ } its(:stdout) { should match /CONFIG_MEMCG_KMEM=y/ } its(:stdout) { should match /CONFIG_MEMCG_SWAP=y/ } its(:stdout) { should match /CONFIG_MEMCG_SWAP_ENABLED=y/ } its(:stdout) { should match /CONFIG_BLK_CGROUP=y/ } - its(:stdout) { should match /CONFIG_IOSCHED_CFQ=y/ } its(:stdout) { should match /CONFIG_BLK_DEV_THROTTLING=y/ } + its(:stdout) { should match /CONFIG_IOSCHED_CFQ=y/ } its(:stdout) { should match /CONFIG_CGROUP_PERF=y/ } #its(:stdout) { should match /CONFIG_CGROUP_HUGETLB=y/ } its(:stdout) { should match /CONFIG_NET_CLS_CGROUP=m/ } @@ -55,12 +58,14 @@ its(:stdout) { should match /CONFIG_FAIR_GROUP_SCHED=y/ } its(:stdout) { should match /CONFIG_RT_GROUP_SCHED=y/ } its(:stdout) { should match /CONFIG_EXT3_FS=y/ } - its(:stdout) { should match /CONFIG_EXT3_FS_XATTR=y/ } + #its(:stdout) { should match /CONFIG_EXT3_FS_XATTR=y/ } its(:stdout) { should match /CONFIG_EXT3_FS_POSIX_ACL=y/ } its(:stdout) { should match /CONFIG_EXT3_FS_SECURITY=y/ } its(:stdout) { should match /CONFIG_EXT4_FS=y/ } its(:stdout) { should match /CONFIG_EXT4_FS_POSIX_ACL=y/ } its(:stdout) { should match /CONFIG_EXT4_FS_SECURITY=y/ } + ## Network Drivers: + its(:stdout) { should match /CONFIG_VXLAN=m/ } ## Storage Drivers: #its(:stdout) { should match /CONFIG_AUFS_FS=m/ } its(:stdout) { should match /CONFIG_BTRFS_FS=m/ }