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

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
vivekrnv · Aug 10, 2018 · 63698ea · 63698ea
1 parent 61923df
commit 63698ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -67,8 +67,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	git add -f *
 	git commit -m "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
@@ -79,7 +80,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Applying patches and configuration changes
 	git add debian/build/build_amd64_none_amd64/.config -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

diff --git a/patch/changelog.patch → patch/preconfig/changelog.patch b/patch/changelog.patch → patch/preconfig/changelog.patch
diff --git a/patch/preconfig/series b/patch/preconfig/series
@@ -0,0 +1 @@
+changelog.patch