Add flash scripts as build result

Signed-off-by: Valentin Kharin <[email protected]>
tiiuae · Dec 18, 2024 · eb33175 · eb33175
1 parent 8938072
commit eb33175
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 7 deletions.
diff --git a/lib.nix b/lib.nix
@@ -158,5 +158,21 @@ nixpkgs.lib.extend (
       # files beneath withough manually having to list all the subsequent files.
       #
       path: builtins.attrValues (lib.mapAttrs (_: import) (rakeLeaves path));
+
+    genPkgWithFlashScript =
+      pkg: system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+      in
+      pkgs.linkFarm "ghaf-image" [
+        {
+          name = "image";
+          path = pkg;
+        }
+        {
+          name = "flash-script";
+          path = pkgs.callPackage ./packages/flash { };
+        }
+      ];
   }
 )
diff --git a/targets/generic-x86_64/flake-module.nix b/targets/generic-x86_64/flake-module.nix
@@ -112,7 +112,11 @@ in
       map (t: lib.nameValuePair t.name t.hostConfiguration) targets
     );
     packages = {
-      x86_64-linux = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
+      x86_64-linux = builtins.listToAttrs (
+        map (
+          t: lib.nameValuePair t.name (self.outputs.lib.genPkgWithFlashScript t.package "x86_64-linux")
+        ) targets
+      );
     };
   };
 }
diff --git a/targets/laptop/flake-module.nix b/targets/laptop/flake-module.nix
@@ -114,6 +114,8 @@ in
     nixosConfigurations = builtins.listToAttrs (
       map (t: lib.nameValuePair t.name t.hostConfiguration) targets
     );
-    packages.${system} = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
+    packages.${system} = builtins.listToAttrs (
+      map (t: lib.nameValuePair t.name (self.outputs.lib.genPkgWithFlashScript t.package system)) targets
+    );
   };
 }
diff --git a/targets/lenovo-x1-installer/flake-module.nix b/targets/lenovo-x1-installer/flake-module.nix
@@ -9,7 +9,7 @@ let
   installer =
     generation: variant:
     let
-      imagePath = self.packages.x86_64-linux."${name}-${generation}-${variant}" + "/disk1.raw.zst";
+      imagePath = self.packages.x86_64-linux."${name}-${generation}-${variant}" + "/image/disk1.raw.zst";
       hostConfiguration = lib.nixosSystem {
         inherit system;
         modules = [
@@ -72,12 +72,29 @@ let
     (installer "gen10" "release")
     (installer "gen11" "release")
   ];
+  genPkgWithFlashScript =
+    pkg:
+    let
+      pkgs = import self.inputs.nixpkgs { inherit system; };
+    in
+    pkgs.linkFarm "ghaf-image" [
+      {
+        name = "image";
+        path = pkg;
+      }
+      {
+        name = "flash-script";
+        path = pkgs.callPackage ../../packages/flash { };
+      }
+    ];
 in
 {
   flake = {
     nixosConfigurations = builtins.listToAttrs (
       map (t: lib.nameValuePair t.name t.hostConfiguration) targets
     );
-    packages.${system} = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
+    packages.${system} = builtins.listToAttrs (
+      map (t: lib.nameValuePair t.name (genPkgWithFlashScript t.package)) targets
+    );
   };
 }
diff --git a/targets/microchip-icicle-kit/flake-module.nix b/targets/microchip-icicle-kit/flake-module.nix
@@ -76,7 +76,11 @@ in
       map (t: lib.nameValuePair t.name t.hostConfiguration) targets
     );
     packages = {
-      x86_64-linux = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
+      x86_64-linux = builtins.listToAttrs (
+        map (
+          t: lib.nameValuePair t.name (self.outputs.lib.genPkgWithFlashScript t.package "x86_64-linux")
+        ) targets
+      );
     };
   };
 }
diff --git a/targets/nvidia-jetson-orin/flake-module.nix b/targets/nvidia-jetson-orin/flake-module.nix
@@ -183,7 +183,11 @@ in
 
     packages = {
       aarch64-linux =
-        builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets)
+        builtins.listToAttrs (
+          map (
+            t: lib.nameValuePair t.name (self.outputs.lib.genPkgWithFlashScript t.package "aarch64-linux")
+          ) targets
+        )
         # EXPERIMENTAL: The aarch64-linux hosted flashing support is experimental
         #               and it simply might not work. Providing the script anyway
         // builtins.listToAttrs (
@@ -195,7 +199,11 @@ in
           map (t: lib.nameValuePair "${t.name}-flash-qspi" (generate-flash-qspi t "aarch64-linux")) targets
         );
       x86_64-linux =
-        builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) crossTargets)
+        builtins.listToAttrs (
+          map (
+            t: lib.nameValuePair t.name (self.outputs.lib.genPkgWithFlashScript t.package "x86_64-linux")
+          ) crossTargets
+        )
         // builtins.listToAttrs (
           map (t: lib.nameValuePair "${t.name}-flash-script" (generate-flash-script t "x86_64-linux")) (
             targets ++ crossTargets