Mike Fedyk
2010-May-04 16:12 UTC
[PATCH 1/2] Change version.sh from last tag and hash to output last commit date and hash
The btrfs git repo doesn''t have all of the tags from the base 2.6.32
kernel
it''s currently based upon and the btrfs module is regularly compiled
against other kernels so this changes the version to be based upon the date
and hash of the latest commit instead which is more relevant to most people
testing.
An example version string with this change:
Btrfs 2010-04-06_09:37:47_-0400_9f680ce
---
fs/btrfs/version.sh | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
mode change 100644 => 100755 fs/btrfs/version.sh
diff --git a/fs/btrfs/version.sh b/fs/btrfs/version.sh
old mode 100644
new mode 100755
index 1ca1952..a4576f2
--- a/fs/btrfs/version.sh
+++ b/fs/btrfs/version.sh
@@ -12,10 +12,7 @@ which git &> /dev/null
if [ $? == 0 ]; then
git branch >& /dev/null
if [ $? == 0 ]; then
- if head=`git rev-parse --verify HEAD 2>/dev/null`; then
- if tag=`git describe --tags 2>/dev/null`; then
- v="$tag"
- fi
+ v="`git show --format=''%ci_%h''|head -n 1|sed
''s/[^a-z0-9_-:]/_/ig''`"
# Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null
@@ -24,7 +21,6 @@ if [ $? == 0 ]; then
| read dummy; then
v="$v"-dirty
fi
- fi
fi
fi
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
---
fs/btrfs/version.h | 6 +++---
fs/btrfs/version.sh | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/btrfs/version.h b/fs/btrfs/version.h
index 9bf3946..12f7e5c 100644
--- a/fs/btrfs/version.h
+++ b/fs/btrfs/version.h
@@ -1,4 +1,4 @@
-#ifndef __BTRFS_VERSION_H
-#define __BTRFS_VERSION_H
-#define BTRFS_BUILD_VERSION "Btrfs"
+#ifndef __BUILD_VERSION
+#define __BUILD_VERSION
+#define BTRFS_BUILD_VERSION "Btrfs
2010-05-04_08:46:49_-0700_ea1dcb3-dirty"
#endif
diff --git a/fs/btrfs/version.sh b/fs/btrfs/version.sh
index a4576f2..0733eef 100755
--- a/fs/btrfs/version.sh
+++ b/fs/btrfs/version.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/dash
#
# determine-version -- report a useful version for releases
#
@@ -8,10 +8,10 @@
v="v0.16"
-which git &> /dev/null
-if [ $? == 0 ]; then
- git branch >& /dev/null
- if [ $? == 0 ]; then
+which git 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ git branch 2>&1 > /dev/null
+ if [ $? -eq 0 ]; then
v="`git show --format=''%ci_%h''|head -n 1|sed
''s/[^a-z0-9_-:]/_/ig''`"
# Are there uncommitted changes?
@@ -19,7 +19,7 @@ if [ $? == 0 ]; then
if git diff-index --name-only HEAD | \
grep -v "^scripts/package" \
| read dummy; then
- v="$v"-dirty
+ v="${v}-dirty"
fi
fi
fi
@@ -29,9 +29,9 @@ echo "#define __BUILD_VERSION" >>
.build-version.h
echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >>
.build-version.h
echo "#endif" >> .build-version.h
-diff -q version.h .build-version.h >& /dev/null
+diff -q version.h .build-version.h 2>&1 > /dev/null
-if [ $? == 0 ]; then
+if [ $? -eq 0 ]; then
rm .build-version.h
exit 0
fi
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please ignore this patch, I will resend a fixed one. On Tue, May 4, 2010 at 9:12 AM, Mike Fedyk <mfedyk@mikefedyk.com> wrote:> > --- > > fs/btrfs/version.h | 6 +++--- > fs/btrfs/version.sh | 16 ++++++++-------- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/fs/btrfs/version.h b/fs/btrfs/version.h > index 9bf3946..12f7e5c 100644 > --- a/fs/btrfs/version.h > +++ b/fs/btrfs/version.h > @@ -1,4 +1,4 @@ > -#ifndef __BTRFS_VERSION_H > -#define __BTRFS_VERSION_H > -#define BTRFS_BUILD_VERSION "Btrfs" > +#ifndef __BUILD_VERSION > +#define __BUILD_VERSION > +#define BTRFS_BUILD_VERSION "Btrfs 2010-05-04_08:46:49_-0700_ea1dcb3-dirty" > #endif > diff --git a/fs/btrfs/version.sh b/fs/btrfs/version.sh > index a4576f2..0733eef 100755 > --- a/fs/btrfs/version.sh > +++ b/fs/btrfs/version.sh > @@ -1,4 +1,4 @@ > -#!/bin/bash > +#!/bin/dash > # > # determine-version -- report a useful version for releases > # > @@ -8,10 +8,10 @@ > > v="v0.16" > > -which git &> /dev/null > -if [ $? == 0 ]; then > - git branch >& /dev/null > - if [ $? == 0 ]; then > +which git 2>&1 > /dev/null > +if [ $? -eq 0 ]; then > + git branch 2>&1 > /dev/null > + if [ $? -eq 0 ]; then > v="`git show --format=''%ci_%h''|head -n 1|sed ''s/[^a-z0-9_-:]/_/ig''`" > > # Are there uncommitted changes? > @@ -19,7 +19,7 @@ if [ $? == 0 ]; then > if git diff-index --name-only HEAD | \ > grep -v "^scripts/package" \ > | read dummy; then > - v="$v"-dirty > + v="${v}-dirty" > fi > fi > fi > @@ -29,9 +29,9 @@ echo "#define __BUILD_VERSION" >> .build-version.h > echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >> .build-version.h > echo "#endif" >> .build-version.h > > -diff -q version.h .build-version.h >& /dev/null > +diff -q version.h .build-version.h 2>&1 > /dev/null > > -if [ $? == 0 ]; then > +if [ $? -eq 0 ]; then > rm .build-version.h > exit 0 > fi > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >-- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html