diff options
| author | Hector Palacios <hector.palacios@digi.com> | 2011-02-01 17:02:40 +0100 |
|---|---|---|
| committer | Hector Palacios <hector.palacios@digi.com> | 2011-02-01 17:56:38 +0100 |
| commit | 0d29da6da44d8abe8ab0f427a46f0c93cdc72c96 (patch) | |
| tree | e8f69738808da15b66f5e340123816eb3961b641 /scripts | |
| parent | 37e6606b1e1762e5e9b9301ea5f8f540271260c4 (diff) | |
| parent | 3225afe4c4d14545424963f109ede2bb400bf7e2 (diff) | |
Merge branch 'hpalacio/2.6.35_merged' into master (2.6.35)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
drivers/mtd/nand/Makefile
drivers/net/can/Makefile
drivers/net/smsc9118/smsc911x.c
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
The following files were wrongly merged by git automatic merge tool
and have to be reset to v2.6.35 version
drivers/net/phy.c
include/linux/phy.h
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 2f2ae46858db..5fd6ba67633c 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -42,6 +42,25 @@ scm_version() short=true fi + # Do we have a DEL-tag? + if git name-rev --tags HEAD | grep -i "del-" > /dev/null; then + + # -- The option 'exact-match' is available first by v1.5.5.1 + ver=$(git --version | cut -d " " -f 3 | sed 's#\.##g') + if [ $ver -gt 1551 ]; then + printf '%s' - $(git describe --tags --exact-match HEAD) + else + printf '%s' - $(git describe --tags) + fi + fi + + # Are there uncommitted changes? + git update-index --refresh --unmerged > /dev/null + if git diff-index --name-only HEAD | grep -v "^scripts/package" \ + | read dummy; then + printf '%s' -dirty + fi + # Check for git and a git repo. if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then |