OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/vm/haiku.x86_64: Update the Haiku VM to Beta 4

Browse Source 
The old Haiku VM based on Beta 3 does not work anymore since it
fails to install the additional packages now that Beta 4 has been
released. Thanks to Alexander von Gluck IV for providing a new
image based on Beta 4, we can now upgrade the test image in our
QEMU CI, too, to get this working again.

Note that Haiku Beta 4 apparently finally fixed the issue with
the enumeration of the virtio-block devices (see the ticket at
https://dev.haiku-os.org/ticket/16512 ) - the tarball disk can
now be found at index 1 instead of index 0.

Message-Id: <20230116083014.55647-1-thuth@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-01-16 09:30:14 +01:00
parent 57b8d8d6c2
commit 66ef41d29e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/vm/haiku.x86_64
View File

@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
name = "haiku" name = "haiku"
arch = "x86_64" arch = "x86_64"
link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box" link = "https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64/versions/20230114/providers/libvirt.box"
csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041" csum = "6e72a2a470e03dbc3c5e808664e057bb4022b390dca88e4c7da6188f26f6a3c9"
poweroff = "shutdown" poweroff = "shutdown"
@ -80,13 +80,12 @@ class HaikuVM(basevm.BaseVM):
"ninja", "ninja",
] ]
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
BUILD_SCRIPT = """ BUILD_SCRIPT = """
set -e; set -e;
rm -rf /tmp/qemu-test.* rm -rf /tmp/qemu-test.*
cd $(mktemp -d /tmp/qemu-test.XXXXXX); cd $(mktemp -d /tmp/qemu-test.XXXXXX);
mkdir src build; cd src; mkdir src build; cd src;
tar -xf /dev/disk/virtual/virtio_block/0/raw; tar -xf /dev/disk/virtual/virtio_block/1/raw;
mkdir -p /usr/bin mkdir -p /usr/bin
ln -s /boot/system/bin/env /usr/bin/env ln -s /boot/system/bin/env /usr/bin/env
cd ../build cd ../build