repository: C:/dev/kvm-guest-drivers-windows
branch: master
commit 4dd50edea41a968f3b78edc35df58054f00785b9
Author: Yan Vugenfirer <[email protected]>
Date: Wed Jul 13 14:54:07 2011 +0300
[NetKVM] Changing driver and inf versioning to conform to other virtio
drivers
diff --git a/NetKVM/buildAll.bat b/NetKVM/buildAll.bat
index d4018b0..c66d84a 100644
--- a/NetKVM/buildAll.bat
+++ b/NetKVM/buildAll.bat
@@ -23,8 +23,13 @@ popd
set BUILDROOT=C:\WINDDK\%DDKVER%
set X64ENV=x64
if "%DDKVER%"=="6000" set X64ENV=amd64
-set _MAJORVERSION_=209
-set _MINORVERSION_=605
+
+if "%_BUILD_MAJOR_VERSION_%"=="" set _BUILD_MAJOR_VERSION_=101
+if "%_BUILD_MINOR_VERSION_%"=="" set _BUILD_MINOR_VERSION_=58000
+if "%_RHEL_RELEASE_VERSION_%"=="" set _RHEL_RELEASE_VERSION_=61
+
+set _MAJORVERSION_=%_BUILD_MAJOR_VERSION_%
+set _MINORVERSION_=%_BUILD_MINOR_VERSION_%
set _DRIVER_ISO_NAME=Install-%_MINORVERSION_%%_MAJORVERSION_%.iso
set OLD_PATH=%PATH%
@@ -62,8 +67,13 @@ goto :eof
:preparebuild
echo DIRS=%* > dirs
for %%f in (%*) do echo !include $(NTMAKEENV)\makefile.def > %%f\makefile
-set /a _NT_TARGET_MAJ="%_NT_TARGET_VERSION% >> 8"
-set /a _NT_TARGET_MIN="%_NT_TARGET_VERSION% & 255"
+set /a _NT_TARGET_MAJ_ARCH="%_NT_TARGET_VERSION% >> 8"
+set /a _NT_TARGET_MIN_ARCH="%_NT_TARGET_VERSION% & 255"
+
+set /a _NT_TARGET_MAJ="(%_NT_TARGET_VERSION% >> 8) * 10 +
(%_NT_TARGET_VERSION% & 255)"
+set _NT_TARGET_MIN=%_RHEL_RELEASE_VERSION_%
+rem set
STAMPINF_VERSION=%_NT_TARGET_MAJ%.%_RHEL_RELEASE_VERSION_%.%_BUILD_MAJOR_VERSION_%.%_BUILD_MINOR_VERSION_%
+
set
_VERSION_=%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%.%_MAJORVERSION_%.%_MINORVERSION_%
echo version set: %_VERSION_%
goto :eof
diff --git a/NetKVM/tools/signing.cmd b/NetKVM/tools/signing.cmd
index f4c0a39..24c84cb 100644
--- a/NetKVM/tools/signing.cmd
+++ b/NetKVM/tools/signing.cmd
@@ -54,7 +54,7 @@ echo system %1
echo INF file %2
echo VERSION file %3
echo Target OS mask %_OSMASK_%
-for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%
+for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ_ARCH%.%_NT_TARGET_MIN_ARCH%
inf2cat /driver:%~dp2 /os:%_OSMASK_%
SignTool sign %SIGNCERT% %SIGNTIMESTAMP% %~dpn2.cat
goto :eof
@@ -69,7 +69,7 @@ if /i "%1"=="x86" set _OSMASK_=256
if /i "%1"=="amd64" set _OSMASK_=512
if /i "%1"=="x64" set _OSMASK_=512
echo Target OS mask %_OSMASK_%
-for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%
+for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ_ARCH%.%_NT_TARGET_MIN_ARCH%
signability /driver:%~dp2 /auto /cat /dtc /os:%_OSMASK_%
taskkill /FI "WINDOWTITLE eq signability*"
SignTool sign %SIGNCERT% %SIGNTIMESTAMP% %~dpn2.cat
@@ -87,7 +87,7 @@ rem (128+16=144) xp64 + 2003-64
if /i "%1"=="amd64" set _OSMASK_=144
if /i "%1"=="x64" set _OSMASK_=144
echo Target OS mask %_OSMASK_%
-for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%
+for /F "usebackq tokens=2" %%d in (`date /t`) do stampinf -f %2 -d %%d -v %3
-a %_BUILDARCH%.%_NT_TARGET_MAJ_ARCH%.%_NT_TARGET_MIN_ARCH%
signability /driver:%~dp2 /auto /cat /os:%_OSMASK_%
taskkill /FI "WINDOWTITLE eq signability*"
SignTool sign %SIGNCERT% %SIGNTIMESTAMP% %~dpn2.cat
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
