summarylogtreecommitdiffstats
path: root/011-fix-building-with-recent-acpica.patch
blob: df74bcd0aa5e6385a38d909d2fb081229c53c407 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
--- a/src/VBox/Devices/Makefile.kmk.orig	2018-04-13 16:36:12 UTC
+++ b/src/VBox/Devices/Makefile.kmk
@@ -828,7 +828,12 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almo
 
   $$(VBoxDD_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
 	$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
+	$(QUIET)$(RM) -f $@ $@.tmp
 	$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
+	$(QUIET)$(MV) -f $@ $@.tmp
+	$(QUIET)$(SED) -e "s/vboxaml_aml_code/AmlCode/g" \
+		--output $@ $@.tmp
+	$(QUIET)$(RM) -f $@.tmp
 
   vboxaml.hex:: $$(VBoxDD_0_OUTDIR)/vboxaml.hex
 
@@ -838,6 +843,8 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almo
 	$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
 	$(QUIET)$(MV) -f $@ $@.tmp
 	$(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtStandard/g" \
+		-e "s/__VBOXSSDT-STANDARD_HEX__/__VBOXSSDT_STANDARD_HEX__/g" \
+		-e "s/vboxssdt-standard_aml_code/AmlCodeSsdtStandard/g" \
 		--output $@ $@.tmp
 	$(QUIET)$(RM) -f $@.tmp
 
@@ -853,6 +860,8 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almo
 	$(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre1
 	$(QUIET)$(MV) -f $@ $@.tmp
 	$(QUIET)$(SED) -e "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \
+		-e "s/__VBOXSSDT-CPUHOTPLUG_HEX__/__VBOXSSDT_CPUHOTPLUG_HEX__/g" \
+		-e "s/vboxssdt-cpuhotplug_aml_code/AmlCodeSsdtCpuHotPlug/g" \
 		--output $@ $@.tmp
 	$(QUIET)$(RM) -f $@.tmp $@.pre $@.pre1