Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
scripts
/
version_tag.pl.in
diff --git
a/lustre/scripts/version_tag.pl.in
b/lustre/scripts/version_tag.pl.in
index
c252212
..
c341642
100644
(file)
--- a/
lustre/scripts/version_tag.pl.in
+++ b/
lustre/scripts/version_tag.pl.in
@@
-156,7
+156,12
@@
sub generate_ver($$$)
$hour, $min, $sec);
print "#define BUILD_VERSION \"";
$hour, $min, $sec);
print "#define BUILD_VERSION \"";
- if ($pristine) {
+
+ my $lustre_vers = $ENV{LUSTRE_VERS};
+
+ if ($lustre_vers) {
+ print "$tag-$lustre_vers\"\n";
+ } elsif ($pristine) {
print "$tag-$show_last-PRISTINE-$linuxdir-$kernver\"\n";
} else {
print "$tag-$show_last-CHANGED-$linuxdir-$kernver\"\n";
print "$tag-$show_last-PRISTINE-$linuxdir-$kernver\"\n";
} else {
print "$tag-$show_last-CHANGED-$linuxdir-$kernver\"\n";