* [PATCH v2] FreeBSD: Upgrade to 12.3 release
@ 2022-01-05 2:28 Brad Smith
2022-01-05 9:00 ` Daniel P. Berrangé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Brad Smith @ 2022-01-05 2:28 UTC (permalink / raw)
To: qemu-devel, Thomas Huth, Wainer dos Santos Moschetta,
Beraldo Leal, Alex Benn_e, Philippe Mathieu-Daud_
FreeBSD: Upgrade to 12.3 release
Note, since libtasn1 was fixed in 12.3 [*], this commit re-enables GnuTLS.
[*] https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
Signed-off-by: Brad Smith <brad@comstyle.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
---
.gitlab-ci.d/cirrus.yml | 5 +----
tests/vm/freebsd | 8 +++-----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index d273a9e713..18ded37c77 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -52,14 +52,11 @@ x64-freebsd-12-build:
NAME: freebsd-12
CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
CIRRUS_VM_IMAGE_SELECTOR: image_family
- CIRRUS_VM_IMAGE_NAME: freebsd-12-2
+ CIRRUS_VM_IMAGE_NAME: freebsd-12-3
CIRRUS_VM_CPUS: 8
CIRRUS_VM_RAM: 8G
UPDATE_COMMAND: pkg update
INSTALL_COMMAND: pkg install -y
- # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
- # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
- CONFIGURE_ARGS: --disable-gnutls
TEST_TARGETS: check
x64-freebsd-13-build:
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 6e20e84322..805db759d6 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM):
name = "freebsd"
arch = "x86_64"
- link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.2/FreeBSD-12.2-RELEASE-amd64-disc1.iso.xz"
- csum = "a4530246cafbf1dd42a9bd3ea441ca9a78a6a0cd070278cbdf63f3a6f803ecae"
+ link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/FreeBSD-12.3-RELEASE-amd64-disc1.iso.xz"
+ csum = "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b938b4"
size = "20G"
pkgs = [
# build tools
@@ -65,8 +65,6 @@ 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.*
@@ -74,7 +72,7 @@ class FreeBSDVM(basevm.BaseVM):
mkdir src build; cd src;
tar -xf /dev/vtbd1;
cd ../build
- ../src/configure --python=python3.7 --disable-gnutls {configure_opts};
+ ../src/configure --python=python3.7 {configure_opts};
gmake --output-sync -j{jobs} {target} {verbose};
"""
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] FreeBSD: Upgrade to 12.3 release
2022-01-05 2:28 [PATCH v2] FreeBSD: Upgrade to 12.3 release Brad Smith
@ 2022-01-05 9:00 ` Daniel P. Berrangé
2022-01-05 9:02 ` Alex Bennée
2022-01-05 10:02 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2022-01-05 9:00 UTC (permalink / raw)
To: Brad Smith
Cc: Thomas Huth, Beraldo Leal, Philippe Mathieu-Daud_,
Wainer dos Santos Moschetta, qemu-devel, Alex Benn_e
On Tue, Jan 04, 2022 at 09:28:16PM -0500, Brad Smith wrote:
> FreeBSD: Upgrade to 12.3 release
>
> Note, since libtasn1 was fixed in 12.3 [*], this commit re-enables GnuTLS.
>
> [*] https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
>
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Warner Losh <imp@bsdimp.com>
> ---
> .gitlab-ci.d/cirrus.yml | 5 +----
> tests/vm/freebsd | 8 +++-----
> 2 files changed, 4 insertions(+), 9 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] FreeBSD: Upgrade to 12.3 release
2022-01-05 2:28 [PATCH v2] FreeBSD: Upgrade to 12.3 release Brad Smith
2022-01-05 9:00 ` Daniel P. Berrangé
@ 2022-01-05 9:02 ` Alex Bennée
2022-01-05 10:02 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Alex Bennée @ 2022-01-05 9:02 UTC (permalink / raw)
To: Brad Smith
Cc: Thomas Huth, Philippe Mathieu-Daud_, qemu-devel,
Wainer dos Santos Moschetta, Beraldo Leal
Brad Smith <brad@comstyle.com> writes:
> FreeBSD: Upgrade to 12.3 release
>
> Note, since libtasn1 was fixed in 12.3 [*], this commit re-enables GnuTLS.
>
> [*] https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
>
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Warner Losh <imp@bsdimp.com>
Queued to testing/next, thanks.
--
Alex Bennée
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] FreeBSD: Upgrade to 12.3 release
2022-01-05 2:28 [PATCH v2] FreeBSD: Upgrade to 12.3 release Brad Smith
2022-01-05 9:00 ` Daniel P. Berrangé
2022-01-05 9:02 ` Alex Bennée
@ 2022-01-05 10:02 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-01-05 10:02 UTC (permalink / raw)
To: Brad Smith, qemu-devel, Thomas Huth, Wainer dos Santos Moschetta,
Beraldo Leal, Alex Benn_e
On 1/5/22 03:28, Brad Smith wrote:
> FreeBSD: Upgrade to 12.3 release
>
> Note, since libtasn1 was fixed in 12.3 [*], this commit re-enables GnuTLS.
>
> [*] https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
>
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Warner Losh <imp@bsdimp.com>
> ---
> .gitlab-ci.d/cirrus.yml | 5 +----
> tests/vm/freebsd | 8 +++-----
> 2 files changed, 4 insertions(+), 9 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-05 10:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05 2:28 [PATCH v2] FreeBSD: Upgrade to 12.3 release Brad Smith
2022-01-05 9:00 ` Daniel P. Berrangé
2022-01-05 9:02 ` Alex Bennée
2022-01-05 10:02 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.