Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Security kernel update to 4.9.189 #116

Merged
merged 3 commits into from
Dec 27, 2019
Merged

Security kernel update to 4.9.189 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb3655
Security kernel update to 4.9.189
olivier-singla Dec 15, 2019
c27c0cf
Changed KERNEL_ABI_MINOR_VERSION in Makefile
olivier-singla Dec 17, 2019
c9121df
Typo in Makefile: kernel abi should be 11-2, not 2
olivier-singla Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 9 additions & 6 deletions patch/preconfig/changelog.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 ]
4 changes: 2 additions & 2 deletions ...fig/packaging-update-abiname-to-9-2.patch → ...ig/packaging-update-abiname-to-11-2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion patch/preconfig/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
changelog.patch
packaging-update-abiname-to-9-2.patch
packaging-update-abiname-to-11-2.patch