feat: Include xhalt command line tool

Author: vfusco

configs/default-buildroot-config

@@ -3057,6 +3057,7 @@ BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_YIELD=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO=y
+# BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_XHALT is not set
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ECHO_DAPP=y

configs/min-buildroot-config

@@ -2619,10 +2619,10 @@ BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_YIELD=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO=y
+# BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_XHALT is not set
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ECHO_DAPP=y
-BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_DEHASH=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_FLASHDRIVE=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_READBE64=y
 BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_WRITEBE64=y

external/package/machine-emulator-tools/Config.in

@@ -21,6 +21,12 @@ config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO
 	help
 	  Install ioctl-echo-loop command line utility.
 
+config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_XHALT
+	bool "xhalt"
+	depends on BR2_TOOLCHAIN_EXTERNAL_HAS_CARTESI_KERNEL_HEADERS
+	help
+	  Install xhalt command line utility.
+
 config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP
 	bool "rollup"
 	depends on BR2_TOOLCHAIN_EXTERNAL_HAS_CARTESI_KERNEL_HEADERS

external/package/machine-emulator-tools/machine-emulator-tools.mk

@@ -44,6 +44,15 @@ define INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_XHALT),y)
+define BUILD_MACHINE_EMULATOR_TOOLS_XHALT
+    $(MAKE) RVCC=$(TARGET_CC) -C $(@D)/linux/xhalt xhalt.toolchain
+endef
+define INSTALL_MACHINE_EMULATOR_TOOLS_XHALT
+    $(INSTALL) -D -m 0755 $(@D)/linux/xhalt/xhalt $(TARGET_DIR)/opt/cartesi/bin/xhalt
+endef
+endif
+
 ifeq ($(BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER),y)
 define BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER
     $(MACHINE_EMULATOR_TOOLS_CARGO_ENV) cargo build $(MACHINE_EMULATOR_TOOLS_CARGO_OPTS) --target riscv64gc-unknown-linux-gnu --manifest-path $(@D)/linux/rollup/http/rollup-http-server/Cargo.toml
@@ -88,6 +97,7 @@ endif
 define MACHINE_EMULATOR_TOOLS_BUILD_CMDS
     $(BUILD_MACHINE_EMULATOR_TOOLS_YIELD)
     $(BUILD_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO)
+    $(BUILD_MACHINE_EMULATOR_TOOLS_XHALT)
     $(BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP)
     $(BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER)
     $(BUILD_MACHINE_EMULATOR_TOOLS_ECHO_DAPP)
@@ -96,6 +106,7 @@ endef
 define MACHINE_EMULATOR_TOOLS_INSTALL_TARGET_CMDS
     $(INSTALL_MACHINE_EMULATOR_TOOLS_YIELD)
     $(INSTALL_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO)
+    $(INSTALL_MACHINE_EMULATOR_TOOLS_XHALT)
     $(INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP)
     $(INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER)
     $(INSTALL_MACHINE_EMULATOR_TOOLS_ECHO_DAPP)