X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=scripts%2Fsetlocalversion;h=ef8729f48586d193d3926d5bd6c4d0b9c34bcb96;hb=d530db0db90378b5674cb78d9c0cfcc83f851a5e;hp=057b6b3c5dfb4cf0677add9a7c6f04c5029d2e15;hpb=5e62feabcc3e4127a084701ec54ffe891985b7e8;p=net-next-2.6.git diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 057b6b3c5df..ef8729f4858 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then # full scm version string res="$res$(scm_version)" else - # apped a plus sign if the repository is not in a clean tagged - # state and LOCALVERSION= is not specified + # 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:++}"