Browse Source

vbox: remove iasl patch

remotes/praha/master
Emery Hemingway 2 years ago
parent
commit
8134e9bd13
  1. 3
      packages/genodelabs/default.nix
  2. 21
      packages/genodelabs/targets.nix
  3. 121
      packages/genodelabs/vbox5-iasl.patch

3
packages/genodelabs/default.nix

@ -61,7 +61,8 @@ let
preparePort = name:
{ hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
, patches ? [ ], ... }@args:
let havePatches = patches != [ ];
let
havePatches = patches != [ ];
version = builtins.getAttr name (import "${genodeSources}/ports.nix");
in stdenvNoCC.mkDerivation (args // {
name = name + "-port-" + version;

21
packages/genodelabs/targets.nix

@ -1,5 +1,12 @@
{ buildPackages, ports }:
with ports; {
with ports;
let
vbox5' = {
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [ ./vbox-framebuffer-fail-on-fail.patch ];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
in {
cached_fs_rom.patches = [ ./cached_fs_rom.patch ];
@ -49,17 +56,9 @@ with ports; {
usb_drv.portInputs = [ dde_linux ];
vbox5 = {
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
vbox5 = vbox5';
vbox5-nova = {
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
vbox5-nova = vbox5';
vesa_drv.portInputs = [ libc x86emu ];

121
packages/genodelabs/vbox5-iasl.patch

@ -1,121 +0,0 @@
commit aee5b59c51aacfd625b388a5a1e42440cc14fa3b
Author: Johannes Schlatow <schlatow@ida.ing.tu-bs.de>
Date: Tue Mar 10 18:27:14 2020 +0100
Backport changeset 82268 from virtualbox
Fixes #3689
diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash
index dd486cd0fd..5a4e45e541 100644
--- a/repos/ports/ports/virtualbox5.hash
+++ b/repos/ports/ports/virtualbox5.hash
@@ -1 +1 @@
-5de6eead003606684659956308561f9dffcdffba
+e9340716743511dca9579b5c611862501ecd15e0
diff --git a/repos/ports/src/virtualbox5/patches/changeset82265.patch b/repos/ports/src/virtualbox5/patches/changeset82265.patch
new file mode 100644
index 0000000000..7b6ceb71e2
--- /dev/null
+++ b/repos/ports/src/virtualbox5/patches/changeset82265.patch
@@ -0,0 +1,91 @@
+--- a/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl 2020-03-10 13:01:35.606326184 +0100
++++ b/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl 2020-03-10 13:01:22.169523577 +0100
+@@ -42,7 +42,7 @@
+ Scope (\_SB)
+ {
+
+-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid)<NL> \
++#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu)<NL> \
+ Device (sck) \
+ { \
+ Name (_HID, "ACPI0004") \
+@@ -56,7 +56,7 @@
+ ) \
+ { \
+ Name (_HID, "ACPI0007") \
+- Name (_UID, cpuuid) \
++ Name (_UID, id) \
+ Name (_PXM, 0x00) \
+ <NL> \
+ Method(_MAT, 0, Serialized) \
+@@ -93,38 +93,38 @@
+ } \
+ } \
+
+- 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, "SCKCPU0", CPU0)
++ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1)
++ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2)
++ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3)
++ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4)
++ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5)
++ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6)
++ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7)
++ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8)
++ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9)
++ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA)
++ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB)
++ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC)
++ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD)
++ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE)
++ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF)
++ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG)
++ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH)
++ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI)
++ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ)
++ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK)
++ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL)
++ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM)
++ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN)
++ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO)
++ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP)
++ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ)
++ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR)
++ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS)
++ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT)
++ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU)
++ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV)
+
+ #undef GENERATE_CPU_OBJECT
+ }
diff --git a/repos/ports/src/virtualbox5/patches/series b/repos/ports/src/virtualbox5/patches/series
index c86455b0fc..4a715967c1 100644
--- a/repos/ports/src/virtualbox5/patches/series
+++ b/repos/ports/src/virtualbox5/patches/series
@@ -35,3 +35,4 @@ mem_leak.patch
rem_mem.patch
vga.patch
register.patch
+changeset82265.patch
Loading…
Cancel
Save