* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h
Showing the changes to scripts/setlocalversion (1 of 16 files). Show all
Unified · Split
| @@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then · 159 unmodified lines | ||
| 160 | 160 | # full scm version string |
| 161 | 161 | res="$res$(scm_version)" |
| 162 | 162 | else |
| 163 | − # apped a plus sign if the repository is not in a clean tagged | |
| 164 | − # state and LOCALVERSION= is not specified | |
| 163 | + # append a plus sign if the repository is not in a clean | |
| 164 | + # annotated or signed tagged state (as git describe only | |
| 165 | + # looks at signed or annotated tags - git tag -a/-s) and | |
| 166 | + # LOCALVERSION= is not specified | |
| 165 | 167 | if test "${LOCALVERSION+set}" != "set"; then |
| 166 | 168 | scm=$(scm_version --short) |
| 167 | 169 | res="$res${scm:++}" |