ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

nixos: rename genode.boot to genode.core 

Have a "boot.…" and a "genode.boot.…" is confusing.
This commit is contained in:
Ehmry - 2021-04-09 16:39:06 +02:00
parent 1f6934ee29
commit cd1b95c1d7
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos-modules/base-hw-pc.nix
View File

@ -14,9 +14,9 @@ in {
basePackages = with pkgs.genodePackages; [ base-hw-pc rtc_drv ]; basePackages = with pkgs.genodePackages; [ base-hw-pc rtc_drv ];
}; };
genode.boot = { genode.core = {
initrd = "${config.genode.boot.image}/image.elf"; initrd = "${config.genode.core.image}/image.elf";
image = utils.hwImage "0xffffffc000000000" "0x00200000" image = utils.hwImage "0xffffffc000000000" "0x00200000"
pkgs.genodePackages.base-hw-pc config.system.name { } pkgs.genodePackages.base-hw-pc config.system.name { }

4
nixos-modules/base-hw-virt_qemu.nix
View File

@ -14,9 +14,9 @@ in {
basePackages = with pkgs.genodePackages; [ base-hw-virt_qemu rtc-dummy ]; basePackages = with pkgs.genodePackages; [ base-hw-virt_qemu rtc-dummy ];
}; };
genode.boot = { genode.core = {
initrd = "${config.genode.boot.image}/image.elf"; initrd = "${config.genode.core.image}/image.elf";
image = utils.hwImage "0xffffffc000000000" "0x40000000" image = utils.hwImage "0xffffffc000000000" "0x40000000"
pkgs.genodePackages.base-hw-virt_qemu config.system.name { } pkgs.genodePackages.base-hw-virt_qemu config.system.name { }

2
nixos-modules/eris/rom-fs.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
config = lib.mkIf (config.genode.boot.storeBackend == "fs") { config = lib.mkIf (config.genode.core.storeBackend == "fs") {
genode.core.children.eris_vfs = let genode.core.children.eris_vfs = let
vfsRump = lib.getEris' "lib" pkgs.genodePackages.rump "vfs_rump.lib.so"; vfsRump = lib.getEris' "lib" pkgs.genodePackages.rump "vfs_rump.lib.so";

2
nixos-modules/eris/rom-memory.nix
View File

@ -2,7 +2,7 @@
{ {
config = lib.mkIf (config.genode.boot.storeBackend == "memory") { config = lib.mkIf (config.genode.core.storeBackend == "memory") {
genode.core.children.eris_vfs = { genode.core.children.eris_vfs = {
package = pkgs.genodePackages.vfs; package = pkgs.genodePackages.vfs;

14
nixos-modules/genode-core.nix
View File

@ -25,7 +25,7 @@ let
fs = [ ]; fs = [ ];
memory = [ config.system.build.tarball ]; memory = [ config.system.build.tarball ];
net = [ ]; net = [ ];
}.${config.genode.boot.storeBackend}; }.${config.genode.core.storeBackend};
coreInputs = coreInputs =
# TODO: get rid of this? # TODO: get rid of this?
@ -70,11 +70,11 @@ let
# using Dhall expressions. Probably not worth pursuing. # using Dhall expressions. Probably not worth pursuing.
pkgs.writeText "manifest.dhall" (mergeManifests (map addManifest pkgs.writeText "manifest.dhall" (mergeManifests (map addManifest
(with pkgs.genodePackages; storeBackendInputs ++ coreInputs)) (with pkgs.genodePackages; storeBackendInputs ++ coreInputs))
+ lib.optionalString (config.genode.boot.romModules != { }) '' + lib.optionalString (config.genode.core.romModules != { }) ''
# [ { mapKey = "romModules", mapValue = [ ${ # [ { mapKey = "romModules", mapValue = [ ${
lib.concatStringsSep ", " (lib.lists.flatten ((mapAttrsToList lib.concatStringsSep ", " (lib.lists.flatten ((mapAttrsToList
(k: v: ''{ mapKey = "${k}", mapValue = "${v}" }'') (k: v: ''{ mapKey = "${k}", mapValue = "${v}" }'')
config.genode.boot.romModules))) config.genode.core.romModules)))
}] } ]''); }] } ]'');
/* storeRomPolicies = mapAttrsToList /* storeRomPolicies = mapAttrsToList
@ -164,7 +164,7 @@ in {
}; };
boot = { core = {
configFile = mkOption { configFile = mkOption {
type = types.path; type = types.path;
@ -233,7 +233,7 @@ in {
message = "invalid Genode core for this system"; message = "invalid Genode core for this system";
}]; }];
genode.boot.romModules = with builtins; genode.core.romModules = with builtins;
let getBin = name: "${getAttr name pkgs.genodePackages}/bin/${name}"; let getBin = name: "${getAttr name pkgs.genodePackages}/bin/${name}";
in listToAttrs (lib.lists.flatten in listToAttrs (lib.lists.flatten
((map (getAttr "roms") (attrValues children')) ++ (map ((map (getAttr "roms") (attrValues children')) ++ (map
@ -304,7 +304,7 @@ in {
virtualisation.diskImage = virtualisation.diskImage =
import ./lib/make-bootable-image.nix { inherit config lib pkgs; }; import ./lib/make-bootable-image.nix { inherit config lib pkgs; };
virtualisation.useBootLoader = config.genode.boot.storeBackend == "fs"; virtualisation.useBootLoader = config.genode.core.storeBackend == "fs";
virtualisation.qemu.options = let virtualisation.qemu.options = let
blockCommon = blockCommon =
@ -313,7 +313,7 @@ in {
fs = blockCommon; fs = blockCommon;
net = [ ]; net = [ ];
memory = [ ]; memory = [ ];
}.${config.genode.boot.storeBackend}; }.${config.genode.core.storeBackend};
}; };

2
nixos-modules/gui/default.nix
View File

@ -32,7 +32,7 @@ in {
''; '';
}; };
genode.boot.romModules = mkIf cfg.consoleLog.enable { genode.core.romModules = mkIf cfg.consoleLog.enable {
"TerminusTTF.ttf" = pkgs.buildPackages.terminus_font_ttf "TerminusTTF.ttf" = pkgs.buildPackages.terminus_font_ttf
+ "/share/fonts/truetype/TerminusTTF.ttf"; + "/share/fonts/truetype/TerminusTTF.ttf";
}; };

14
nixos-modules/nova.nix
View File

@ -15,7 +15,7 @@ let
} }
gz ${pkgs.genodePackages.genodeSources}/tool/boot/bender $out/bender.gz gz ${pkgs.genodePackages.genodeSources}/tool/boot/bender $out/bender.gz
gz ${pkgs.genodePackages.NOVA}/hypervisor-x86_64 $out/hypervisor.gz gz ${pkgs.genodePackages.NOVA}/hypervisor-x86_64 $out/hypervisor.gz
gz ${config.genode.boot.image}/image.elf $out/image.elf.gz gz ${config.genode.core.image}/image.elf $out/image.elf.gz
''; '';
in { in {
@ -24,21 +24,21 @@ in {
supportedSystems = [ "x86_64-genode" ]; supportedSystems = [ "x86_64-genode" ];
}; };
genode.boot.image = genode.core.image =
utils.novaImage config.system.name { } config.system.build.configFile; utils.novaImage config.system.name { } config.system.build.configFile;
genode.boot.romModules = { genode.core.romModules = {
"ld.lib.so" = "${pkgs.genodePackages.base-nova}/lib/ld.lib.so"; "ld.lib.so" = "${pkgs.genodePackages.base-nova}/lib/ld.lib.so";
timer_drv = "${pkgs.genodePackages.base-nova}/bin/timer_drv"; timer_drv = "${pkgs.genodePackages.base-nova}/bin/timer_drv";
}; };
genode.boot.storePaths = genode.core.storePaths =
lib.optional (config.genode.boot.storeBackend != "memory") bootDir; lib.optional (config.genode.core.storeBackend != "memory") bootDir;
virtualisation.qemu.options = virtualisation.qemu.options =
lib.optionals (!config.virtualisation.useBootLoader) [ lib.optionals (!config.virtualisation.useBootLoader) [
"-kernel '${pkgs.genodePackages.bender}/share/bender/bender'" "-kernel '${pkgs.genodePackages.bender}/share/bender/bender'"
"-initrd '${pkgs.genodePackages.NOVA}/hypervisor-x86_64 arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf'" "-initrd '${pkgs.genodePackages.NOVA}/hypervisor-x86_64 arg=iommu logmem novpid serial,${config.genode.core.image}/image.elf'"
]; ];
virtualisation.qemu.kernel = virtualisation.qemu.kernel =
@ -47,7 +47,7 @@ in {
virtualisation.qemu.initrd = "${pkgs.genodePackages.NOVA}/hypervisor-x86_64"; virtualisation.qemu.initrd = "${pkgs.genodePackages.NOVA}/hypervisor-x86_64";
virtualisation.qemu.cmdline = virtualisation.qemu.cmdline =
"arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf"; "arg=iommu logmem novpid serial,${config.genode.core.image}/image.elf";
boot.loader.grub = { boot.loader.grub = {
extraEntries = '' extraEntries = ''

2
tests/ahci.nix
View File

@ -6,7 +6,7 @@
device = 0; device = 0;
partition = 1; partition = 1;
}; };
genode.boot.storeBackend = "fs"; genode.core.storeBackend = "fs";
genode.init.children.hello = { genode.init.children.hello = {
package = pkgs.hello; package = pkgs.hello;
configFile = ./hello.dhall; configFile = ./hello.dhall;

2
tests/usb.nix
View File

@ -1,7 +1,7 @@
{ {
name = "usb"; name = "usb";
machine = { pkgs, ... }: { machine = { pkgs, ... }: {
genode.boot.storeBackend = "fs"; genode.core.storeBackend = "fs";
hardware.genode.usb.enable = true; hardware.genode.usb.enable = true;
hardware.genode.usb.storage.enable = true; hardware.genode.usb.storage.enable = true;
genode.init.children.hello = { genode.init.children.hello = {