From f3167c0cc0128e1920d4560b8ddd3431abc4287a Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 19 Jul 2024 17:53:10 +0200
Subject: [PATCH] Emulate other architectures in owl nodes too

Allows cross-compilation of packages for RISC-V that are known to try to
run RISC-V programs in the host.
---
 m/hut/configuration.nix  | 3 +--
 m/module/emulation.nix   | 3 +++
 m/owl1/configuration.nix | 1 +
 m/owl2/configuration.nix | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 m/module/emulation.nix

diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix
index 63cfe00..386d6ab 100644
--- a/m/hut/configuration.nix
+++ b/m/hut/configuration.nix
@@ -6,6 +6,7 @@
 
     ../module/ceph.nix
     ../module/debuginfod.nix
+    ../module/emulation.nix
     ../module/slurm-client.nix
     ./gitlab-runner.nix
     ./monitoring.nix
@@ -19,8 +20,6 @@
     #./pxe.nix
   ];
 
-  boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" ];
-
   # Select the this using the ID to avoid mismatches
   boot.loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2BB240G7_PHDV6462004Y240AGN";
 
diff --git a/m/module/emulation.nix b/m/module/emulation.nix
new file mode 100644
index 0000000..ae63970
--- /dev/null
+++ b/m/module/emulation.nix
@@ -0,0 +1,3 @@
+{
+  boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" ];
+}
diff --git a/m/owl1/configuration.nix b/m/owl1/configuration.nix
index ab2c63b..5a87b86 100644
--- a/m/owl1/configuration.nix
+++ b/m/owl1/configuration.nix
@@ -4,6 +4,7 @@
   imports = [
     ../common/xeon.nix
     ../module/ceph.nix
+    ../module/emulation.nix
     ../module/slurm-client.nix
     ../module/slurm-firewall.nix
     ../module/slurm-hut-nix-store.nix
diff --git a/m/owl2/configuration.nix b/m/owl2/configuration.nix
index e973833..9bb010e 100644
--- a/m/owl2/configuration.nix
+++ b/m/owl2/configuration.nix
@@ -4,6 +4,7 @@
   imports = [
     ../common/xeon.nix
     ../module/ceph.nix
+    ../module/emulation.nix
     ../module/slurm-client.nix
     ../module/slurm-firewall.nix
     ../module/slurm-hut-nix-store.nix