Changeset 72800 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Jul 2, 2018 4:19:11 PM (7 years ago)

Author:

vboxsync

Message:

EFI: Added make variable VBOX_BLD_PYTHON_2X for specifying a 2.x python for use with EFI.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -45 +45 @@
 # VBox Yasm command
 VBOX_YASMCMD   ?= $(firstword $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/yasm$(HOSTSUFF_EXE)) yasm$(HOSTSUFF_EXE))
+
+# EFI requires python v2.x, so provide a way to select that while using 3.x for the rest of VBox.
+ifndef VBOX_BLD_PYTHON_2X
+ VBOX_BLD_PYTHON_2X = $(VBOX_BLD_PYTHON)
+endif
 
 #

trunk/src/VBox/Devices/EFI/Firmware/Makefile.kmk

@@ -69 +69 @@
         $(addprefix $(VBoxEfiBldPythonWrappers_0_OUTDIR)/,$(VBOX_EFI_PYTHON_WRAPPERS))
 endif
-VBoxEfiBldPythonWrappers_CLEAN = $(VBoxEfiBldPythonWrappers_SOURCES)
+VBoxEfiBldPythonWrappers_CLEAN = $(VBoxEfiBldPythonWrappers_EXEC_SOURCES)
 
 if1of ($(KBUILD_HOST), win os2)
@@ -76 +76 @@
         $$(APPEND) -tn "$$@" \
                 '@SET PYTHONPATH=$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python' \
-                '@"$$(VBOX_BLD_PYTHON)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" %*'
+                '@"$$(VBOX_BLD_PYTHON_2X)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" %*'
  endef
 else
@@ -84 +84 @@
                 '#!$(ASH)' \
                 'export PYTHONPATH="$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python"' \
-                'exec "$$(VBOX_BLD_PYTHON)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" "$$(DOLLAR)@"'
+                'exec "$$(VBOX_BLD_PYTHON_2X)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" "$$(DOLLAR)@"'
         $$(CHMOD) a+x "$$@"
  endef
@@ -223 +223 @@
         -E $(if-expr "$(KBUILD_VERBOSE)" != "",'EFI_QUIET=','EFI_QUIET=@') \
         -C '$(VBOX_PATH_EFI_FIRMWARE)' \
-        -- $(VBOX_BLD_PYTHON) "$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/build/build.py" \
+        -- $(VBOX_BLD_PYTHON_2X) "$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/build/build.py" \
         -D VBOX=1 \
         -D VBOX_WITH_OVMF=1 \