2
0
Fork 0

Update Genode sources, test Nix-built core

20.02
Emery Hemingway 3 years ago
parent ccdfcd7a5b
commit d57a144978

@ -42,7 +42,7 @@ let
bootModules' = {
inherit testConfig;
config = ./driver-config.xml;
core = "${depot.base-linux}/bin/core";
core = "${genode.base-linux}/bin/core-linux";
init = "${genode.os}/bin/init";
"ld.lib.so" = "${depot.base-linux}/lib/ld.lib.so";
timer = "${genode.base-linux}/bin/linux_timer_drv";

@ -38,13 +38,13 @@ let
mkIso = import ./nova-iso.nix {
inherit hostPkgs testPkgs;
coreNovaObj = "${testPkgs.depot.base-nova}/lib/core-nova.o";
coreNovaObj = "${testPkgs.genode.base-nova}/lib/core-nova.o";
};
mkTest = { name ? "unamed", testScript, testConfig, bootModules, qemuMem ? 32
, ... }@t:
let
iso = mkIso (with testPkgs;
bootModules' = (with testPkgs;
{
inherit testConfig;
config = ./driver-config.xml;
@ -53,6 +53,8 @@ let
timer = "${genode.base-nova}/bin/nova_timer_drv";
} // bootModules);
iso = mkIso bootModules';
baseSetup = ''
##
# Wait for a specific output of a already running spawned proce
@ -133,6 +135,7 @@ let
in test // {
inherit driver iso test;
config = testConfig;
rom = bootModules';
};
in {

@ -83,6 +83,8 @@ in hostPkgs.stdenv.mkDerivation {
${coreNovaObj} boot_modules.o \
-o boot/image.elf
strip boot/image.elf
# build ISO image
cp ${testPkgs.nova}/hypervisor* boot/hypervisor
cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg

@ -40,8 +40,8 @@ let
src = fetchgit {
url = "https://git.sr.ht/~ehmry/genode";
rev = "dc0084cd5bebfdba74323bbe8f0a9dd1e8b7c524";
sha256 = "12qwv6xq51dr5lps60c0r9dmxgk2agd8jgh0prafjk0wxq3xs95p";
rev = "1dc25293b84fb3aed880bb4315adc7ce321c6343";
sha256 = "1jqbc1i4hwi6aai728mz8wmbcpm864v2mlkyg36lm118b7cpp493";
fetchSubmodules = false;
};

Loading…
Cancel
Save