Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.19.0 #13

Merged
merged 3 commits into from
Oct 13, 2023
Merged

Release 0.19.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de92b2
feat!: Update emulator tools to v0.13.0
vfusco Oct 11, 2023
db59785
feat: Include xhalt command line tool
vfusco Oct 11, 2023
44ddfa4
doc: Update CHANGELOG.md
vfusco Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions configs/default-buildroot-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/min-buildroot-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want this on by default?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No.

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
Expand Down
6 changes: 6 additions & 0 deletions external/package/machine-emulator-tools/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions external/package/machine-emulator-tools/machine-emulator-tools.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion external/tools
Open in desktop
Submodule tools updated 14 files
+7 −0 .github/workflows/main.yml
+11 −1 CHANGELOG.md
+2 −13 Dockerfile
+2 −2 Makefile
+2 −2 example/README.md
+1 −1 example/build
+2 −2 linux/utils/flashdrive
+2 −0 linux/xhalt/.gitignore
+77 −0 linux/xhalt/Makefile
+41 −0 linux/xhalt/README.md
+9 −0 linux/xhalt/xhalt.c
+60 −63 skel/opt/cartesi/bin/init
+0 −11 skel/opt/cartesi/etc/motd
+ − skel/opt/cartesi/var/run/random-seed