Change the riscv target to have -from-x86_64

This is to be consistent with the naming conventions as this package is a xcompiled package we should follow the same convention and list it as a package that is built on x86 and not claim that it is a package that is built on riscv directly Signed-off-by: Brian McGillion <[email protected]>
dmitry-erin · Aug 20, 2024 · 93b8fa5 · 93b8fa5
1 parent d1af5df
commit 93b8fa5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,8 +80,8 @@ jobs:
             target: nvidia-jetson-orin-agx-debug-from-x86_64
           - arch: x86_64-linux
             target: nvidia-jetson-orin-nx-debug-from-x86_64
-          - arch: riscv64-linux
-            target: microchip-icicle-kit-debug
+          - arch: x86_64-linux
+            target: microchip-icicle-kit-debug-from-x86_64
           - arch: x86_64-linux
             target: doc
           - arch: aarch64-linux

diff --git a/hydrajobs/flake-module.nix b/hydrajobs/flake-module.nix
@@ -30,12 +30,13 @@ in
     nxp-imx8mp-evk-debug.x86_64-linux = self.packages.aarch64-linux.nxp-imx8mp-evk-debug;
     docs.x86_64-linux = self.packages.x86_64-linux.doc;
     docs.aarch64-linux = self.packages.aarch64-linux.doc;
-    microchip-icicle-kit-debug.x86_64-linux = self.packages.riscv64-linux.microchip-icicle-kit-debug;
-    # Build cross-copmiled images
+    # Build cross-compiled images
     nvidia-jetson-orin-agx-debug-from-x86_64.x86_64-linux =
       self.packages.x86_64-linux.nvidia-jetson-orin-agx-debug-from-x86_64;
     nvidia-jetson-orin-nx-debug-from-x86_64.x86_64-linux =
       self.packages.x86_64-linux.nvidia-jetson-orin-nx-debug-from-x86_64;
+    microchip-icicle-kit-debug-from-x86_64.x86_64-linux =
+      self.packages.x86_64-linux.microchip-icicle-kit-debug-from-x86_64;
 
     # Build also cross-compiled images without demo apps
     nvidia-jetson-orin-agx-debug-nodemoapps-from-x86_64.x86_64-linux =

diff --git a/packages/flake-module.nix b/packages/flake-module.nix
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 { self, ... }:
 {
-  flake.packages.riscv64-linux.hart-software-services =
-    self.nixosConfigurations.microchip-icicle-kit-debug.pkgs.callPackage ./hart-software-services
+  flake.packages.x86_64-linux.hart-software-services =
+    self.nixosConfigurations.microchip-icicle-kit-debug-from-x86_64.pkgs.callPackage
+      ./hart-software-services
       { };
   perSystem =
     {

diff --git a/targets/microchip-icicle-kit/flake-module.nix b/targets/microchip-icicle-kit/flake-module.nix
@@ -61,7 +61,7 @@ let
     in
     {
       inherit hostConfiguration;
-      name = "${name}-${variant}";
+      name = "${name}-${variant}-from-x86_64";
       package = hostConfiguration.config.system.build.sdImage;
     };
 
@@ -76,7 +76,7 @@ in
       map (t: lib.nameValuePair t.name t.hostConfiguration) targets
     );
     packages = {
-      riscv64-linux = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
+      x86_64-linux = builtins.listToAttrs (map (t: lib.nameValuePair t.name t.package) targets);
     };
   };
 }