From 96ebed6c31c2a94a950703d4006151ca6543d2c6 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 6 Oct 2021 09:12:04 +0200
Subject: [PATCH] vbox6: use configuration from machine.vbox6

There are some subtle incompatibilities in VirtualBox 6 with settings we
used in version 5. Therefore, the vbox6 package uses machine.vbox6 as
configuration file. An example configuration is provided by the
raw/vbox6 package.

Issue #4281
---
 repos/ports/recipes/pkg/vbox6/archives      |  1 +
 repos/ports/recipes/pkg/vbox6/runtime       |  2 +-
 repos/ports/recipes/raw/vbox6/content.mk    |  5 ++
 repos/ports/recipes/raw/vbox6/hash          |  1 +
 repos/ports/recipes/raw/vbox6/machine.vbox6 | 62 +++++++++++++++++++++
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 repos/ports/recipes/raw/vbox6/content.mk
 create mode 100644 repos/ports/recipes/raw/vbox6/hash
 create mode 100644 repos/ports/recipes/raw/vbox6/machine.vbox6

diff --git a/repos/ports/recipes/pkg/vbox6/archives b/repos/ports/recipes/pkg/vbox6/archives
index a311ea3b94..55569f514a 100755
--- a/repos/ports/recipes/pkg/vbox6/archives
+++ b/repos/ports/recipes/pkg/vbox6/archives
@@ -1,3 +1,4 @@
+_/raw/vbox6
 _/src/init
 _/src/jpeg
 _/src/libc
diff --git a/repos/ports/recipes/pkg/vbox6/runtime b/repos/ports/recipes/pkg/vbox6/runtime
index 317307b9d4..c09cebe276 100755
--- a/repos/ports/recipes/pkg/vbox6/runtime
+++ b/repos/ports/recipes/pkg/vbox6/runtime
@@ -47,7 +47,7 @@
 			<binary name="virtualbox6" />
 			<resource name="RAM" quantum="8G"/>
 			<exit propagate="yes"/>
-			<config vbox_file="machine.vbox" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
+			<config vbox_file="machine.vbox6" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
 				<vfs>
 					<dir name="dev">
 						<log/> <rtc/> <null/> <zero/> <oss name="dsp"/>
diff --git a/repos/ports/recipes/raw/vbox6/content.mk b/repos/ports/recipes/raw/vbox6/content.mk
new file mode 100644
index 0000000000..71497fe3e7
--- /dev/null
+++ b/repos/ports/recipes/raw/vbox6/content.mk
@@ -0,0 +1,5 @@
+content: machine.vbox6
+
+machine.vbox6:
+	cp $(REP_DIR)/recipes/raw/vbox6/$@ $@
+
diff --git a/repos/ports/recipes/raw/vbox6/hash b/repos/ports/recipes/raw/vbox6/hash
new file mode 100644
index 0000000000..4aa6ebae69
--- /dev/null
+++ b/repos/ports/recipes/raw/vbox6/hash
@@ -0,0 +1 @@
+2021-10-05 e33095352f8128ac625b4273bc4deab2989b2933
diff --git a/repos/ports/recipes/raw/vbox6/machine.vbox6 b/repos/ports/recipes/raw/vbox6/machine.vbox6
new file mode 100644
index 0000000000..e93ea98398
--- /dev/null
+++ b/repos/ports/recipes/raw/vbox6/machine.vbox6
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<VirtualBox xmlns="http://www.virtualbox.org/" version="1.14-freebsd">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_16_04_64" OSType="Ubuntu_64" snapshotFolder="Snapshots" lastStateChange="2018-01-23T18:40:00Z">
+    <MediaRegistry>
+      <HardDisks>
+        <HardDisk uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}" location="machine.vdi" format="VDI" type="Normal"/>
+      </HardDisks>
+      <DVDImages>
+        <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}" location="installer.iso"/>
+      </DVDImages>
+    </MediaRegistry>
+    <Hardware>
+      <CPU count="2">
+        <PAE enabled="true"/>
+        <LongMode enabled="true"/>
+        <HardwareVirtExLargePages enabled="false"/>
+      </CPU>
+      <Memory RAMSize="4096"/>
+      <HID Pointing="PS2Mouse"/>
+      <Display VRAMSize="20" monitorCount="1" controller="VBoxSVGA"/>
+      <RemoteDisplay enabled="false"/>
+      <Paravirt provider="KVM"/>
+      <BIOS>
+        <IOAPIC enabled="true"/>
+      </BIOS>
+      <USB>
+        <Controllers>
+          <Controller name="OHCI" type="OHCI"/>
+        </Controllers>
+      </USB>
+      <Network>
+        <Adapter slot="0" enabled="true" MACAddress="0800271D7901" cable="true" type="82540EM">
+          <BridgedInterface/>
+        </Adapter>
+      </Network>
+      <UART>
+        <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
+        <Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
+      </UART>
+      <LPT>
+        <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
+        <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
+      </LPT>
+      <AudioAdapter controller="HDA" driver="OSS" enabled="false"/>
+      <RTC localOrUTC="UTC"/>
+      <SharedFolders>
+        <SharedFolder name="shared" hostPath="/shared" writable="true" autoMount="true"/>
+      </SharedFolders>
+      <Clipboard mode="Bidirectional"/>
+    </Hardware>
+    <StorageControllers>
+      <StorageController name="SATA" type="AHCI" PortCount="4" useHostIOCache="true" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3">
+        <AttachedDevice type="HardDisk" port="0" device="0">
+          <Image uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}"/>
+        </AttachedDevice>
+        <AttachedDevice passthrough="false" type="DVD" port="3" device="0">
+          <Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}"/>
+        </AttachedDevice>
+      </StorageController>
+    </StorageControllers>
+  </Machine>
+</VirtualBox>