Changeset 72301 in vbox for trunk

Timestamp:

May 23, 2018 3:30:54 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122750

Message:

Devices/Makefile.kmk: Make it work with recent iasl versions, the generated headers have include guards based on the filename now but iasl doesn't convert dashes in the filename to underscores breaking the build. They also generate the identifier for the array containing the tables based on filename instead of the using the standard AmlCode we expect

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -820 +820 @@
         $(VBoxDD_0_OUTDIR)/vboxaml.hex \
         $(VBoxDD_0_OUTDIR)/vboxaml.aml \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-standard.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-standard.aml \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-standard.aml.tmp \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.aml \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.aml.tmp \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.aml.pre
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.aml.tmp \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.tmp \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.aml.pre
   PC/ACPI/VBoxAcpi.cpp_DEPS = \
         $(VBoxDD_0_OUTDIR)/vboxaml.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-standard.hex \
-        $(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.hex
+        $(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex \
+        $(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex
 
   $$(VBoxDD_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
         $(call MSG_TOOL,iasl,VBoxDD,$<,$@)
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
+        $(QUIET)$(MV) -f $@ [email protected]
+        $(QUIET)$(SED) -e "s/vboxaml_aml_code/AmlCode/g" \
+                --output $@ [email protected]
+        $(QUIET)$(RM) -f [email protected]
 
   vboxaml.hex:: $$(VBoxDD_0_OUTDIR)/vboxaml.hex
 
-  $$(VBoxDD_0_OUTDIR)/vboxssdt-standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
+  $$(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
         $(call MSG_TOOL,iasl,VBoxDD,$<,$@)
         $(QUIET)$(RM) -f $@ [email protected]
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
         $(QUIET)$(MV) -f $@ [email protected]
-        $(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtStandard/g" \
+        $(QUIET)$(SED) -e "s/AmlCode\|vboxssdt_standard_aml_code/AmlCodeSsdtStandard/g" \
                 --output $@ [email protected]
         $(QUIET)$(RM) -f [email protected]
 
 
-  vboxssdt-standard.hex:: $$(VBoxDD_0_OUTDIR)/vboxssdt-standard.hex
-
-  $$(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
+  vboxssdt_standard.hex:: $$(VBoxDD_0_OUTDIR)/vboxssdt_standard.hex
+
+  $$(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
         $(call MSG_TOOL,iasl,VBoxDD,$<,$@)
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
@@ -858 +862 @@
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ [email protected]
         $(QUIET)$(MV) -f $@ [email protected]
-        $(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \
+        $(QUIET)$(SED) -e "s/AmlCode\|vboxssdt_cpuhotplug_aml_code/AmlCodeSsdtCpuHotPlug/g" \
                 --output $@ [email protected]
         $(QUIET)$(RM) -f [email protected] [email protected] [email protected]
 
 
-  vboxssdt-cpuhotplug.hex:: $$(VBoxDD_0_OUTDIR)/vboxssdt-cpuhotplug.hex
+  vboxssdt_cpuhotplug.hex:: $$(VBoxDD_0_OUTDIR)/vboxssdt_cpuhotplug.hex
 
  endif # !VBOX_WITH_DYNAMIC_DSDT