From: Christoph Müllner Date: Tue, 7 Apr 2026 20:09:46 +0000 (+0200) Subject: riscv: weaken capscheck for rv64gc_v_zvkned_hwprobe entry X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a952bfe26c0dc1f78b6297669ea431df502716;p=thirdparty%2Fopenssl.git riscv: weaken capscheck for rv64gc_v_zvkned_hwprobe entry QEMU 8.2.2 (ubuntu-latest) does not report ZVKNED via hwprobe despite zvkned=true being set in QEMU_CPU, so the _V_ZVKNED assertion would fail in CI for a reason unrelated to OpenSSL. Weaken the check to _V, which QEMU 8.2.2 does report correctly. The ZVKNED assertion can be restored once the CI moves to a QEMU version with full Zvk* hwprobe coverage. Signed-off-by: Christoph Müllner Reviewed-by: Eugene Syromiatnikov Reviewed-by: Tomas Mraz MergeDate: Thu Apr 16 17:03:43 2026 (Merged from https://github.com/openssl/openssl/pull/30713) --- diff --git a/.github/workflows/riscv-more-cross-compiles.yml b/.github/workflows/riscv-more-cross-compiles.yml index 3d4378aeefc..cac662b8d34 100644 --- a/.github/workflows/riscv-more-cross-compiles.yml +++ b/.github/workflows/riscv-more-cross-compiles.yml @@ -230,8 +230,10 @@ jobs: qemucpu: "rv64,v=true,vlen=128,zvkned=true", # No opensslcapsname: hwprobe is used for capability detection. opensslcaps: "rv64gc_v_zvkned_hwprobe", - # Both V and ZVKNED must be detected. - capscheck: "_V_ZVKNED|_ZVKNED.*_V", + # V must be detected. ZVKNED is not reported by QEMU 8.2.2 (ubuntu-latest) + # via hwprobe despite being set in QEMU_CPU; tighten once CI moves to a + # newer QEMU that reports all Zvk* extensions via hwprobe. + capscheck: "_V", } ] runs-on: ubuntu-latest