Changeset 94159 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Mar 10, 2022 7:22:05 PM (3 years ago)

Author:

vboxsync

Message:

Repack scripts: Tell the script unpacking the drivers to check GA files if appropriate, instead of telling it to skip the sanity checking. The re-signing for older Windows version should work, except that the merging of the MS signature might be removed next.

Location:

trunk/src/VBox/Installer/win/Scripts

Files:

• Combined-3-RepackAdditions.cmd (modified) (2 diffs)
• UnpackBlessedDrivers.cmd (modified) (3 diffs)

trunk/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd

@@ -199 +199 @@
 echo **************************************************************************
 cd /d "%_MY_REPACK_DIR_AMD64%" || goto end_failed
-call "%_MY_REPACK_DIR_AMD64%\UnpackBlessedDrivers.cmd" -b "%_MY_BINDIR_AMD64%" -i "%_MY_OPT_SIGNED_AMD64%" -n -v || goto end_failed
+call "%_MY_REPACK_DIR_AMD64%\UnpackBlessedDrivers.cmd" -b "%_MY_BINDIR_AMD64%" -i "%_MY_OPT_SIGNED_AMD64%" --guest-additions || goto end_failed
 echo .
 
@@ -206 +206 @@
 echo **************************************************************************
 cd /d "%_MY_REPACK_DIR_X86%" || goto end_failed
-call "%_MY_REPACK_DIR_X86%\UnpackBlessedDrivers.cmd" -b "%_MY_BINDIR_X86%" -i "%_MY_OPT_SIGNED_X86%" -n -v || goto end_failed
+call "%_MY_REPACK_DIR_X86%\UnpackBlessedDrivers.cmd" -b "%_MY_BINDIR_X86%" -i "%_MY_OPT_SIGNED_X86%" --guest-additions || goto end_failed
 echo .
 

trunk/src/VBox/Installer/win/Scripts/UnpackBlessedDrivers.cmd

@@ -26 +26 @@
 if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & goto end_failed)
 set _MY_DRIVER_BASE_NAMES=VBoxSup VBoxNetAdp6 VBoxNetLwf VBoxUSB VBoxUSBMon
-set _MY_DRIVER_BASE_NAMES=VBoxSup VBoxNetAdp6 VBoxNetLwf VBoxUSB VBoxUSBMon
+set _MY_GUEST_ADDITIONS_DRIVER_BASE_NAMES=VBoxVideo VBoxWddm VBoxGuest VBoxMouse
 set _MY_UNZIP=%KBUILD_DEVTOOLS%\win.x86\bin\unzip.exe
 if not exist "%_MY_UNZIP%" (echo "%_MY_UNZIP%" does not exist & goto end_failed)
@@ -57 +57 @@
 if ".%1" == ".-v"           goto opt_v
 if ".%1" == ".--no-sign-verify" goto opt_v
+if ".%1" == ".--guest-additions" goto opt_ga
 
 echo syntax error: Unknown option: %1
@@ -94 +95 @@
 :opt_v
 set _MY_OPT_SIGN_VERIFY=0
+shift
+goto argument_loop
+
+:opt_ga
+set _MY_DRIVER_BASE_NAMES=%_MY_GUEST_ADDITIONS_DRIVER_BASE_NAMES%
 shift
 goto argument_loop