From cd1b95c1d71f8073f4140c0ec647a4b27348381b Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 9 Apr 2021 16:39:06 +0200
Subject: [PATCH] nixos: rename genode.boot to genode.core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Have a "boot.…" and a "genode.boot.…" is confusing.
---
 nixos-modules/base-hw-pc.nix        |  4 ++--
 nixos-modules/base-hw-virt_qemu.nix |  4 ++--
 nixos-modules/eris/rom-fs.nix       |  2 +-
 nixos-modules/eris/rom-memory.nix   |  2 +-
 nixos-modules/genode-core.nix       | 14 +++++++-------
 nixos-modules/gui/default.nix       |  2 +-
 nixos-modules/nova.nix              | 14 +++++++-------
 tests/ahci.nix                      |  2 +-
 tests/usb.nix                       |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/nixos-modules/base-hw-pc.nix b/nixos-modules/base-hw-pc.nix
index b27f651..5e4e57d 100644
--- a/nixos-modules/base-hw-pc.nix
+++ b/nixos-modules/base-hw-pc.nix
@@ -14,9 +14,9 @@ in {
     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"
       pkgs.genodePackages.base-hw-pc config.system.name { }
diff --git a/nixos-modules/base-hw-virt_qemu.nix b/nixos-modules/base-hw-virt_qemu.nix
index 379df20..3e67eea 100644
--- a/nixos-modules/base-hw-virt_qemu.nix
+++ b/nixos-modules/base-hw-virt_qemu.nix
@@ -14,9 +14,9 @@ in {
     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"
       pkgs.genodePackages.base-hw-virt_qemu config.system.name { }
diff --git a/nixos-modules/eris/rom-fs.nix b/nixos-modules/eris/rom-fs.nix
index 849ebbd..b7e5fa0 100644
--- a/nixos-modules/eris/rom-fs.nix
+++ b/nixos-modules/eris/rom-fs.nix
@@ -1,7 +1,7 @@
 { 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
       vfsRump = lib.getEris' "lib" pkgs.genodePackages.rump "vfs_rump.lib.so";
diff --git a/nixos-modules/eris/rom-memory.nix b/nixos-modules/eris/rom-memory.nix
index 7c54e4e..4582221 100644
--- a/nixos-modules/eris/rom-memory.nix
+++ b/nixos-modules/eris/rom-memory.nix
@@ -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 = {
       package = pkgs.genodePackages.vfs;
diff --git a/nixos-modules/genode-core.nix b/nixos-modules/genode-core.nix
index 5cc1b3a..97b8840 100644
--- a/nixos-modules/genode-core.nix
+++ b/nixos-modules/genode-core.nix
@@ -25,7 +25,7 @@ let
       fs = [ ];
       memory = [ config.system.build.tarball ];
       net = [ ];
-    }.${config.genode.boot.storeBackend};
+    }.${config.genode.core.storeBackend};
 
     coreInputs =
       # TODO: get rid of this?
@@ -70,11 +70,11 @@ let
       # using Dhall expressions. Probably not worth pursuing.
       pkgs.writeText "manifest.dhall" (mergeManifests (map addManifest
         (with pkgs.genodePackages; storeBackendInputs ++ coreInputs))
-        + lib.optionalString (config.genode.boot.romModules != { }) ''
+        + lib.optionalString (config.genode.core.romModules != { }) ''
           # [ { mapKey = "romModules", mapValue = [ ${
             lib.concatStringsSep ", " (lib.lists.flatten ((mapAttrsToList
               (k: v: ''{ mapKey = "${k}", mapValue = "${v}" }'')
-              config.genode.boot.romModules)))
+              config.genode.core.romModules)))
           }] } ]'');
 
     /* storeRomPolicies = mapAttrsToList
@@ -164,7 +164,7 @@ in {
 
     };
 
-    boot = {
+    core = {
 
       configFile = mkOption {
         type = types.path;
@@ -233,7 +233,7 @@ in {
       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}";
       in listToAttrs (lib.lists.flatten
         ((map (getAttr "roms") (attrValues children')) ++ (map
@@ -304,7 +304,7 @@ in {
     virtualisation.diskImage =
       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
       blockCommon =
@@ -313,7 +313,7 @@ in {
       fs = blockCommon;
       net = [ ];
       memory = [ ];
-    }.${config.genode.boot.storeBackend};
+    }.${config.genode.core.storeBackend};
 
   };
 
diff --git a/nixos-modules/gui/default.nix b/nixos-modules/gui/default.nix
index 102fe54..2d2154b 100644
--- a/nixos-modules/gui/default.nix
+++ b/nixos-modules/gui/default.nix
@@ -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
         + "/share/fonts/truetype/TerminusTTF.ttf";
     };
diff --git a/nixos-modules/nova.nix b/nixos-modules/nova.nix
index c44d098..ed860dd 100644
--- a/nixos-modules/nova.nix
+++ b/nixos-modules/nova.nix
@@ -15,7 +15,7 @@ let
     }
     gz ${pkgs.genodePackages.genodeSources}/tool/boot/bender $out/bender.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 {
@@ -24,21 +24,21 @@ in {
     supportedSystems = [ "x86_64-genode" ];
   };
 
-  genode.boot.image =
+  genode.core.image =
     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";
     timer_drv = "${pkgs.genodePackages.base-nova}/bin/timer_drv";
   };
 
-  genode.boot.storePaths =
-    lib.optional (config.genode.boot.storeBackend != "memory") bootDir;
+  genode.core.storePaths =
+    lib.optional (config.genode.core.storeBackend != "memory") bootDir;
 
   virtualisation.qemu.options =
     lib.optionals (!config.virtualisation.useBootLoader) [
       "-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 =
@@ -47,7 +47,7 @@ in {
   virtualisation.qemu.initrd = "${pkgs.genodePackages.NOVA}/hypervisor-x86_64";
 
   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 = {
     extraEntries = ''
diff --git a/tests/ahci.nix b/tests/ahci.nix
index 3e62dd7..74f614e 100644
--- a/tests/ahci.nix
+++ b/tests/ahci.nix
@@ -6,7 +6,7 @@
       device = 0;
       partition = 1;
     };
-    genode.boot.storeBackend = "fs";
+    genode.core.storeBackend = "fs";
     genode.init.children.hello = {
       package = pkgs.hello;
       configFile = ./hello.dhall;
diff --git a/tests/usb.nix b/tests/usb.nix
index 7a1f304..70f3e79 100644
--- a/tests/usb.nix
+++ b/tests/usb.nix
@@ -1,7 +1,7 @@
 {
   name = "usb";
   machine = { pkgs, ... }: {
-    genode.boot.storeBackend = "fs";
+    genode.core.storeBackend = "fs";
     hardware.genode.usb.enable = true;
     hardware.genode.usb.storage.enable = true;
     genode.init.children.hello = {