summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserj.kalichev <serj.kalichev@gmail.com>2010-05-01 21:08:43 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-05-01 21:08:43 +0200
commitd07aee18c46a6158ea67b51a6d7bb76946ca8698 (patch)
treebad9be790ce2beb5b767fedbae63bd62ed1a2cfc
parent532e1fb5d3571591c3602387d5971830b708f83e (diff)
linux-advanced: Fix Kernel EXTRAVERSION for BR2_LINUX26_CUSTOM
Closes #1267 Signed-off-by: serj.kalichev <serj.kalichev@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES1
-rw-r--r--target/linux/Config.in.advanced2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 46b975749..385a68258 100644
--- a/CHANGES
+++ b/CHANGES
@@ -45,6 +45,7 @@
#1129: Bump memstat to 0.8 and migrate to Makefile.package.in
#1189: Wrong u-boot configuration name for integrator926 target
#1219: kernel headers not correctly installed into toolchain/staging
+ #1267: Wrong BR2_EXTRA_VERSION
#1273: BR2_INET_IPV6 does not enable IPv6 in pppd
#1303: Add librsync package
#1321: Busybox link fails due to lack of --sysroot option
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index 2c5dc3667..b0022d3a0 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -263,7 +263,7 @@ config BR2_EXTRA_VERSION
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_GIT_LEVEL)" if BR2_KERNEL_ADD_SNAPSHOT
- default "$(BR2_CUSTOM_LINUX26_VERSION)" if BR2_LINUX26_CUSTOM
+ default "" if BR2_LINUX26_CUSTOM
endmenu
# -----------------------------------------------