Security kernel update to 4.9.189 (sonic-net#116)

* Security kernel update to 4.9.189 This patch upgrade the kernel from version 4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)
vivekrnv · Dec 27, 2019 · 66e9dfa · 66e9dfa
1 parent 87576c0
commit 66e9dfa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -3,10 +3,10 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 KERNEL_ABI_MINOR_VERSION = 2
-KVERSION_SHORT ?= 4.9.0-9-$(KERNEL_ABI_MINOR_VERSION)
+KVERSION_SHORT ?= 4.9.0-11-$(KERNEL_ABI_MINOR_VERSION)
 KVERSION ?= $(KVERSION_SHORT)-amd64
-KERNEL_VERSION ?= 4.9.168
-KERNEL_SUBVERSION ?= 1+deb9u5
+KERNEL_VERSION ?= 4.9.189
+KERNEL_SUBVERSION ?= 3+deb9u2
 kernel_procure_method ?= build
 
 LINUX_HEADER_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
@@ -47,9 +47,9 @@ ORIG_FILE = linux_$(KERNEL_VERSION).orig.tar.xz
 DEBIAN_FILE = linux_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION).debian.tar.xz
 BUILD_DIR=linux-$(KERNEL_VERSION)
 
-DSC_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-source/linux_4.9.168-1+deb9u5.dsc?sv=2015-04-05&sr=b&sig=ZcTpvRltWLWwnJn3vQ%2BgTP1dVF6QSinOCJ1FSuyiogU%3D&se=2033-04-28T06%3A14%3A30Z&sp=r"
-DEBIAN_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-source/linux_4.9.168-1+deb9u5.debian.tar.xz?sv=2015-04-05&sr=b&sig=koCXHDvmY39smVGcI3cPJrBDZMmdpKiLkyJPfMdNPwU%3D&se=2033-04-28T06%3A14%3A51Z&sp=r"
-ORIG_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-source/linux_4.9.168.orig.tar.xz?sv=2015-04-05&sr=b&sig=ArvSGD3N46WGh%2BTYF8J1JgdT9x0BrFu4JhSuyyr3nNw%3D&se=2033-04-09T01%3A00%3A47Z&sp=r"
+DSC_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189-3+deb9u2.dsc"
+DEBIAN_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189-3+deb9u2.debian.tar.xz"
+ORIG_FILE_URL = "http://security.debian.org/debian-security/pool/updates/main/l/linux/linux_4.9.189.orig.tar.xz"
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
  # Obtaining the Debian kernel source

diff --git a/patch/preconfig/changelog.patch b/patch/preconfig/changelog.patch
@@ -13,19 +13,22 @@ diff --git a/debian/changelog b/debian/changelog
 index 026b840..88c8a43 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,15 @@
-+linux (4.9.168-1+deb9u5) sonic; urgency=high
+@@ -1248,6 +1248,18 @@
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Fri, 19 Jul 2019 13:41:00 +0200
+
++linux (4.9.168-1+deb9u3) sonic; urgency=high
 +
 + * add driver patches for MLNX SN2700
 +
 + -- Guohan Lu <gulv@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
 +
-+linux (4.9.168-1+deb9u5) sonic; urgency=high
++linux (4.9.168-1+deb9u3) sonic; urgency=high
 +
 + * add support for S6000
 +
 + -- Shuotian Cheng <shuche@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
 +
- linux (4.9.168-1+deb9u5) stretch-security; urgency=high
-
- * [amd64] Add mitigation for Spectre v1 swapgs (CVE-2019-1125):
+ linux (4.9.168-1+deb9u3) stretch-security; urgency=high
+ 
+ [ Salvatore Bonaccorso ]
diff --git a/...fig/packaging-update-abiname-to-9-2.patch → ...ig/packaging-update-abiname-to-11-2.patch b/...fig/packaging-update-abiname-to-9-2.patch → ...ig/packaging-update-abiname-to-11-2.patch
@@ -13,8 +13,8 @@ index cfc4409..fae58f7 100644
 +++ b/debian/config/defines
 @@ -1,5 +1,5 @@
  [abi]
--abiname: 9
-+abiname: 9-2
+-abiname: 11
++abiname: 11-2
  ignore-changes:
  __cpuhp_*
  bpf_analyzer
diff --git a/patch/preconfig/series b/patch/preconfig/series
@@ -1,2 +1,2 @@
 changelog.patch
-packaging-update-abiname-to-9-2.patch
+packaging-update-abiname-to-11-2.patch