Changeset 71955 in vbox for trunk

Timestamp:

Apr 21, 2018 11:15:06 PM (7 years ago)

Author:

vboxsync

Message:

Installer/win: Dummy INF files for ring-0 bits. bugref:8691

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (3 diffs)
• Scripts/PackDriversForSubmission.cmd (modified) (1 diff)
• Scripts/VBoxExtPackPuel.inf (added)
• Scripts/VMMR0.inf (added)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -995 +995 @@
 
 #
-# Repackaging script installation target.
+# Repackaging scripts and files.
 #
 INSTALLS += RePackScripts
@@ -1005 +1005 @@
         Scripts/UnpackBlessedDrivers.cmd \
         $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
-        $(RePackScripts_0_OUTDIR)/sign-sha1.cmd
+        $(RePackScripts_0_OUTDIR)/sign-sha1.cmd \
+        $(RePackScripts_0_OUTDIR)/VMMR0.inf \
+        $(RePackScripts_0_OUTDIR)/VBoxExtPackPuel.inf
 RePackScripts_CLEAN = \
         $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
-        $(RePackScripts_0_OUTDIR)/sign-sha1.cmd
+        $(RePackScripts_0_OUTDIR)/sign-sha1.cmd \
+        $(RePackScripts_0_OUTDIR)/VMMR0.inf \
+        $(RePackScripts_0_OUTDIR)/VBoxExtPackPuel.inf
 
 $$(RePackScripts_0_OUTDIR)/sign-dual.cmd: | $$(dir $$@)
@@ -1028 +1032 @@
                 ) )
 
+$$(RePackScripts_0_OUTDIR)/VMMR0.inf: $(PATH_SUB_CURRENT)/Scripts/VMMR0.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,RePackScripts,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+$$(RePackScripts_0_OUTDIR)/VBoxExtPackPuel.inf: $(PATH_SUB_CURRENT)/Scripts/VBoxExtPackPuel.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,RePackScripts,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -175 +175 @@
 
 echo .Set DestinationDir=VMMR0>>                                                        "%_MY_OPT_DDF_FILE%"
-echo %_MY_OPT_BINDIR%\VMMR0.inf VMMR0.inf>>                                             "%_MY_OPT_DDF_FILE%"
+echo .\VMMR0.inf VMMR0.inf>>                                                            "%_MY_OPT_DDF_FILE%"
 echo %_MY_OPT_BINDIR%\VMMR0.r0 VMMR0.r0>>                                               "%_MY_OPT_DDF_FILE%"
 if "%_MY_OPT_WITH_PDB" == "1" echo %_MY_OPT_PDBDIR%\VMMR0.pdb VMMR0.pdb>>               "%_MY_OPT_DDF_FILE%"