1. Patchew
  2. QEMU
  3. View series

[PATCH] tests/vm: Update haiku test vm to R1/Beta3

Alexander von Gluck IV posted 1 patch 2 years, 2 months ago
Test checkpatch failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220216154208.2985103-1-kallisti5@unixzen.com
Maintainers: Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Alex Bennée" <alex.bennee@linaro.org>
tests/vm/haiku.x86_64 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Alexander von Gluck IV 2 years, 2 months ago 
---
 tests/vm/haiku.x86_64 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 2eb736dae1..936f7d2ae2 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -2,7 +2,7 @@
 #
 # Haiku VM image
 #
-# Copyright 2020 Haiku, Inc.
+# Copyright 2020-2022 Haiku, Inc.
 #
 # Authors:
 #  Alexander von Gluck IV <kallisti5@unixzen.com>
@@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
     name = "haiku"
     arch = "x86_64"
 
-    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
-    csum = "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
+    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
+    csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
 
     poweroff = "shutdown"
 
@@ -99,7 +99,7 @@ class HaikuVM(basevm.BaseVM):
 
         self.print_step("Extracting disk image")
 
-        subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"],
+        subprocess.check_call(["tar", "xzf", tarball, "box.img", "-O"],
                               stdout=open(img, 'wb'))
 
         self.print_step("Preparing disk image")
-- 
2.35.1
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Thomas Huth 1 year, 4 months ago 
On 16/02/2022 16.42, Alexander von Gluck IV wrote:
> ---
>   tests/vm/haiku.x86_64 | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
[...]
> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>       name = "haiku"
>       arch = "x86_64"
>   
> -    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
> -    csum = "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
> +    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
> +    csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"

  Hi Alexander!

The Haiku VM started again to fail, I'm getting these error messages now:

Encountered problems:
problem 1: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
glib2_devel-2.75.0-1
   solution 1:
     - do not install "providing devel:libglib_2.0"
problem 2: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
gettext-0.21.1-2
   solution 1:
     - do not install "providing devel:libintl"
problem 3: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
curl-7.85.0-2
   solution 1:
     - do not install "providing devel:libcurl"
problem 4: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
gnutls-3.7.8-1
   solution 1:
     - do not install "providing devel:libgnutls"
problem 5: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
glib2-2.75.0-1
   solution 1:
     - do not install "providing devel:libslirp"

Does it need an update to a newer version of Haiku?

  Thomas
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Philippe Mathieu-Daudé 1 year, 3 months ago 
On 14/12/22 11:47, Thomas Huth wrote:
> On 16/02/2022 16.42, Alexander von Gluck IV wrote:
>> ---
>>   tests/vm/haiku.x86_64 | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
> [...]
>> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>>       name = "haiku"
>>       arch = "x86_64"
>> -    link = 
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
>> -    csum = 
>> "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
>> +    link = 
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
>> +    csum = 
>> "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
> 
>   Hi Alexander!
> 
> The Haiku VM started again to fail, I'm getting these error messages now:
> 
> Encountered problems:
> problem 1: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
> glib2_devel-2.75.0-1
>    solution 1:
>      - do not install "providing devel:libglib_2.0"
> problem 2: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
> gettext-0.21.1-2
>    solution 1:
>      - do not install "providing devel:libintl"
> problem 3: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
> curl-7.85.0-2
>    solution 1:
>      - do not install "providing devel:libcurl"
> problem 4: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
> gnutls-3.7.8-1
>    solution 1:
>      - do not install "providing devel:libgnutls"
> problem 5: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
> glib2-2.75.0-1
>    solution 1:
>      - do not install "providing devel:libslirp"
> 
> Does it need an update to a newer version of Haiku?

Per https://www.haiku-os.org/guides/daily-tasks/updating-system/ we
can keep the box image in sync with its repo by using:

# pkgman add https://eu.hpkg.haiku-os.org/haiku/r1beta3/$(getarch)/current

