* [PATCH] FreeBSD: Upgrade to 12.2 release
@ 2021-02-19 21:23 Warner Losh
2021-02-22 13:21 ` Gerd Hoffmann
0 siblings, 1 reply; 6+ messages in thread
From: Warner Losh @ 2021-02-19 21:23 UTC (permalink / raw)
To: qemu-devel; +Cc: kevans, Warner Losh, emaste
From: Warner Losh <imp@FreeBSD.org>
FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
project's packages will work.
Signed-off-by: Warner Losh <imp@FreeBSD.org>
---
tests/vm/freebsd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 09f3ee6cb8..c5886f6500 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM):
name = "freebsd"
arch = "x86_64"
- link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
- csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
+ link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-disc1.iso.xz"
+ csum = "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803ecae"
size = "20G"
pkgs = [
# build tools
--
2.30.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] FreeBSD: Upgrade to 12.2 release
2021-02-19 21:23 [PATCH] FreeBSD: Upgrade to 12.2 release Warner Losh
@ 2021-02-22 13:21 ` Gerd Hoffmann
2021-02-22 15:12 ` Warner Losh
0 siblings, 1 reply; 6+ messages in thread
From: Gerd Hoffmann @ 2021-02-22 13:21 UTC (permalink / raw)
To: Warner Losh; +Cc: kevans, emaste, Warner Losh, qemu-devel
On Fri, Feb 19, 2021 at 02:23:52PM -0700, Warner Losh wrote:
> From: Warner Losh <imp@FreeBSD.org>
>
> FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
> project's packages will work.
Not working. There is a little change in the time zone selection
dialog and we need adjust the install script ...
- self.console_wait_send("Time Zone Selector", "a\n")
+ self.console_wait_send("Time Zone Selector", "0\n")
Try "make vm-build-freebsd" to test changes, add "V=1" for
trouble-shooting.
With that change it seems to work fine (my test install is still busy
fetching packages over my slow internet link ...).
take care,
Gerd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] FreeBSD: Upgrade to 12.2 release
2021-02-22 13:21 ` Gerd Hoffmann
@ 2021-02-22 15:12 ` Warner Losh
0 siblings, 0 replies; 6+ messages in thread
From: Warner Losh @ 2021-02-22 15:12 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Kyle Evans, Warner Losh, Warner Losh, QEMU Developers, Ed Maste
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
On Mon, Feb 22, 2021 at 6:21 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
> On Fri, Feb 19, 2021 at 02:23:52PM -0700, Warner Losh wrote:
> > From: Warner Losh <imp@FreeBSD.org>
> >
> > FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
> > project's packages will work.
>
> Not working. There is a little change in the time zone selection
> dialog and we need adjust the install script ...
>
> - self.console_wait_send("Time Zone Selector", "a\n")
> + self.console_wait_send("Time Zone Selector", "0\n")
>
> Try "make vm-build-freebsd" to test changes, add "V=1" for
> trouble-shooting.
>
Thanks! I'll have to start doing that...
> With that change it seems to work fine (my test install is still busy
> fetching packages over my slow internet link ...).
>
I'll rebase and try it here...
Warner
[-- Attachment #2: Type: text/html, Size: 1519 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] FreeBSD: Upgrade to 12.2 release
2021-03-19 16:51 Thomas Huth
2021-03-19 20:16 ` Warner Losh
@ 2021-03-22 12:14 ` Alex Bennée
1 sibling, 0 replies; 6+ messages in thread
From: Alex Bennée @ 2021-03-22 12:14 UTC (permalink / raw)
To: Thomas Huth
Cc: Ed Maste, Kyle Evans, qemu-devel, Wainer dos Santos Moschetta,
Philippe Mathieu-Daudé,
Willian Rampazzo, Li-Wen Hsu, Warner Losh
Thomas Huth <thuth@redhat.com> writes:
> From: Warner Losh <imp@bsdimp.com>
>
> FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
> project's packages will work. Update which timezone to pick. Work around a QEMU
> bug that incorrectly raises an exception on a CRC32 instruction with the FPU
> disabled. The qemu bug is described here:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg784158.html
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> Message-Id: <20210307155654.993-2-imp@bsdimp.com>
> [thuth: Disable gnutls to work-around a problem with libtasn1]
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/vm/freebsd | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> index 09f3ee6cb8..6e20e84322 100755
> --- a/tests/vm/freebsd
> +++ b/tests/vm/freebsd
> @@ -20,12 +20,16 @@ import socket
> import subprocess
> import basevm
>
> +FREEBSD_CONFIG = {
> + 'cpu' : "max,sse4.2=off",
> +}
> +
> class FreeBSDVM(basevm.BaseVM):
> name = "freebsd"
> arch = "x86_64"
>
> - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
> - csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
> + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-disc1.iso.xz"
> + csum = "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803ecae"
> size = "20G"
> pkgs = [
> # build tools
> @@ -61,6 +65,8 @@ class FreeBSDVM(basevm.BaseVM):
> "zstd",
> ]
>
> + # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
> + # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
> BUILD_SCRIPT = """
> set -e;
> rm -rf /home/qemu/qemu-test.*
> @@ -68,7 +74,7 @@ class FreeBSDVM(basevm.BaseVM):
> mkdir src build; cd src;
> tar -xf /dev/vtbd1;
> cd ../build
> - ../src/configure --python=python3.7 {configure_opts};
> + ../src/configure --python=python3.7 --disable-gnutls {configure_opts};
> gmake --output-sync -j{jobs} {target} {verbose};
> """
>
> @@ -125,7 +131,7 @@ class FreeBSDVM(basevm.BaseVM):
> self.console_wait_send("IPv6", "n")
> self.console_wait_send("Resolver", "\n")
>
> - self.console_wait_send("Time Zone Selector", "a\n")
> + self.console_wait_send("Time Zone Selector", "0\n")
> self.console_wait_send("Confirmation", "y")
> self.console_wait_send("Time & Date", "\n")
> self.console_wait_send("Time & Date", "\n")
> @@ -206,4 +212,4 @@ class FreeBSDVM(basevm.BaseVM):
> self.print_step("All done")
>
> if __name__ == "__main__":
> - sys.exit(basevm.main(FreeBSDVM))
> + sys.exit(basevm.main(FreeBSDVM, config=FREEBSD_CONFIG))
--
Alex Bennée
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] FreeBSD: Upgrade to 12.2 release
2021-03-19 16:51 Thomas Huth
@ 2021-03-19 20:16 ` Warner Losh
2021-03-22 12:14 ` Alex Bennée
1 sibling, 0 replies; 6+ messages in thread
From: Warner Losh @ 2021-03-19 20:16 UTC (permalink / raw)
To: Thomas Huth
Cc: Ed Maste, Kyle Evans, QEMU Developers,
Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
Willian Rampazzo, Alex Bennée, Li-Wen Hsu
[-- Attachment #1: Type: text/plain, Size: 3201 bytes --]
On Fri, Mar 19, 2021 at 10:52 AM Thomas Huth <thuth@redhat.com> wrote:
> From: Warner Losh <imp@bsdimp.com>
>
> FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
> project's packages will work. Update which timezone to pick. Work around
> a QEMU
> bug that incorrectly raises an exception on a CRC32 instruction with the
> FPU
> disabled. The qemu bug is described here:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg784158.html
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> Message-Id: <20210307155654.993-2-imp@bsdimp.com>
> [thuth: Disable gnutls to work-around a problem with libtasn1]
> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
Works for me, though the flakey console 'expect' stuff is just as flakey
before/after this patch... The --disable-gnutls fixes the failure I saw.
Warner
> ---
> tests/vm/freebsd | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> index 09f3ee6cb8..6e20e84322 100755
> --- a/tests/vm/freebsd
> +++ b/tests/vm/freebsd
> @@ -20,12 +20,16 @@ import socket
> import subprocess
> import basevm
>
> +FREEBSD_CONFIG = {
> + 'cpu' : "max,sse4.2=off",
> +}
> +
> class FreeBSDVM(basevm.BaseVM):
> name = "freebsd"
> arch = "x86_64"
>
> - link = "
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz
> "
> - csum =
> "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
> + link = "
> https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-disc1.iso.xz
> "
> + csum =
> "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803ecae"
> size = "20G"
> pkgs = [
> # build tools
> @@ -61,6 +65,8 @@ class FreeBSDVM(basevm.BaseVM):
> "zstd",
> ]
>
> + # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
> + # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
> BUILD_SCRIPT = """
> set -e;
> rm -rf /home/qemu/qemu-test.*
> @@ -68,7 +74,7 @@ class FreeBSDVM(basevm.BaseVM):
> mkdir src build; cd src;
> tar -xf /dev/vtbd1;
> cd ../build
> - ../src/configure --python=python3.7 {configure_opts};
> + ../src/configure --python=python3.7 --disable-gnutls
> {configure_opts};
> gmake --output-sync -j{jobs} {target} {verbose};
> """
>
> @@ -125,7 +131,7 @@ class FreeBSDVM(basevm.BaseVM):
> self.console_wait_send("IPv6", "n")
> self.console_wait_send("Resolver", "\n")
>
> - self.console_wait_send("Time Zone Selector", "a\n")
> + self.console_wait_send("Time Zone Selector", "0\n")
> self.console_wait_send("Confirmation", "y")
> self.console_wait_send("Time & Date", "\n")
> self.console_wait_send("Time & Date", "\n")
> @@ -206,4 +212,4 @@ class FreeBSDVM(basevm.BaseVM):
> self.print_step("All done")
>
> if __name__ == "__main__":
> - sys.exit(basevm.main(FreeBSDVM))
> + sys.exit(basevm.main(FreeBSDVM, config=FREEBSD_CONFIG))
> --
> 2.27.0
>
>
[-- Attachment #2: Type: text/html, Size: 5172 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] FreeBSD: Upgrade to 12.2 release
@ 2021-03-19 16:51 Thomas Huth
2021-03-19 20:16 ` Warner Losh
2021-03-22 12:14 ` Alex Bennée
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Huth @ 2021-03-19 16:51 UTC (permalink / raw)
To: qemu-devel, Alex Bennée
Cc: Ed Maste, Kyle Evans, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Willian Rampazzo, Li-Wen Hsu,
Warner Losh
From: Warner Losh <imp@bsdimp.com>
FreeBSD 12.1 has reached end of life. Use 12.2 instead so that FreeBSD's
project's packages will work. Update which timezone to pick. Work around a QEMU
bug that incorrectly raises an exception on a CRC32 instruction with the FPU
disabled. The qemu bug is described here:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg784158.html
Signed-off-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20210307155654.993-2-imp@bsdimp.com>
[thuth: Disable gnutls to work-around a problem with libtasn1]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/vm/freebsd | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 09f3ee6cb8..6e20e84322 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -20,12 +20,16 @@ import socket
import subprocess
import basevm
+FREEBSD_CONFIG = {
+ 'cpu' : "max,sse4.2=off",
+}
+
class FreeBSDVM(basevm.BaseVM):
name = "freebsd"
arch = "x86_64"
- link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
- csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
+ link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-disc1.iso.xz"
+ csum = "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803ecae"
size = "20G"
pkgs = [
# build tools
@@ -61,6 +65,8 @@ class FreeBSDVM(basevm.BaseVM):
"zstd",
]
+ # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
+ # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
BUILD_SCRIPT = """
set -e;
rm -rf /home/qemu/qemu-test.*
@@ -68,7 +74,7 @@ class FreeBSDVM(basevm.BaseVM):
mkdir src build; cd src;
tar -xf /dev/vtbd1;
cd ../build
- ../src/configure --python=python3.7 {configure_opts};
+ ../src/configure --python=python3.7 --disable-gnutls {configure_opts};
gmake --output-sync -j{jobs} {target} {verbose};
"""
@@ -125,7 +131,7 @@ class FreeBSDVM(basevm.BaseVM):
self.console_wait_send("IPv6", "n")
self.console_wait_send("Resolver", "\n")
- self.console_wait_send("Time Zone Selector", "a\n")
+ self.console_wait_send("Time Zone Selector", "0\n")
self.console_wait_send("Confirmation", "y")
self.console_wait_send("Time & Date", "\n")
self.console_wait_send("Time & Date", "\n")
@@ -206,4 +212,4 @@ class FreeBSDVM(basevm.BaseVM):
self.print_step("All done")
if __name__ == "__main__":
- sys.exit(basevm.main(FreeBSDVM))
+ sys.exit(basevm.main(FreeBSDVM, config=FREEBSD_CONFIG))
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-22 12:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-19 21:23 [PATCH] FreeBSD: Upgrade to 12.2 release Warner Losh
2021-02-22 13:21 ` Gerd Hoffmann
2021-02-22 15:12 ` Warner Losh
2021-03-19 16:51 Thomas Huth
2021-03-19 20:16 ` Warner Losh
2021-03-22 12:14 ` Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).