On Tue, Jul 18, 2006 at 11:27:40AM -0500, Manoj Srivastava wrote: > On 26 Jun 2006, Rob Sims stated: > > In addition, make-kpkg clean does not "undirty" the kernel. The > Hmm. I guess I can look into that. > > -dirty is appended by scripts/setlocalversion, which flags the > > following:
> > git diff-files :100644 100644
> > 7c434e037e7f658bdc088cbc760d4eaba36f785d
> > 0000000000000000000000000000000000000000 M scripts/package/Makefile
> > :100644 000000 6edb29f2b4a6c8aa056a748168a70583897a9d3c
> > 0000000000000000000000000000000000000000 D scripts/package/builddeb
> > Are the changes to these files necessary, or just insurance that the
> > built-in package generator is not used?
> They are necessary.
There goes the easy fix. How about patching scripts/setlocalversion at build
time in addition to the above two files?
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 82e4993..65dcb40 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -16,7 +16,7 @@ if head=`git rev-parse --verify HEAD 2>/
fi
# Are there uncommitted changes?
- if git diff-index HEAD | read dummy; then
+ if git diff-index HEAD | grep -v -e "scripts/package/Makefile$" -e
"scripts/package/builddeb$" -e "scripts/setlocalversion$" | read dummy; then
printf '%s' -dirty
fi
fi
--
Rob
Life is the urge to ecstasy.
signature.asc
Description: Digital signature