I will try this:

-- >8 --
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 29668bc272..9cbb46cfc1 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -112,2 +112,4 @@ class HaikuVM(basevm.BaseVM):
          # Install packages
+        self.ssh_root("pkgman add 
https://eu.hpkg.haiku-os.org/haiku/r1beta3/x86_64/current")
+        self.ssh_root("pkgman full-sync")
          self.ssh_root("pkgman install -y %s" % " 
".join(self.requirements))
---
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Philippe Mathieu-Daudé 1 year, 3 months ago 
On 13/1/23 12:05, Philippe Mathieu-Daudé wrote:
> On 14/12/22 11:47, Thomas Huth wrote:
>> On 16/02/2022 16.42, Alexander von Gluck IV wrote:
>>> ---
>>>   tests/vm/haiku.x86_64 | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)
>> [...]
>>> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>>>       name = "haiku"
>>>       arch = "x86_64"
>>> -    link = 
>>> "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
>>> -    csum = 
>>> "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
>>> +    link = 
>>> "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
>>> +    csum = 
>>> "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
>>
>>   Hi Alexander!
>>
>> The Haiku VM started again to fail, I'm getting these error messages now:
>>
>> Encountered problems:
>> problem 1: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
>> glib2_devel-2.75.0-1
>>    solution 1:
>>      - do not install "providing devel:libglib_2.0"
>> problem 2: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
>> gettext-0.21.1-2
>>    solution 1:
>>      - do not install "providing devel:libintl"
>> problem 3: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
>> curl-7.85.0-2
>>    solution 1:
>>      - do not install "providing devel:libcurl"
>> problem 4: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by 
>> gnutls-3.7.8-1
>>    solution 1:
>>      - do not install "providing devel:libgnutls"
>> problem 5: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by 
>> glib2-2.75.0-1
>>    solution 1:
>>      - do not install "providing devel:libslirp"
>>
>> Does it need an update to a newer version of Haiku?
> 
> Per https://www.haiku-os.org/guides/daily-tasks/updating-system/ we
> can keep the box image in sync with its repo by using:
> 
> # pkgman add https://eu.hpkg.haiku-os.org/haiku/r1beta3/$(getarch)/current
> 
> I will try this:
> 
> -- >8 --
> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
> index 29668bc272..9cbb46cfc1 100755
> --- a/tests/vm/haiku.x86_64
> +++ b/tests/vm/haiku.x86_64
> @@ -112,2 +112,4 @@ class HaikuVM(basevm.BaseVM):
>           # Install packages
> +        self.ssh_root("pkgman add 
> https://eu.hpkg.haiku-os.org/haiku/r1beta3/x86_64/current")
> +        self.ssh_root("pkgman full-sync")
>           self.ssh_root("pkgman install -y %s" % " 
> ".join(self.requirements))
> ---

OS installed but is not usable...:

runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Could not resolve 
symbol '__ctype_b_loc'
resolve symbol "__ctype_b_loc" returned: -2147478780
runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Troubles 
relocating: Symbol not found
Connection to 127.0.0.1 closed.
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Alexander von Gluck IV 1 year, 3 months ago 
January 13, 2023 7:30 AM, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote:

> On 13/1/23 12:05, Philippe Mathieu-Daudé wrote:
> 
>> Per https://www.haiku-os.org/guides/daily-tasks/updating-system we
>> can keep the box image in sync with its repo by using:
>> # pkgman add https://eu.hpkg.haiku-os.org/haiku/r1beta3/$(getarch)/current
>> I will try this:
>> -- >8 --
>> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
>> index 29668bc272..9cbb46cfc1 100755
>> --- a/tests/vm/haiku.x86_64
>> +++ b/tests/vm/haiku.x86_64
>> @@ -112,2 +112,4 @@ class HaikuVM(basevm.BaseVM):
>> # Install packages
>> +        self.ssh_root("pkgman add > https://eu.hpkg.haiku-os.org/haiku/r1beta3/x86_64/current")
>> +        self.ssh_root("pkgman full-sync")
>> self.ssh_root("pkgman install -y %s" % " > ".join(self.requirements))
>> ---
> 
> OS installed but is not usable...:
> 
> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Could not resolve symbol '__ctype_b_loc'
> resolve symbol "__ctype_b_loc" returned: -2147478780
> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Troubles relocating: Symbol not found
> Connection to 127.0.0.1 closed.

Ok. I updated the vagrant image to the latest release.  r1beta2 is getting a bit too old, and
r1beta3 instances should really be upgraded to r1beta4.

https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64

Let me know if this works for you.  Don't add the full-sync stuff. Isn't needed from the
r1beta4 base.

 -- Alex
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Thomas Huth 1 year, 3 months ago 
On 14/01/2023 23.47, Alexander von Gluck IV wrote:
> January 13, 2023 7:30 AM, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote:
> 
>> On 13/1/23 12:05, Philippe Mathieu-Daudé wrote:
>>
>>> Per https://www.haiku-os.org/guides/daily-tasks/updating-system we
>>> can keep the box image in sync with its repo by using:
>>> # pkgman add https://eu.hpkg.haiku-os.org/haiku/r1beta3/$(getarch)/current
>>> I will try this:
>>> -- >8 --
>>> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
>>> index 29668bc272..9cbb46cfc1 100755
>>> --- a/tests/vm/haiku.x86_64
>>> +++ b/tests/vm/haiku.x86_64
>>> @@ -112,2 +112,4 @@ class HaikuVM(basevm.BaseVM):
>>> # Install packages
>>> +        self.ssh_root("pkgman add > https://eu.hpkg.haiku-os.org/haiku/r1beta3/x86_64/current")
>>> +        self.ssh_root("pkgman full-sync")
>>> self.ssh_root("pkgman install -y %s" % " > ".join(self.requirements))
>>> ---
>>
>> OS installed but is not usable...:
>>
>> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Could not resolve symbol '__ctype_b_loc'
>> resolve symbol "__ctype_b_loc" returned: -2147478780
>> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Troubles relocating: Symbol not found
>> Connection to 127.0.0.1 closed.
> 
> Ok. I updated the vagrant image to the latest release.  r1beta2 is getting a bit too old, and
> r1beta3 instances should really be upgraded to r1beta4.
> 
> https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64
> 
> Let me know if this works for you.
Thank you very much, I gave it a try and it seems to work! I'll send a patch 
for QEMU's VM file to switch to the new image.

  Thomas
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Alexander von Gluck IV 1 year, 3 months ago 
January 13, 2023 7:30 AM, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote:

> On 13/1/23 12:05, Philippe Mathieu-Daudé wrote:
> 
>> On 14/12/22 11:47, Thomas Huth wrote:
>>> On 16/02/2022 16.42, Alexander von Gluck IV wrote:
>> 
>> ---
>> tests/vm/haiku.x86_64 | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>> [...]
>> 
>> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>> name = "haiku"
>> arch = "x86_64"
>> -    link = >>>
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
>> -    csum = >>> "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
>> +    link = >>>
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
>> +    csum = >>> "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
>>> Hi Alexander!
>>> 
>>> The Haiku VM started again to fail, I'm getting these error messages now:
>>> 
>>> Encountered problems:
>>> problem 1: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by >> glib2_devel-2.75.0-1
>>> solution 1:
>>> - do not install "providing devel:libglib_2.0"
>>> problem 2: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by >> gettext-0.21.1-2
>>> solution 1:
>>> - do not install "providing devel:libintl"
>>> problem 3: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by >> curl-7.85.0-2
>>> solution 1:
>>> - do not install "providing devel:libcurl"
>>> problem 4: nothing provides haiku>=r1~beta4_hrev56578_31-1 needed by >> gnutls-3.7.8-1
>>> solution 1:
>>> - do not install "providing devel:libgnutls"
>>> problem 5: nothing provides haiku>=r1~beta4_hrev56578_4-1 needed by >> glib2-2.75.0-1
>>> solution 1:
>>> - do not install "providing devel:libslirp"
>>> 
>>> Does it need an update to a newer version of Haiku?
>> 
>> Per https://www.haiku-os.org/guides/daily-tasks/updating-system we
>> can keep the box image in sync with its repo by using:
>> # pkgman add https://eu.hpkg.haiku-os.org/haiku/r1beta3/$(getarch)/current
>> I will try this:
>> -- >8 --
>> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
>> index 29668bc272..9cbb46cfc1 100755
>> --- a/tests/vm/haiku.x86_64
>> +++ b/tests/vm/haiku.x86_64
>> @@ -112,2 +112,4 @@ class HaikuVM(basevm.BaseVM):
>> # Install packages
>> +        self.ssh_root("pkgman add > https://eu.hpkg.haiku-os.org/haiku/r1beta3/x86_64/current")
>> +        self.ssh_root("pkgman full-sync")
>> self.ssh_root("pkgman install -y %s" % " > ".join(self.requirements))
>> ---
> 
> OS installed but is not usable...:
> 
> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Could not resolve symbol '__ctype_b_loc'
> resolve symbol "__ctype_b_loc" returned: -2147478780
> runtime_loader: /boot/system/lib/libncurses.so.6.3.0: Troubles relocating: Symbol not found
> Connection to 127.0.0.1 closed.

Good morning!


I'll work on this one.
r1/beta4 came out a few weeks ago and I need to update the Vagrant image these are based on.


 -- Alex
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Thomas Huth 2 years, 2 months ago 
On 16/02/2022 16.42, Alexander von Gluck IV wrote:
> ---
>   tests/vm/haiku.x86_64 | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
> index 2eb736dae1..936f7d2ae2 100755
> --- a/tests/vm/haiku.x86_64
> +++ b/tests/vm/haiku.x86_64
> @@ -2,7 +2,7 @@
>   #
>   # Haiku VM image
>   #
> -# Copyright 2020 Haiku, Inc.
> +# Copyright 2020-2022 Haiku, Inc.
>   #
>   # Authors:
>   #  Alexander von Gluck IV <kallisti5@unixzen.com>
> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>       name = "haiku"
>       arch = "x86_64"
>   
> -    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
> -    csum = "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
> +    link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
> +    csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
>   
>       poweroff = "shutdown"
>   
> @@ -99,7 +99,7 @@ class HaikuVM(basevm.BaseVM):
>   
>           self.print_step("Extracting disk image")
>   
> -        subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"],
> +        subprocess.check_call(["tar", "xzf", tarball, "box.img", "-O"],
>                                 stdout=open(img, 'wb'))
>   
>           self.print_step("Preparing disk image")

Thank you very much for the quick fix, that indeed helps to compile-test 
Haiku again! (the unit tests are failing, though, but IIRC that was already 
the case before)

Tested-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Alexander von Gluck IV 2 years, 2 months ago 
February 16, 2022 10:26 AM, "Thomas Huth" <thuth@redhat.com> wrote:
> On 16/02/2022 16.42, Alexander von Gluck IV wrote:
> 
>> ---
>> tests/vm/haiku.x86_64 | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
>> index 2eb736dae1..936f7d2ae2 100755
>> --- a/tests/vm/haiku.x86_64
>> +++ b/tests/vm/haiku.x86_64
>> @@ -2,7 +2,7 @@
>> #
>> # Haiku VM image
>> #
>> -# Copyright 2020 Haiku, Inc.
>> +# Copyright 2020-2022 Haiku, Inc.
>> #
>> # Authors:
>> # Alexander von Gluck IV <kallisti5@unixzen.com>
>> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>> name = "haiku"
>> arch = "x86_64"
>>> - link =
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
>> - csum = "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
>> + link =
>> "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
>> + csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
>>> poweroff = "shutdown"
>>> @@ -99,7 +99,7 @@ class HaikuVM(basevm.BaseVM):
>>> self.print_step("Extracting disk image")
>>> - subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"],
>> + subprocess.check_call(["tar", "xzf", tarball, "box.img", "-O"],
>> stdout=open(img, 'wb'))
>>> self.print_step("Preparing disk image")
> 
> Thank you very much for the quick fix, that indeed helps to compile-test Haiku again! (the unit
> tests are failing, though, but IIRC that was already the case before)
> 
> Tested-by: Thomas Huth <thuth@redhat.com>

Thanks!

Sorry for forgetting about it.   I hand release Vagrant images for Haiku after major releases
and generally forget to update them until ~6 months after a major release as there aren't many users.

I don't have commit access to qemu so will need someone else to push when the time comes.

 -- Alex
Re: [PATCH] tests/vm: Update haiku test vm to R1/Beta3
Posted by Thomas Huth 2 years, 2 months ago 
On 16/02/2022 19.12, Alexander von Gluck IV wrote:
> February 16, 2022 10:26 AM, "Thomas Huth" <thuth@redhat.com> wrote:
>> On 16/02/2022 16.42, Alexander von Gluck IV wrote:
>>
>>> ---
>>> tests/vm/haiku.x86_64 | 8 ++++----
>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>> diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
>>> index 2eb736dae1..936f7d2ae2 100755
>>> --- a/tests/vm/haiku.x86_64
>>> +++ b/tests/vm/haiku.x86_64
>>> @@ -2,7 +2,7 @@
>>> #
>>> # Haiku VM image
>>> #
>>> -# Copyright 2020 Haiku, Inc.
>>> +# Copyright 2020-2022 Haiku, Inc.
>>> #
>>> # Authors:
>>> # Alexander von Gluck IV <kallisti5@unixzen.com>
>>> @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
>>> name = "haiku"
>>> arch = "x86_64"
>>>> - link =
>>> "https://app.vagrantup.com/haiku-os/boxes/r1beta2-x86_64/versions/20200702/providers/libvirt.box"
>>> - csum = "41c38b316e0cbdbc66b5dbaf3612b866700a4f35807cb1eb266a5bf83e9e68d5"
>>> + link =
>>> "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
>>> + csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
>>>> poweroff = "shutdown"
>>>> @@ -99,7 +99,7 @@ class HaikuVM(basevm.BaseVM):
>>>> self.print_step("Extracting disk image")
>>>> - subprocess.check_call(["tar", "xzf", tarball, "./box.img", "-O"],
>>> + subprocess.check_call(["tar", "xzf", tarball, "box.img", "-O"],
>>> stdout=open(img, 'wb'))
>>>> self.print_step("Preparing disk image")
>>
>> Thank you very much for the quick fix, that indeed helps to compile-test Haiku again! (the unit
>> tests are failing, though, but IIRC that was already the case before)
>>
>> Tested-by: Thomas Huth <thuth@redhat.com>
> 
> Thanks!
> 
> Sorry for forgetting about it.   I hand release Vagrant images for Haiku after major releases
> and generally forget to update them until ~6 months after a major release as there aren't many users.
> 
> I don't have commit access to qemu so will need someone else to push when the time comes.

  Hi,

I think this could either go through the qemu-trivial tree, or I can pick it 
up and take it through my "testing" tree.

But I just noticed that your patch lacks the "Signed-off-by" line ... so for 
the records (it's required for the rules, see
https://www.qemu.org/docs/master/devel/submitting-a-patch.html#patch-emails-must-include-a-signed-off-by-line 
)
could you either please reply with a "Signed-off-by" line to your original 
patch, or repost the whole patch as a v2 with the S-o-b included? Thanks!

  Thomas

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.