03 Feb, 2008
1 commit
-
follow git and mercurial style, include uncommitted changes detect
Cc: Frans Pop
Signed-off-by: Bryan Wu
Signed-off-by: Sam Ravnborg
29 Jan, 2008
4 commits
-
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"
Signed-off-by: Sam Ravnborg -
If git's index file is out of date, and some files have been touched
such that their timestamp doesn't what is in the index, "git
diff-index HEAD" may show that a particular file is dirty, when in
fact it really isn't. Running "git update-index" will update the
index to avoid these false positives.Signed-off-by: "Theodore Ts'o"
Signed-off-by: Sam Ravnborg -
Change the automatic local version to have the form -nnnnn-gSHA1SUMID,
where 'nnnnn' is the number of commits since the last tag (i.e.,
2.6.21-rc7). This makes it much more likely that the package names created
for the kernel will look "newer" to a package manager.Signed-off-by: "Theodore Ts'o"
Signed-off-by: Sam Ravnborg -
This represents mercurial changesets similarly to git. For untagged
revisions, append the changeset id. If there are uncommitted changes,
append -dirty. For example, -hgc60016ba6237-dirtySigned-off-by: Aron Griffis
Signed-off-by: Sam Ravnborg
17 Jun, 2006
2 commits
-
Compare the working copy with the last commit, instead of the index.
Signed-off-by: Uwe Zeisberger
Acked-by: Ryan Anderson
Signed-off-by: Sam Ravnborg -
adds revision suffix for untagged commits that are reachable from a tag
I'm bisecting and don't get the -g...... suffix. The reason is, that
git name-rev --tags HEAD
returns e.g.
HEAD tags/v2.6.17-rc1^0~1067
which is currently good enough for setlocalversion to skip the suffix.
This introduces a dependecy to grep -E, which should be fine.Signed-off-by: Uwe Zeisberger
Acked-By: Ryan Anderson
Signed-off-by: Sam Ravnborg
09 Jan, 2006
1 commit
-
When building Debian packages directly from the git tree, the appended
"git_dirty" is a problem due to the underscore. In order to cause the
least problems, change that just to "dirty".Signed-off-by: Ryan Anderson
Signed-off-by: Sam Ravnborg
07 Jan, 2006
1 commit
-
Currently scripts/setlocalversion is a Perl script that tries to figure
out the current git commit ID of a repo without using git. It also
imports Digest::MD5 without using it and generally is too big for the
small task it does. :] And it always reports a git ID, even when the
HEAD is tagged -- this is a bug.This patch replaces it with a Bourne Shell script that uses git
commands to do the same. I can't come up with a scenario where someone
would use a git repo and refuse to install git core at the same time,
so I think it's reasonable to assume git is available.The new script also reports uncommitted changes by adding -git_dirty to
the version string. Obviously you can't see from that _what_ has been
changed from the last commit, so it's more of a reminder that you
forgot to commit something.The script is easily extensible: simply add a check for Mercurial (or
whatever) below the git check.Note: the script doesn't print a newline char anymore. That's only
because it was easier to implement it that way, not a feature (or bug).
'make kernelrelease' doesn't care.Signed-off-by: Rene Scharfe
Acked-by: Ryan Anderson
Signed-off-by: Sam Ravnborg
11 Aug, 2005
1 commit
-
If CONFIG_AUTO_LOCALVERSION is set, the user is using a git-based tree, and the
current HEAD is not referred to by any tags in .git/refs/tags/, append -g and
the first 8 characters of the commit to the version string. This makes it
easier to use git-bisect, and/or to do a daily build, without trampling on your
older, working builds, or accidentally setting up conflicting sets of modules.Signed-off-by: Ryan Anderson
Signed-off-by: Sam Ravnborg