From 2de92b2ceb3b20c23fe0c8d1e7d610989ea58e5c Mon Sep 17 00:00:00 2001 From: Victor Fusco <1221933+vfusco@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:19:53 -0300 Subject: [PATCH 1/3] feat!: Update emulator tools to v0.13.0 --- external/tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tools b/external/tools index 6070b82..132cfe4 160000 --- a/external/tools +++ b/external/tools @@ -1 +1 @@ -Subproject commit 6070b82a3f5c2e058a7691e935abc46f138d2c4d +Subproject commit 132cfe4ad4d8b19079cdc1492ffeae9ed105bc7e From db5978573179f23e92d643b344e5dfa36ac9f91a Mon Sep 17 00:00:00 2001 From: Victor Fusco <1221933+vfusco@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:35:42 -0300 Subject: [PATCH 2/3] feat: Include xhalt command line tool --- configs/default-buildroot-config | 1 + configs/min-buildroot-config | 2 +- external/package/machine-emulator-tools/Config.in | 6 ++++++ .../machine-emulator-tools/machine-emulator-tools.mk | 11 +++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configs/default-buildroot-config b/configs/default-buildroot-config index 0c472d4..14487a5 100644 --- a/configs/default-buildroot-config +++ b/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 diff --git a/configs/min-buildroot-config b/configs/min-buildroot-config index a61e0f1..f7b93e4 100644 --- a/configs/min-buildroot-config +++ b/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 diff --git a/external/package/machine-emulator-tools/Config.in b/external/package/machine-emulator-tools/Config.in index f617ab5..e4c8a8d 100644 --- a/external/package/machine-emulator-tools/Config.in +++ b/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 diff --git a/external/package/machine-emulator-tools/machine-emulator-tools.mk b/external/package/machine-emulator-tools/machine-emulator-tools.mk index 084057c..1461bdd 100644 --- a/external/package/machine-emulator-tools/machine-emulator-tools.mk +++ b/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) From 44ddfa459db87f7e5538b020a0d3a49be0f7487b Mon Sep 17 00:00:00 2001 From: Victor Fusco <1221933+vfusco@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:22:33 -0300 Subject: [PATCH 3/3] doc: Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- Makefile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 411baee..2be5340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.19.0] - 2023-10-13 +### Changed +- Updated machine-emulator-tools to v0.13.0 + ## [0.18.0] - 2023-08-12 ### Added - Added support for amd64 and arm64 builds with depot.dev @@ -97,7 +101,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [0.2.0] - [0.1.0] -[Unreleased]: https://github.com/cartesi/image-rootfs/compare/v0.18.0...HEAD +[Unreleased]: https://github.com/cartesi/image-rootfs/compare/v0.19.0...HEAD +[0.19.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.19.0 [0.18.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.18.0 [0.17.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.17.0 [0.16.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.16.0 diff --git a/Makefile b/Makefile index dd37f1f..247e9e7 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ BUSYBOX_CONFIG ?= configs/default-busybox-fragment RISCV_ARCH ?= rv64gc RISCV_ABI ?= lp64d -ROOTFS_VERSION ?= v0.18.0 +ROOTFS_VERSION ?= v0.19.0 ROOTFS_FILENAME ?= rootfs-$(ROOTFS_VERSION).ext2 CONTAINER_BASE := /opt/cartesi/rootfs