From 0e65446676edddd7b9929456afa1c6e973ac600a Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Mon, 31 Mar 2008 05:42:03 +0000
Subject: Patch in EXTRA_VERSION

---
 target/linux/Config.in.advanced   | 8 ++++++++
 target/linux/Makefile.in.advanced | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'target/linux')

diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index b835176e9..da2c03e68 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -346,6 +346,14 @@ config BR2_KERNEL_PATCH
 	default "$(BR2_LINUX26_MM_VERSION).bz2" if BR2_KERNEL_ADD_MM_PATCH
 	default $(BR2_CUSTOM_LINUX26_PATCH) if BR2_LINUX26_CUSTOM
 
+config BR2_EXTRA_VERSION
+	string
+	default ".$(BR2_KERNEL_PATCH_LEVEL)"	if  BR2_KERNEL_ADD_MINORPATCH || BR2_KERNEL_ADD_LATEST_MINORPATCH
+	default "$(BR2_KERNEL_RC_LEVEL)"	if BR2_KERNEL_ADD_LATEST_RC_PATCH
+	default "$(BR2_KERNEL_RC_LEVEL)"	if BR2_KERNEL_ADD_RC_PATCH
+	default "BR2_KERNEL_GIT_LEVEL"		if BR2_KERNEL_ADD_LATEST_SNAPSHOT
+	default	"$(BR2_KERNEL_MM_LEVEL)"	if BR2_KERNEL_ADD_LATEST_MM_PATCH
+	default	"$(BR2_KERNEL_MM_LEVEL)"	if BR2_KERNEL_ADD_MM_PATCH
 endmenu
 
 # -----------------------------------------------
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 0c67f220e..a55223592 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -103,7 +103,7 @@ endif
 endif
 endif
 
-KERNEL_CONFIG_METHOD:=($(strip $(subst ",,$(BR2_KERNEL_CONFIG_METHOD))),)
+KERNEL_CONFIG_METHOD:=$(strip $(subst ",,$(BR2_KERNEL_CONFIG_METHOD)))
 #"))
 ifeq ($(KERNEL_CONFIG_METHOD),)
 KERNEL_CONFIG_METHOD:=xconfig
@@ -335,6 +335,10 @@ ifeq ($(BR2_PACKAGE_LINUX_USE_KCONFIG),y)
 		$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) $(KERNEL_CONFIG_METHOD) ; \
 	fi
 endif
+ifneq ($(strip $(subst ",,$(BR2_EXTRA_VERSION))),)
+	$(SED) 's,^EXTRA_VERSION=.*,EXTRA_VERSION=="$(BR2_EXTRA_VERSION)",g'
+endif
+
 
 # -----------------------------------------------------------------------------
 $(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.config
-- 
cgit v1.2.3