Date: Tue, 22 Oct 2019 16:44:14 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Michael Butler <imb@protected-networks.net>, freebsd-emulation@freebsd.org Subject: Re: [package - head-amd64-default][emulators/virtualbox-ose] Failed for virtualbox-ose-5.2.34 in build Message-ID: <90aad523-a160-412a-ba16-620507c9252e@FreeBSD.org> In-Reply-To: <282d5cb0-39f3-addf-ff09-8b3311e27457@FreeBSD.org> References: <201910221733.x9MHX2po002857@beefy18.nyi.freebsd.org> <ef0b53fc-7a4d-b813-6eed-cfbc5a0d9a0c@protected-networks.net> <1a89a677-189b-e0ae-6b62-9b6da95897dc@FreeBSD.org> <b63c424e-e6a3-3a7c-c990-d7de28ef6a7a@FreeBSD.org> <282d5cb0-39f3-addf-ff09-8b3311e27457@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On 19. 10. 22., Jung-uk Kim wrote:
> On 19. 10. 22., Jung-uk Kim wrote:
>> On 19. 10. 22., Jung-uk Kim wrote:
>>> On 19. 10. 22., Michael Butler wrote:
>>>> On 10/22/19 1:33 PM, pkg-fallout@FreeBSD.org wrote:
>>>>
>>>> <snip>
>>>>
>>>>> /wrkdirs/usr/ports/emulators/virtualbox-ose/work/VirtualBox-5.2.34/out/freebsd.amd64/release/obj/VBoxDD/vboxssdt_cpuhotplug.hex.pre1 29: Processor (CPU1, 0x01, 0x0, 0x0 ) { Name (_HID, "ACPI0007") Name (_UID, "SCK1-CPU0") Name (_PXM, 0x00)
>>>>> Warning 3168 - Legacy Processor() keyword detected. Use Device() keyword instead. ^
>>>>>
>>>>> /wrkdirs/usr/ports/emulators/virtualbox-ose/work/VirtualBox-5.2.34/out/freebsd.amd64/release/obj/VBoxDD/vboxssdt_cpuhotplug.hex.pre1 29: Processor (CPU1, 0x01, 0x0, 0x0 ) { Name (_HID, "ACPI0007") Name (_UID, "SCK1-CPU0") Name (_PXM, 0x00)
>>>>> Error 6167 - _UID inside processor declaration must be an integer ^ (found a string)
>>>>
>>>> It seems that SVN r514730 update to sysutils/acpica-tools has broken
>>>> iasl's compatibility with VBox dsl sources :-(
>>>
>>> Actually, we use iasl from base. Therefore, head after r353764 is affected.
>>>
>>> https://svnweb.freebsd.org/changeset/base/353764
>>>
>>> It is a VirtualBox bug and I am working on it.
>>
>> Please try the attached patch.
>
> Sorry, really attaching the patch.
Arg... The attachment was stripped. Trying again.
Jung-uk Kim
[-- Attachment #2 --]
Index: emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl
===================================================================
--- emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (nonexistent)
+++ emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (working copy)
@@ -0,0 +1,96 @@
+--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2019-10-10 18:34:15 UTC
++++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
+@@ -44,11 +44,11 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
+ Scope (\_SB)
+ {
+
+-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL> \
++#define GENERATE_CPU_OBJECT(id, sck, cpu)<NL> \
+ Device (sck) \
+ { \
+ Name (_HID, "ACPI0004") \
+- Name (_UID, sckuid) \
++ Name (_UID, id) \
+ \
+ <NL> \
+ Processor (cpu, /* Name */ \
+@@ -58,7 +58,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
+ ) \
+ { \
+ Name (_HID, "ACPI0007") \
+- Name (_UID, cpuuid) \
++ Name (_UID, id) \
+ Name (_PXM, 0x00) \
+ <NL> \
+ Method(_MAT, 0, Serialized) \
+@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
+ } \
+ } \
+
+- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0")
+- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0")
+- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0")
+- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0")
+- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0")
+- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0")
+- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0")
+- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0")
+- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0")
+- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0")
+- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0")
+- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0")
+- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0")
+- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0")
+- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0")
+- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0")
+- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0")
+- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0")
+- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0")
+- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0")
+- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0")
+- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0")
+- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0")
+- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0")
+- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0")
+- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0")
+- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0")
+- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0")
+- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0")
+- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0")
+- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0")
+- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0")
++ GENERATE_CPU_OBJECT(0x00, SCK0, CPU0)
++ GENERATE_CPU_OBJECT(0x01, SCK1, CPU1)
++ GENERATE_CPU_OBJECT(0x02, SCK2, CPU2)
++ GENERATE_CPU_OBJECT(0x03, SCK3, CPU3)
++ GENERATE_CPU_OBJECT(0x04, SCK4, CPU4)
++ GENERATE_CPU_OBJECT(0x05, SCK5, CPU5)
++ GENERATE_CPU_OBJECT(0x06, SCK6, CPU6)
++ GENERATE_CPU_OBJECT(0x07, SCK7, CPU7)
++ GENERATE_CPU_OBJECT(0x08, SCK8, CPU8)
++ GENERATE_CPU_OBJECT(0x09, SCK9, CPU9)
++ GENERATE_CPU_OBJECT(0x0a, SCKA, CPUA)
++ GENERATE_CPU_OBJECT(0x0b, SCKB, CPUB)
++ GENERATE_CPU_OBJECT(0x0c, SCKC, CPUC)
++ GENERATE_CPU_OBJECT(0x0d, SCKD, CPUD)
++ GENERATE_CPU_OBJECT(0x0e, SCKE, CPUE)
++ GENERATE_CPU_OBJECT(0x0f, SCKF, CPUF)
++ GENERATE_CPU_OBJECT(0x10, SCKG, CPUG)
++ GENERATE_CPU_OBJECT(0x11, SCKH, CPUH)
++ GENERATE_CPU_OBJECT(0x12, SCKI, CPUI)
++ GENERATE_CPU_OBJECT(0x13, SCKJ, CPUJ)
++ GENERATE_CPU_OBJECT(0x14, SCKK, CPUK)
++ GENERATE_CPU_OBJECT(0x15, SCKL, CPUL)
++ GENERATE_CPU_OBJECT(0x16, SCKM, CPUM)
++ GENERATE_CPU_OBJECT(0x17, SCKN, CPUN)
++ GENERATE_CPU_OBJECT(0x18, SCKO, CPUO)
++ GENERATE_CPU_OBJECT(0x19, SCKP, CPUP)
++ GENERATE_CPU_OBJECT(0x1a, SCKQ, CPUQ)
++ GENERATE_CPU_OBJECT(0x1b, SCKR, CPUR)
++ GENERATE_CPU_OBJECT(0x1c, SCKS, CPUS)
++ GENERATE_CPU_OBJECT(0x1d, SCKT, CPUT)
++ GENERATE_CPU_OBJECT(0x1e, SCKU, CPUU)
++ GENERATE_CPU_OBJECT(0x1f, SCKV, CPUV)
+
+ #undef GENERATE_CPU_OBJECT
+ }
Property changes on: emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?90aad523-a160-412a-ba16-620507c9252e>