solo5: 0.7.5 -> 0.8.0

This commit is contained in:
Lana Black 2023-04-29 08:48:29 +00:00 committed by Emery Hemingway
parent 0c97d307e6
commit 1314174d3a
2 changed files with 2 additions and 29 deletions

View File

@ -1,25 +0,0 @@
From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001
From: Lana Black <lana@illuminati.industries>
Date: Sat, 11 Feb 2023 11:53:21 +0000
Subject: [PATCH] Fix test.
---
tests/tests.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tests.bats b/tests/tests.bats
index c542b7a..98520ee 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -196,7 +196,7 @@ xen_expect_abort() {
run test_hello/test_hello.hvt
case "${CONFIG_HOST}" in
Linux)
- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]]
+ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]])
;;
FreeBSD)
# XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not
--
2.39.0

View File

@ -2,7 +2,7 @@
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.7.5";
version = "0.8.0";
# list of all theoretically available targets
targets = [
"genode"
@ -21,11 +21,9 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw=";
sha256 = "sha256-t80VOZ8Tr1Dq+mJfRPVLGqYprCaqegcQtDqdoHaSXW0=";
};
patches = [ ./0001-Fix-test.patch ];
hardeningEnable = [ "pie" ];
configurePhase = ''