[INET6]: Reorganize struct inet6_dev to save 8 bytes

[linux-2.6] / scripts / setlocalversion

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index a80d6ea8a5bfbce21a8b08b664784886345f6d5f..52f032e409a38b9c9eef8f5b340038d66805eb40 100644 (file)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -12,11 +12,13 @@ cd "${1:-.}" || usage
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
        # Do we have an untagged version?
        if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
-               printf '%s%s' -g `echo "$head" | cut -c1-8`
+               git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
        fi
 
        # Are there uncommitted changes?
-       if git diff-index HEAD | read dummy; then
+       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