From ea29afc3fd1066967933ba8bed02e7cb865dd4d7 Mon Sep 17 00:00:00 2001 From: Alex Boag-Munroe Date: Tue, 12 Jun 2012 18:38:19 +0100 Subject: [PATCH] Don't add + to allow kernel version to match binary module vermagic --- scripts/setlocalversion | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 40aa8fcba3ef..0d69fc34794b 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -163,15 +163,15 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then # full scm version string res="$res$(scm_version)" -else +#else # append a plus sign if the repository is not in a clean # annotated or signed tagged state (as git describe only # looks at signed or annotated tags - git tag -a/-s) and # LOCALVERSION= is not specified - if test "${LOCALVERSION+set}" != "set"; then - scm=$(scm_version --short) - res="$res${scm:++}" - fi +# if test "${LOCALVERSION+set}" != "set"; then +# scm=$(scm_version --short) +# res="$res${scm:++}" +# fi fi echo "$res"