Update Genode sources, test Nix-built core
This commit is contained in:
parent
ccdfcd7a5b
commit
d57a144978
|
@ -42,7 +42,7 @@ let
|
||||||
bootModules' = {
|
bootModules' = {
|
||||||
inherit testConfig;
|
inherit testConfig;
|
||||||
config = ./driver-config.xml;
|
config = ./driver-config.xml;
|
||||||
core = "${depot.base-linux}/bin/core";
|
core = "${genode.base-linux}/bin/core-linux";
|
||||||
init = "${genode.os}/bin/init";
|
init = "${genode.os}/bin/init";
|
||||||
"ld.lib.so" = "${depot.base-linux}/lib/ld.lib.so";
|
"ld.lib.so" = "${depot.base-linux}/lib/ld.lib.so";
|
||||||
timer = "${genode.base-linux}/bin/linux_timer_drv";
|
timer = "${genode.base-linux}/bin/linux_timer_drv";
|
||||||
|
|
|
@ -38,13 +38,13 @@ let
|
||||||
|
|
||||||
mkIso = import ./nova-iso.nix {
|
mkIso = import ./nova-iso.nix {
|
||||||
inherit hostPkgs testPkgs;
|
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
|
mkTest = { name ? "unamed", testScript, testConfig, bootModules, qemuMem ? 32
|
||||||
, ... }@t:
|
, ... }@t:
|
||||||
let
|
let
|
||||||
iso = mkIso (with testPkgs;
|
bootModules' = (with testPkgs;
|
||||||
{
|
{
|
||||||
inherit testConfig;
|
inherit testConfig;
|
||||||
config = ./driver-config.xml;
|
config = ./driver-config.xml;
|
||||||
|
@ -53,6 +53,8 @@ let
|
||||||
timer = "${genode.base-nova}/bin/nova_timer_drv";
|
timer = "${genode.base-nova}/bin/nova_timer_drv";
|
||||||
} // bootModules);
|
} // bootModules);
|
||||||
|
|
||||||
|
iso = mkIso bootModules';
|
||||||
|
|
||||||
baseSetup = ''
|
baseSetup = ''
|
||||||
##
|
##
|
||||||
# Wait for a specific output of a already running spawned proce
|
# Wait for a specific output of a already running spawned proce
|
||||||
|
@ -133,6 +135,7 @@ let
|
||||||
in test // {
|
in test // {
|
||||||
inherit driver iso test;
|
inherit driver iso test;
|
||||||
config = testConfig;
|
config = testConfig;
|
||||||
|
rom = bootModules';
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
|
@ -83,6 +83,8 @@ in hostPkgs.stdenv.mkDerivation {
|
||||||
${coreNovaObj} boot_modules.o \
|
${coreNovaObj} boot_modules.o \
|
||||||
-o boot/image.elf
|
-o boot/image.elf
|
||||||
|
|
||||||
|
strip boot/image.elf
|
||||||
|
|
||||||
# build ISO image
|
# build ISO image
|
||||||
cp ${testPkgs.nova}/hypervisor* boot/hypervisor
|
cp ${testPkgs.nova}/hypervisor* boot/hypervisor
|
||||||
cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg
|
cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg
|
||||||
|
|
|
@ -40,8 +40,8 @@ let
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://git.sr.ht/~ehmry/genode";
|
url = "https://git.sr.ht/~ehmry/genode";
|
||||||
rev = "dc0084cd5bebfdba74323bbe8f0a9dd1e8b7c524";
|
rev = "1dc25293b84fb3aed880bb4315adc7ce321c6343";
|
||||||
sha256 = "12qwv6xq51dr5lps60c0r9dmxgk2agd8jgh0prafjk0wxq3xs95p";
|
sha256 = "1jqbc1i4hwi6aai728mz8wmbcpm864v2mlkyg36lm118b7cpp493";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue