2
0
Fork 0

Update Genode sources, test Nix-built core

This commit is contained in:
Emery Hemingway 2019-10-28 16:00:53 +01:00
parent 3359a5453e
commit 6e0023d7f4
4 changed files with 14 additions and 9 deletions

View File

@ -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";

View File

@ -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 {

View File

@ -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

View File

@ -32,8 +32,8 @@ let
src = fetchgit {
url = "https://git.sr.ht/~ehmry/genode";
rev = "dc0084cd5bebfdba74323bbe8f0a9dd1e8b7c524";
sha256 = "12qwv6xq51dr5lps60c0r9dmxgk2agd8jgh0prafjk0wxq3xs95p";
rev = "1dc25293b84fb3aed880bb4315adc7ce321c6343";
sha256 = "1jqbc1i4hwi6aai728mz8wmbcpm864v2mlkyg36lm118b7cpp493";
fetchSubmodules = false;
};
@ -165,21 +165,21 @@ in rec {
base = buildRepo {
repo = "base";
srcHash = "1jiqgflpgivwik3cswz9ni9qr6x01gmd3sj61vx7bzs7yck1s5l6";
srcHash = "1wb0jif4v9cgrwsjbg16c5fnpg4d1pa0ikbrl6c25axsrqx77pkp";
};
base-linux = (buildRepo {
repo = "base-linux";
srcHash = "1dmsq5znbcqy5kjm0v2a5k1mdxl4gbrr1k1g1in1hr0p460cjyrg";
srcHash = "0brdiaxgf37cjv34irhybckgwhz7a6lkj8ymya1aba3nrkb12zv6";
}).overrideAttrs (attrs: { nativeBuildInputs = [ base ]; });
base-nova = (buildRepo {
repo = "base-nova";
srcHash = "1lp7wnp99mrhccylvs1ys9kvjvyg3m7y16h3bg9zy0qlrkn668ja";
srcHash = "02zhv0j77ikdagslk2nbjiiabl6885kngqlh89jc8i51ksksyljd";
}).overrideAttrs (attrs: { nativeBuildInputs = [ base ]; });
os = (buildRepo {
repo = "os";
srcHash = "035r8v1xnsz0xlz2f3g4350ay8bwrsj4linzd1dca663i6x7nv9m";
srcHash = "0ld71jw3d1bs0afad3zm1p8kacj8f1xbncx0jfi89an639b0qgis";
}).overrideAttrs (attrs: { nativeBuildInputs = [ base ]; });
}