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.

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

Upgrade kernel to 3.16.51-3+deb8u1 based on latest debian security patches #38

Merged
merged 1 commit into from
Jan 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.ONESHELL:
SHELL = /bin/bash

KVERSION_SHORT ?= 3.16.0-4
KVERSION_SHORT ?= 3.16.0-5
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 3.16.43
KERNEL_SUBVERSION ?= 2+deb8u5
KERNEL_VERSION ?= 3.16.51
KERNEL_SUBVERSION ?= 3+deb8u1

MAIN_TARGET = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
DERIVED_TARGETS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb \
Expand All @@ -16,9 +16,9 @@ DEBIAN_FILE = linux_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION).debian.tar.xz
URL = http://security.debian.org/debian-security/pool/updates/main/l/linux
BUILD_DIR=linux-$(KERNEL_VERSION)

DSC_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/linux_3.16.43-2+deb8u5.dsc?sv=2015-04-05&sr=b&sig=%2B4UumAxZB5X%2BSurMCEY4JqL2%2BYxTRfJjecnIZvo%2BxCg%3D&se=2154-10-14T01%3A34%3A34Z&sp=r"
DEBIAN_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/linux_3.16.43-2+deb8u5.debian.tar.xz?sv=2015-04-05&sr=b&sig=p1wv%2BId57XVyabKQe%2B22B33%2F9FWIIK5WLP1x6uNC%2BCo%3D&se=2154-10-14T01%3A33%3A51Z&sp=r"
ORIG_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/linux_3.16.43.orig.tar.xz?sv=2015-04-05&sr=b&sig=n2iMEnfMv%2B1YMXKrvixfB6Ua6xRnaOwtwErr5aZkfMQ%3D&se=2154-10-14T01%3A34%3A57Z&sp=r"
DSC_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(DSC_FILE)?sv=2015-04-05&sr=b&sig=FzpIoc5gzw9oj09C0ifOaCTMo6K%2BP0WadjFgprGe508%3D&se=2117-12-17T19%3A52%3A55Z&sp=r"
DEBIAN_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(DEBIAN_FILE)?sv=2015-04-05&sr=b&sig=E65G0WdVW4FrpDQxmKqjuKjur2QM%2BycXy5NbVtmBYlY%3D&se=2117-12-17T19%3A54%3A03Z&sp=r"
ORIG_FILE_URL = "https://sonicstorage.blob.core.windows.net/packages/$(ORIG_FILE)?sv=2015-04-05&sr=b&sig=f%2BXBexkqVW9nru%2FwjT%2FNUwToUP3uMRnokIpuZa9AbHk%3D&se=2117-12-17T19%3A54%3A25Z&sp=r"

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the Debian kernel source
Expand All @@ -30,8 +30,11 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x $(DSC_FILE)

pushd $(BUILD_DIR)
git init
git add -f *

# patch debian changelog and update kernel package version
patch -p0 < ../patch/changelog.patch
git am ../patch/changelog.patch

# re-generate debian/rules.gen, requires kernel-wedge
debian/bin/gencontrol.py
Expand All @@ -40,8 +43,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
fakeroot make -f debian/rules.gen setup_amd64_none_amd64

# Applying patches and configuration changes
git init
git add -f *
git add debian/build/build_amd64_none_amd64/.config -f
git commit -m "unmodified debian source"
stg init
Expand Down
27 changes: 21 additions & 6 deletions patch/changelog.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
--- debian/changelog.orig 2016-09-19 23:37:25.157879132 +0000
+++ debian/changelog 2016-09-19 23:37:32.141853134 +0000
From a96e033ed01d4a68a0825c187bebe45a527fb868 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 10 Jan 2018 01:18:57 +0000
Subject: [PATCH] Update changelog

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
---
debian/changelog | 12 ++++++++++++
1 file changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index baeab31..9cdcdfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+linux (3.16.43-2+deb8u5) acs; urgency=high
+linux (3.16.51-3+deb8u1) sonic; urgency=high
+
+ * add driver patches for MLNX SN2700
+
+ -- Guohan Lu <gulv@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
+linux (3.16.43-2+deb8u5) acs; urgency=high
+linux (3.16.51-3+deb8u1) sonic; urgency=high
+
+ * add support for S6000
+
+ -- Shuotian Cheng <shuche@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
linux (3.16.43-2+deb8u5) jessie-security; urgency=medium
linux (3.16.51-3+deb8u1) jessie-security; urgency=high

* dccp: CVE-2017-8824: use-after-free in DCCP code
--
2.1.4

* [amd64] mm: revert ELF_ET_DYN_BASE base changes (fixes regression of ASan)