diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 01:58:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 01:58:05 +0100 |
| commit | 597690cd02684b7e4904288e4b85797123a5093f (patch) | |
| tree | f5d2a84771b9d532f2fe99a9cf4e0b51f5432e26 /scripts | |
| parent | Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block (diff) | |
| parent | frv: Remove redundant debugging info flag (diff) | |
| download | linux-597690cd02684b7e4904288e4b85797123a5093f.tar.xz linux-597690cd02684b7e4904288e4b85797123a5093f.zip | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
- fix make -s detection with make-4.0
- fix for scripts/setlocalversion when the kernel repository is a
submodule
- do not hardcode ';' in macros that expand to assembler code, as some
architectures' assemblers use a different character for newline
- Fix passing --gdwarf-2 to the assembler
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
frv: Remove redundant debugging info flag
mn10300: Remove redundant debugging info flag
kbuild: Fix debugging info generation for .S files
arch: use ASM_NL instead of ';' for assembler new line character in the macro
kbuild: Fix silent builds with make-4
Fix detectition of kernel git repository in setlocalversion script [take #2]
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index d105a44b68f6..63d91e22ed7c 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -43,7 +43,8 @@ scm_version() fi # Check for git and a git repo. - if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && + head=`git rev-parse --verify --short HEAD 2>/dev/null`; then # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore # it, because this version is defined in the top level Makefile. |