summaryrefslogtreecommitdiff
path: root/recipes/linux
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2009-04-23 10:53:39 +0400
committerDmitry Baryshkov <dbaryshkov@gmail.com>2009-04-23 10:53:39 +0400
commit18e058e835e080d602c6c4781d5c83e37d66f846 (patch)
tree1648ade21d9068a20d809d94b6466aa44870edc3 /recipes/linux
parent6685e5012a4e8fb988bfa41658db72b33a661d32 (diff)
parent8f6996cef591593fc5347d7643f651cf50d20e89 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index 984efac4d3..5a4a11fecf 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -98,8 +98,11 @@ do_configure_prepend() {
-e '/CONFIG_LOGO=/d' \
-e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
-e '/CONFIG_LOCALVERSION/d' \
+ -e '/CONFIG_LOCALVERSION_AUTO/d' \
< '${WORKDIR}/defconfig' >>'${S}/.config'
+ echo 'CONFIG_LOCALVERSION=""' >>${S}/.config
+ echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config
#
# root-over-nfs-over-usb-eth support. Limited, but should cover some cases.
# Enable this by setting a proper CMDLINE_NFSROOT_USB.