[Kernel] use stg to manage changelog patches (#53)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Makefile

@@ -61,21 +61,25 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	pushd $(BUILD_DIR)
 	git init
 	git add -f *
-	git commit -m "check in all loose files and diffs"
+	git commit -qm "check in all loose files and diffs"
 
-	# patch debian changelog and update kernel package version
-	# git am ../patch/changelog.patch
+	# patching anything that could affect following configuration generation.
+	stg init
+	stg import -s ../patch/preconfig/series
 
 	# re-generate debian/rules.gen, requires kernel-wedge
-	# debian/bin/gencontrol.py
+	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 add debian/build/build_amd64_none_amd64/.config -f
+	git add debian/config.defines.dump -f
 	git commit -m "unmodified debian source"
-	stg init
+
+	# Learning new git repo head (above commit) by calling stg repair.
+	stg repair
 	stg import -s ../patch/series
 
 	# Building a custom kernel from Debian kernel source

patch/changelog.patch → patch/preconfig/changelog.patch

@@ -1,33 +1,31 @@
 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 ++++++++++++
+ debian/changelog |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index baeab31..9cdcdfc 100644
+index 5835b31..4ef1744 100644
 --- a/debian/changelog
 +++ b/debian/changelog
 @@ -1,3 +1,15 @@
-+linux (3.16.51-3+deb8u1) sonic; urgency=high
++linux (4.9.65-3+deb9u2) 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.51-3+deb8u1) sonic; urgency=high
++linux (4.9.65-3+deb9u2) sonic; urgency=high
 +
 +  * add support for S6000
 +
 + -- Shuotian Cheng <shuche@microsoft.com>  Sun, 19 Dec 2015 01:50:04 +0100
 +
- linux (3.16.51-3+deb8u1) jessie-security; urgency=high
+ linux (4.9.65-3+deb9u2) stretch-security; urgency=high
 
-   * dccp: CVE-2017-8824: use-after-free in DCCP code
--- 
-2.1.4
-
+   * x86: setup PCID, preparation work for KPTI.

patch/preconfig/series

@@ -0,0 +1 @@
+changelog.patch