summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-11-02 21:53:01 -0400
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 23:14:37 +0100
commitb052ce4c840e2da3c72ab7dadb97d1094f6e3a89 (patch)
tree7d6f19f223946501bbefc70d1988f559d8504cf4
parent4e7434ff028c4280bed620f28fdbf9f4d77d77ce (diff)
downloadop-kernel-dev-b052ce4c840e2da3c72ab7dadb97d1094f6e3a89.zip
op-kernel-dev-b052ce4c840e2da3c72ab7dadb97d1094f6e3a89.tar.gz
kbuild: fix false positive -dirty tag caused by make-kpkg
make-kpkg modifies scripts/package/Makefile and deletes scripts/package/builddeb as part of its build process. Ignore these changes so the tree isn't marked as -dirty, when it is just an artifact of make-kpkg. (make-kpkg clean restores the files to their original state, and these helper scripts won't affect the final compiled kernel in any way.) Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/setlocalversion3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index acce8eb..52f032e 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -17,7 +17,8 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
# Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null
- if git diff-index HEAD | read dummy; then
+ if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+ | read dummy; then
printf '%s' -dirty
fi
OpenPOWER on IntegriCloud