Skip to content

Commit

Permalink
update linux kernel to 3.16.36-1 deb8u2 (sonic-net#10)
Browse files Browse the repository at this point in the history
* update linux kernel to 3.16.36
* remove igb driver patch since the buildimage will install the latest igb driver.
  • Loading branch information
lguohan authored Dec 29, 2016
1 parent 74a38cc commit b21e143
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 395 deletions.
27 changes: 18 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
.ONESHELL:
SHELL = /bin/bash

MAIN_TARGET = linux-image-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_amd64.deb
MAIN_TARGET = linux-image-3.16.0-4-amd64_3.16.36-1+deb8u2_amd64.deb

VERSION = 3.16.36
SUBVERSION = 1+deb8u2

DSC_FILE = linux_${VERSION}-${SUBVERSION}.dsc
ORIG_FILE = linux_${VERSION}.orig.tar.xz
DEBIAN_FILE = linux_${VERSION}-${SUBVERSION}.debian.tar.xz
URL = http://security.debian.org/debian-security/pool/updates/main/l/linux
BUILD_DIR=linux-${VERSION}

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the Debian kernel source
rm -rf linux-3.16.7-ckt11
wget -O linux_3.16.7-ckt11-1+deb8u3.dsc https://launchpad.net/debian/+archive/primary/+files/linux_3.16.7-ckt11-1+deb8u3.dsc
wget -O linux_3.16.7-ckt11.orig.tar.xz https://launchpad.net/debian/+archive/primary/+files/linux_3.16.7-ckt11.orig.tar.xz
wget -O linux_3.16.7-ckt11-1+deb8u3.debian.tar.xz https://launchpad.net/debian/+archive/primary/+files/linux_3.16.7-ckt11-1+deb8u3.debian.tar.xz
rm -rf $(BUILD_DIR)
wget -O $(DSC_FILE) $(URL)/$(DSC_FILE)
wget -O $(ORIG_FILE) $(URL)/$(ORIG_FILE)
wget -O $(DEBIAN_FILE) $(URL)/$(DEBIAN_FILE)

dpkg-source -x linux_3.16.7-ckt11-1+deb8u3.dsc
dpkg-source -x $(DSC_FILE)

pushd linux-3.16.7-ckt11
pushd $(BUILD_DIR)
# patch debian changelog and update kernel package version
patch -p0 < ../patch/changelog.patch

# re-generate debian/rules.gen
# re-generate debian/rules.gen, requires kernel-wedge
debian/bin/gencontrol.py

# generate linux build file for amd64_none_amd64
fakeroot make -f debian/rules.gen setup_amd64_none_amd64

# Applying patches and configuration changes
git init
git add .
git add -f *
git add debian/build/build_amd64_none_amd64/.config -f
git commit -m "unmodified debian source"
stg init
Expand Down
14 changes: 7 additions & 7 deletions patch/changelog.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
--- debian/changelog 2015-08-04 00:50:04.000000000 +0000
+++ changelog 2015-12-20 04:20:25.032779900 +0000
--- debian/changelog.orig 2016-09-19 23:37:25.157879132 +0000
+++ debian/changelog 2016-09-19 23:37:32.141853134 +0000
@@ -1,3 +1,15 @@
+linux (3.16.7-ckt11-2+acs8u2) acs; urgency=high
+linux (3.16.36-1+deb8u2) acs; urgency=high
+
+ * add driver patches for MLNX SN2700
+
+ -- Guohan Lu <[email protected]> Sun, 19 Dec 2015 01:50:04 +0100
+
+linux (3.16.7-ckt11-2+acs8u1) acs; urgency=high
+linux (3.16.36-1+deb8u2) acs; urgency=high
+
+ * add support for S6000
+
+ -- Shuotian Cheng <[email protected]> Sun, 19 Dec 2015 01:50:04 +0100
+
linux (3.16.7-ckt11-1+deb8u3) jessie-security; urgency=high
* path_openat(): fix double fput() (CVE-2015-5706)
linux (3.16.36-1+deb8u2) jessie-security; urgency=high

* KEYS: Fix short sprintf buffer in /proc/keys show function (CVE-2016-7042)
90 changes: 0 additions & 90 deletions patch/driver-support-intel-avoton-ethernet-with-broadcom-phy.patch

This file was deleted.

Loading

0 comments on commit b21e143

Please sign in to comment.