From ee973032aed1a16effa8535e9277ef306ca330b2 Mon Sep 17 00:00:00 2001 From: Mauro Ribeiro Date: Fri, 27 Sep 2013 02:34:46 -0300 Subject: [PATCH] scripts: ignore scm version --- scripts/setlocalversion | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index a2bcac82325f..3d6136407077 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -159,18 +159,18 @@ fi res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" # scm version string if not at a tagged commit -if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then +#if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then # full scm version string - res="$res$(scm_version)" -else +# res="$res$(scm_version)" +#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) +# if test "${LOCALVERSION+set}" != "set"; then + # scm=$(scm_version --short) # res="$res${scm:++}" - fi -fi +# fi +#fi echo "$res"