Skip to contentSkip to conversation

Change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format

RFC PATCH Applied Theodore Ts'o 2 participants 4 messages Nov 3, 2007 – Jan 3, 2008

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/3 Change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format

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.

---
 scripts/setlocalversion |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/setlocalversion +1 -1
index 82e4993..20711f5 100644
@@ -12,7 +12,7 @@ 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?
Signature · 1 line
1.5.3.4.499.g1104e-dirty
#1 lore raw

RFC PATCH 2/3 Fix scripts/setlocalversion to avoid erroneous -dirty tag

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 status" will update the index to avoid these false positives.

---
 scripts/setlocalversion |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
scripts/setlocalversion +1 -0
index 20711f5..bfc8c8c 100644
@@ -16,6 +16,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	fi
 
 	# Are there uncommitted changes?
+	git status >& /dev/null
 	if git diff-index HEAD | read dummy; then
 		printf '%s' -dirty
 	fi
Signature · 1 line
1.5.3.4.499.g1104e-dirty
#2 lore raw

RFC PATCH 3/3 scripts/setlocalversion: 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.)

---
 scripts/setlocalversion |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
scripts/setlocalversion +2 -1
index bfc8c8c..ad56a06 100644
@@ -17,7 +17,8 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 
 	# Are there uncommitted changes?
 	git status >& /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
 fi
Signature · 1 line
1.5.3.4.499.g1104e-dirty
Applied
#3 lore raw
In reply to Theodore Ts'o
Quoted 4 lines · Theodore Ts'o

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.

Applied all three. Removed the dash in git describe to make in conformant to versions of git without it.

Sam