projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63342ea)
Patch in EXTRA_VERSION
authorUlf Samuelsson <ulf.samuelsson@atmel.com>
Mon, 31 Mar 2008 05:42:03 +0000 (05:42 -0000)
committerUlf Samuelsson <ulf.samuelsson@atmel.com>
Mon, 31 Mar 2008 05:42:03 +0000 (05:42 -0000)
target/linux/Config.in.advanced patch | blob | history
target/linux/Makefile.in.advanced patch | blob | history

diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index b835176e9875091400ad1e2eec602ec45c2369f6..da2c03e68e4d10baf31170f2dec97a61d3a94705 100644 (file)
--- 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 0c67f220e0a47e78267ed2c3c32cd20108603bd6..a5522359236a8913d57bbea66705c1d9215cdeda 100644 (file)
--- 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