projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: rme32: Fix the missing snd_card_free() call at probe error
[linux-2.6-microblaze.git]
/
scripts
/
setlocalversion
diff --git
a/scripts/setlocalversion
b/scripts/setlocalversion
index
6b54e46
..
af4754a
100755
(executable)
--- a/
scripts/setlocalversion
+++ b/
scripts/setlocalversion
@@
-111,9
+111,7
@@
if $scm_only; then
exit
fi
exit
fi
-if test -e include/config/auto.conf; then
- . include/config/auto.conf
-else
+if ! test -e include/config/auto.conf; then
echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2
exit 1
fi
echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2
exit 1
fi
@@
-125,10
+123,11
@@
if test ! "$srctree" -ef .; then
fi
# CONFIG_LOCALVERSION and LOCALVERSION (if set)
fi
# CONFIG_LOCALVERSION and LOCALVERSION (if set)
-res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
+config_localversion=$(sed -n 's/^CONFIG_LOCALVERSION=\(.*\)$/\1/p' include/config/auto.conf)
+res="${res}${config_localversion}${LOCALVERSION}"
# scm version string if not at a tagged commit
# scm version string if not at a tagged commit
-if
test "$CONFIG_LOCALVERSION_AUTO" = "y"
; then
+if
grep -q "^CONFIG_LOCALVERSION_AUTO=y$" include/config/auto.conf
; then
# full scm version string
res="$res$(scm_version)"
elif [ "${LOCALVERSION+set}" != "set" ]; then
# full scm version string
res="$res$(scm_version)"
elif [ "${LOCALVERSION+set}" != "set" ]; then