Changeset 102909 in vbox for trunk/src

Timestamp:

Jan 16, 2024 11:59:08 PM (13 months ago)

Author:

vboxsync

Message:

Devices/EFI/Firmware: Don't try using python 2.x when python 3.x is required. bugref:4643

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

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

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

@@ -71 +71 @@
 endif
 
-# 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

@@ -88 +88 @@
         $$(APPEND) -tn "$$@" \
                 '@SET PYTHONPATH=$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python' \
-                '@"$$(VBOX_BLD_PYTHON_2X)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" %*'
+                '@"$$(VBOX_BLD_PYTHON)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" %*'
  endef
 else
@@ -96 +96 @@
                 '#!$(ASH)' \
                 'export PYTHONPATH="$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python"' \
-                'exec "$$(VBOX_BLD_PYTHON_2X)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" "$$(DOLLAR)@"'
+                'exec "$$(VBOX_BLD_PYTHON)" "$$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/$(PyWrap)/$(PyWrap).py" "$$(DOLLAR)@"'
         $$(CHMOD) a+x "$$@"
  endef
@@ -279 +279 @@
         -E $(if-expr "$(KBUILD_VERBOSE)" != "",'EFI_QUIET=','EFI_QUIET=@') \
         -C '$(VBOX_PATH_EFI_FIRMWARE)' \
-        -- $(VBOX_BLD_PYTHON_2X) "$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/build/build.py" \
+        -- $(VBOX_BLD_PYTHON) "$(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/Python/build/build.py" \
         -D VBOX=1 \
         -D VBOX_WITH_OVMF=1 \