From ada85138328d59380cf8ed491d5cb899c9fa1935 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Jul 2012 18:38:21 +0200
Subject: [PATCH 1/2] kernel: properly use our version in CONFIG_LOCALVERSION.

---
 srcpkgs/kernel/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 1868160f64..b6f5f1f414 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -53,9 +53,8 @@ do_configure() {
 		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
 		make ${makejobs} defconfig && make ${makejobs} allmodconfig
 	fi
-	if [ -n "${revision}" ]; then
-		sed -i -e "s|\(LOCALVERSION\)=\"\"|\1=\"_${revision}\"|" .config
-	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 
 do_build() {

From b3f6a7641f94a1ddf1134a246bea55062e5ebe5b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Jul 2012 18:39:51 +0200
Subject: [PATCH 2/2] kernel-snapshot: properly use our version in
 CONFIG_LOCALVERSION.

---
 srcpkgs/kernel-snapshot/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 5cf9e3a071..7d582db9fc 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -58,9 +58,8 @@ do_configure() {
 		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
 		make ${makejobs} defconfig && make ${makejobs} allmodconfig
 	fi
-	if [ -n "${revision}" ]; then
-		sed -i -e "s|\(LOCALVERSION\)=\"\"|\1=\"_${revision}\"|" .config
-	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 
 do_build() {