[CORE, ULP] fix file version fields. [MLNX: 2748]

Signed-off-by: Reuven Amitai <reuven@mellanox.co.il>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1372 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/bus/kernel/makefile.inc b/trunk/core/bus/kernel/makefile.inc
index aaa1fedd96faa9fd4331f2b2b06890296bb7db34..4f29f500780f2c5ff8dd40ca60e7f5f081fbdeea 100644 (file)
--- a/trunk/core/bus/kernel/makefile.inc
+++ b/trunk/core/bus/kernel/makefile.inc
@@ -14,4 +14,4 @@ STAMP=stampinf -a $(_BUILDARCH)
 \r
 $(INF_TARGET) : $(_INX)\$(INF_NAME).inx\r
     copy $(_INX)\$(@B).inx $@\r
-    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_F3VERSION).$(OPENIB_REV)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r

diff --git a/trunk/inc/mod_ver.def b/trunk/inc/mod_ver.def
index fa1b5460a6e3cfdc9bdd41232b982aa5d66ee486..b40572c3aebabd452b7cc8abce6695b8399df36c 100644 (file)
--- a/trunk/inc/mod_ver.def
+++ b/trunk/inc/mod_ver.def
@@ -14,7 +14,7 @@ IB_MAJORVERSION=2
 IB_MINORVERSION=0\r
 !ENDIF\r
 \r
-# unused File version Field 3\r
-!IF !DEFINED(IB_F3VERSION)\r
-IB_F3VERSION=0\r
-!ENDIF
\ No newline at end of file
+# unused build version field\r
+!IF !DEFINED(IB_BUILDVERSION)\r
+IB_BUILDVERSION=0\r
+!ENDIF\r

diff --git a/trunk/inc/openib.def b/trunk/inc/openib.def
index 6f0805806eda6500530b225cfaf7ef569b1e5f8c..86a2e50df4f8b17d5ae24bdec371e51ea599ac9f 100644 (file)
--- a/trunk/inc/openib.def
+++ b/trunk/inc/openib.def
@@ -11,15 +11,11 @@ IB_COMPANYNAME="""OpenFabrics\40Alliance"""
 IB_PRODUCTNAME="""OpenFabrics\x20Windows"""\r
 !ENDIF\r
 \r
-# get module version: major, minor & svn.ver\r
+# get module version: major, minor & build version\r
 !include mod_ver.def\r
 \r
-!IF !DEFINED(IB_FILEBUILD)\r
-IB_FILEBUILD=0\r
-!endif\r
-\r
-!IF !DEFINED(IB_FILEREV)\r
-IB_FILEREV=$(OPENIB_REV)\r
+!IF !DEFINED(OPENIB_REV)\r
+OPENIB_REV=0\r
 !ENDIF\r
 \r
 !IFNDEF VER_PROVIDER\r
@@ -30,6 +26,6 @@ C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \
     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \\r
     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \\r
     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \\r
-    -DVER_FILEBUILD=$(IB_FILEBUILD) \\r
-       -DVER_FILEREV=$(IB_FILEREV) \\r
-       -DVER_PROVIDER=$(VER_PROVIDER)\r
+    -DVER_FILEBUILD=$(IB_BUILDVERSION) \\r
+    -DVER_FILEREV=$(OPENIB_REV) \\r
+    -DVER_PROVIDER=$(VER_PROVIDER)\r

diff --git a/trunk/ulp/ipoib/kernel/makefile.inc b/trunk/ulp/ipoib/kernel/makefile.inc
index aaa1fedd96faa9fd4331f2b2b06890296bb7db34..4f29f500780f2c5ff8dd40ca60e7f5f081fbdeea 100644 (file)
--- a/trunk/ulp/ipoib/kernel/makefile.inc
+++ b/trunk/ulp/ipoib/kernel/makefile.inc
@@ -14,4 +14,4 @@ STAMP=stampinf -a $(_BUILDARCH)
 \r
 $(INF_TARGET) : $(_INX)\$(INF_NAME).inx\r
     copy $(_INX)\$(@B).inx $@\r
-    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_F3VERSION).$(OPENIB_REV)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r

diff --git a/trunk/ulp/qlgcvnic/kernel/makefile.inc b/trunk/ulp/qlgcvnic/kernel/makefile.inc
index aaa1fedd96faa9fd4331f2b2b06890296bb7db34..4f29f500780f2c5ff8dd40ca60e7f5f081fbdeea 100644 (file)
--- a/trunk/ulp/qlgcvnic/kernel/makefile.inc
+++ b/trunk/ulp/qlgcvnic/kernel/makefile.inc
@@ -14,4 +14,4 @@ STAMP=stampinf -a $(_BUILDARCH)
 \r
 $(INF_TARGET) : $(_INX)\$(INF_NAME).inx\r
     copy $(_INX)\$(@B).inx $@\r
-    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_F3VERSION).$(OPENIB_REV)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r

diff --git a/trunk/ulp/srp/kernel/makefile.inc b/trunk/ulp/srp/kernel/makefile.inc
index aaa1fedd96faa9fd4331f2b2b06890296bb7db34..4f29f500780f2c5ff8dd40ca60e7f5f081fbdeea 100644 (file)
--- a/trunk/ulp/srp/kernel/makefile.inc
+++ b/trunk/ulp/srp/kernel/makefile.inc
@@ -14,4 +14,4 @@ STAMP=stampinf -a $(_BUILDARCH)
 \r
 $(INF_TARGET) : $(_INX)\$(INF_NAME).inx\r
     copy $(_INX)\$(@B).inx $@\r
-    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_F3VERSION).$(OPENIB_REV)\r
+    $(STAMP) -f $@ -d * -v $(IB_MAJORVERSION).$(IB_MINORVERSION).$(IB_BUILDVERSION).$(OPENIB_REV)\r