kernel: Update kernel version

Update kernel version to 4.9.31-68 and remove cve fixed in this version. Fixes: #968 Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
intel · Jun 9, 2017 · 7d538ba · 7d538ba
1 parent b82bbc2
commit 7d538ba
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 45 deletions.
diff --git a/data/obs-packaging/linux-container/cve-2016-8632.patch b/data/obs-packaging/linux-container/cve-2016-8632.patch
diff --git a/data/obs-packaging/linux-container/linux-container.spec-template b/data/obs-packaging/linux-container/linux-container.spec-template
@@ -33,9 +33,6 @@ BuildRequires:  bison
 %define debug_package %{nil}
 %define __strip /bin/true
 
-# Serie    00XX: mainline, CVE, bugfixes patches
-Patch0001: cve-2016-8632.patch
-
 # Serie    01XX: Clear Linux patches
 Patch0102: 0102-cpuidle-skip-synchronize_rcu-on-single-CPU-systems.patch
 Patch0103: 0103-sysrq-skip-synchronize_rcu-if-there-is-no-old-op.patch
@@ -69,9 +66,6 @@ The Linux kernel.
 %prep
 %setup -q -n linux-@VERSION@
 
-#     00XX  mainline, CVE, bugfixes patches
-%patch0001 -p1
-
 #     01XX  Clear Linux KVM patches
 #%patch0101 -p1
 %patch0102 -p1

diff --git a/data/obs-packaging/linux-container/wd/debian/patches/series b/data/obs-packaging/linux-container/wd/debian/patches/series
@@ -1,4 +1,3 @@
-cve-2016-8632.patch
 0102-cpuidle-skip-synchronize_rcu-on-single-CPU-systems.patch
 0103-sysrq-skip-synchronize_rcu-if-there-is-no-old-op.patch
 0104-fbcon-enable-no-blink-by-default.patch

diff --git a/versions.txt b/versions.txt
@@ -4,8 +4,8 @@ json_glib_version=1.2.2
 check_version=0.10.0
 docker_engine_fedora_version=1.12.1
 docker_engine_ubuntu_version=1.12.1-0~xenial
-clear_vm_image_version=15550
-clear_vm_kernel_version=4.9.30-65
+clear_vm_image_version=15800
+clear_vm_kernel_version=4.9.31-68
 docker_engine_semaphoreci_ubuntu_version=1.12.1-0~trusty
 gcc_version=6.2.0
 qemu_lite_version=741f430a960b5b67745670e8270db91aeb083c5f