keep iterating on build

Author: justus-camp-microsoft

flowey/flowey_lib_hvlite/src/build_openhcl_initrd.rs

@@ -117,6 +117,7 @@ impl FlowNode for Node {
 
             ctx.emit_rust_step("building openhcl initrd", |ctx| {
                 pydeps.clone().claim(ctx);
+                let platform = ctx.platform();
                 let interactive_dep = interactive_dep.claim(ctx);
                 let rootfs_config = rootfs_config.claim(ctx);
                 let extra_env = extra_env.claim(ctx);
@@ -132,7 +133,7 @@ impl FlowNode for Node {
                     let openvmm_repo_path = rt.read(openvmm_repo_path);
                     let kernel_package_root = rt.read(kernel_package_root);
 
-                    let sh = xshell::Shell::new()?;
+                    let sh = FloweyShell::new(platform)?;
 
                     let initrd_path = sh.current_dir().join("openhcl.cpio.gz");
 

openhcl_kernel.nix

@@ -40,11 +40,10 @@ in stdenv.mkDerivation {
 
   installPhase = ''
     runHook preInstall
-    mkdir $out
-    cp vmlinux* $out
-    mkdir -p $out/modules/build/native/bin/${arch}
-    cp kernel_build_metadata.json $out/modules/build/native/bin/
-    cp -r modules $out/modules/build/native/bin/${arch}
+    mkdir -p $out/build/native/bin/${arch}
+    cp vmlinux* $out/build/native/bin/${arch}/
+    cp kernel_build_metadata.json $out/build/native/bin/
+    cp -r modules $out/build/native/bin/${arch}/
     runHook postInstall
   '';
 }

shell.nix

@@ -50,8 +50,7 @@ in pkgs.mkShell.override { } {
 
   NIX_OPENVMM_DEPS = openvmm_deps;
   NIX_PROTOC_PATH = protoc;
-  NIX_OPENHCL_KERNEL = "${openhcl_kernel}/vmlinux";
-  NIX_OPENHCL_KERNEL_MODULES = "${openhcl_kernel}/modules";
+  NIX_OPENHCL_KERNEL = openhcl_kernel;
   NIX_UEFI_MU_MSVM = "${uefi_mu_msvm}/MSVM.fd";
   RUST_BACKTRACE = 1;
   # will probably need more than one of these for local source + dependencies.