Bump toolchain and machine-emulator-tools

toolchain 0.8.0 machine-emulator-tools 0.6.0
cartesi · Apr 20, 2022 · 618781b · 618781b
1 parent bf99e05
commit 618781b
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 25 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
           load: true
           build-args: |
             TOOLCHAIN_REPOSITORY=${{ secrets.DOCKER_ORGANIZATION }}/toolchain
-            TOOLCHAIN_VERSION=0.7.0
+            TOOLCHAIN_VERSION=0.9.0
 
       - name: Export rootfs.ext2 artifact
         run: make copy IMG=`echo "${{ steps.docker_meta.outputs.tags }}" | head -1 | cut -d "," -f 1 | xargs`
@@ -73,7 +73,7 @@ jobs:
           load: false
           build-args: |
             TOOLCHAIN_REPOSITORY=${{ secrets.DOCKER_ORGANIZATION }}/toolchain
-            TOOLCHAIN_VERSION=0.7.0
+            TOOLCHAIN_VERSION=0.9.0
 
   build-fd-emulation:
     runs-on: ubuntu-20.04
@@ -126,7 +126,7 @@ jobs:
           load: true
           build-args: |
             TOOLCHAIN_REPOSITORY=${{ secrets.DOCKER_ORGANIZATION }}/toolchain
-            TOOLCHAIN_VERSION=0.7.0-fd-emulation
+            TOOLCHAIN_VERSION=0.9.0-fd-emulation
             RISCV_ARCH=rv64imafd
             RISCV_ABI=lp64d
 
@@ -161,7 +161,7 @@ jobs:
           load: false
           build-args: |
             TOOLCHAIN_REPOSITORY=${{ secrets.DOCKER_ORGANIZATION }}/toolchain
-            TOOLCHAIN_VERSION=0.7.0-fd-emulation
+            TOOLCHAIN_VERSION=0.9.0-fd-emulation
             RISCV_ARCH=rv64imafd
             RISCV_ABI=lp64d
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Changed
+- Updated toolchain version to v0.9.0
+- Updated Linux Kernel to v5.5.19-ctsi-4
+- Updated machine-emulator-tools to v0.6.0
+
 ## [0.10.0] - 2022-02-23
 ### Added
 - Added more Python 3 core modules sqlite3, readline, bzip and xz
@@ -25,7 +31,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated machine-emulator-tools to v0.4.0
 
 ## [Previous Versions]
-
+- [0.7.0]
+- [0.6.0]
+- [0.5.0]
+- [0.4.0]
+- [0.3.0]
+- [0.2.0]
+- [0.1.0]
+
+[Unreleased]: https://github.com/cartesi/image-rootfs/compare/v0.10.0...HEAD
 [0.10.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.10.0
 [0.9.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.9.0
 [0.8.0]: https://github.com/cartesi/image-rootfs/releases/tag/v0.8.0

diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@
 
 TAG ?= devel
 TOOLCHAIN_DOCKER_REPOSITORY ?= cartesi/toolchain
-TOOLCHAIN_TAG ?= 0.7.0
+TOOLCHAIN_TAG ?= 0.9.0
 NEW_TAG ?= latest
 BUILDROOT_CONFIG ?= configs/default-buildroot-config
 BUSYBOX_CONFIG ?= configs/default-busybox-fragment
@@ -40,7 +40,7 @@ BUILD_ARGS := --build-arg TOOLCHAIN_REPOSITORY=$(TOOLCHAIN_DOCKER_REPOSITORY)
 endif
 
 ifneq ($(TOOLCHAIN_TAG),)
-BUILD_ARGS := --build-arg TOOLCHAIN_VERSION=$(TOOLCHAIN_TAG)
+BUILD_ARGS += --build-arg TOOLCHAIN_VERSION=$(TOOLCHAIN_TAG)
 endif
 
 BUILD_ARGS += --build-arg RISCV_ARCH=$(RISCV_ARCH)

diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ The Cartesi Image RootFS is the repository that provides the Docker configuratio
 ### Build
 
 ```bash
-$ make submodules 
 $ make build
 ```
 

diff --git a/configs/default-buildroot-config b/configs/default-buildroot-config
@@ -2809,7 +2809,8 @@ BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=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_HTTP_DISPATCHER=y
+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

diff --git a/configs/lp64d-buildroot-config b/configs/lp64d-buildroot-config
@@ -2815,7 +2815,7 @@ BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=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_HTTP_DISPATCHER=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

diff --git a/configs/min-buildroot-config b/configs/min-buildroot-config
@@ -2438,7 +2438,7 @@ BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=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_HTTP_DISPATCHER=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

diff --git a/patches/0007-add-machine-emulator-tools.patch b/patches/0007-add-machine-emulator-tools.patch
@@ -13,7 +13,7 @@ diff --git a/package/machine-emulator-tools/Config.in b/package/machine-emulator
 new file mode 100644
 --- /dev/null
 +++ b/package/machine-emulator-tools/Config.in
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,65 @@
 +menuconfig BR2_PACKAGE_MACHINE_EMULATOR_TOOLS
 +	bool "Cartesi machine-emulator-tools"
 +	help
@@ -37,11 +37,17 @@ new file mode 100644
 +	help
 +	  Install ioctl-echo-loop command line utility.
 +
-+config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER
-+	bool "http-dispatcher"
++config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP
++	bool "rollup"
 +	depends on BR2_TOOLCHAIN_EXTERNAL_HAS_CARTESI_KERNEL_HEADERS
 +	help
-+	  Install http-dispatcher command line utility.
++	  Install rollup command line utility.
++
++config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER
++	bool "rollup-http-server"
++	depends on BR2_TOOLCHAIN_EXTERNAL_HAS_CARTESI_KERNEL_HEADERS
++	help
++	  Install rollup-http-server command line utility.
 +
 +config BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ECHO_DAPP
 +	bool "echo-dapp"
@@ -78,19 +84,19 @@ new file mode 100644
 --- /dev/null
 +++ b/package/machine-emulator-tools/machine-emulator-tools.hash
 @@ -0,0 +1 @@
-+sha256  345fd52170cfdc366f33909f197770b4f89fd9e2d4ff5e978c25f1f617b8187b  v0.5.1.tar.gz
++sha256  22200aac1b2ebf6edd59f4418e402f0f48142716e7eb6797255e4142a8eb6790  v0.6.0.tar.gz
 diff --git a/package/machine-emulator-tools/machine-emulator-tools.mk b/package/machine-emulator-tools/machine-emulator-tools.mk
 new file mode 100644
 --- /dev/null
 +++ b/package/machine-emulator-tools/machine-emulator-tools.mk
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,113 @@
 +################################################################################
 +#
 +# machine-emulator-tools
 +#
 +################################################################################
 +
-+MACHINE_EMULATOR_TOOLS_VERSION = v0.5.1
++MACHINE_EMULATOR_TOOLS_VERSION = v0.6.0
 +MACHINE_EMULATOR_TOOLS_SOURCE = $(MACHINE_EMULATOR_TOOLS_VERSION).tar.gz
 +MACHINE_EMULATOR_TOOLS_SITE = https://github.com/cartesi/machine-emulator-tools/archive
 +MACHINE_EMULATOR_TOOLS_LICENSE = Apache-2.0
@@ -118,12 +124,22 @@ new file mode 100644
 +endef
 +endif
 +
-+ifeq ($(BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER),y)
-+define BUILD_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER
-+    $(MACHINE_EMULATOR_TOOLS_CARGO_ENV) cargo +nightly build $(MACHINE_EMULATOR_TOOLS_CARGO_OPTS) --target $(@D)/linux/rollup/http/http-dispatcher/riscv64ima-cartesi-linux-gnu.json --manifest-path $(@D)/linux/rollup/http/http-dispatcher/Cargo.toml
++ifeq ($(BR2_PACKAGE_MACHINE_EMULATOR_TOOLS_ROLLUP),y)
++define BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP
++    $(MAKE) RVCC=$(TARGET_CC) -C $(@D)/linux/rollup/rollup rollup.toolchain
++endef
++define INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP
++    $(INSTALL) -D -m 0755 $(@D)/linux/rollup/rollup/rollup $(TARGET_DIR)/opt/cartesi/bin/rollup
++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 +nightly build $(MACHINE_EMULATOR_TOOLS_CARGO_OPTS) --target $(@D)/linux/rollup/http/rollup-http-server/riscv64ima-cartesi-linux-gnu.json --manifest-path $(@D)/linux/rollup/http/rollup-http-server/Cargo.toml
 +endef
-+define INSTALL_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER
-+    $(INSTALL) -D -m 0755 $(@D)/linux/rollup/http/http-dispatcher/target/riscv64ima-cartesi-linux-gnu/release/http-dispatcher $(TARGET_DIR)/opt/cartesi/bin/http-dispatcher
++define INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER
++    $(INSTALL) -D -m 0755 $(@D)/linux/rollup/http/rollup-http-server/target/riscv64ima-cartesi-linux-gnu/release/rollup-http-server $(TARGET_DIR)/opt/cartesi/bin/rollup-http-server
++    $(INSTALL) -D -m 0755 $(@D)/linux/utils/rollup-init $(TARGET_DIR)/opt/cartesi/bin/rollup-init
 +endef
 +endif
 +
@@ -170,15 +186,17 @@ new file mode 100644
 +define MACHINE_EMULATOR_TOOLS_BUILD_CMDS
 +    $(BUILD_MACHINE_EMULATOR_TOOLS_YIELD)
 +    $(BUILD_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO)
-+    $(BUILD_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER)
++    $(BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP)
++    $(BUILD_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER)
 +    $(BUILD_MACHINE_EMULATOR_TOOLS_ECHO_DAPP)
 +    $(BUILD_MACHINE_EMULATOR_TOOLS_DEHASH)
 +endef
 +
 +define MACHINE_EMULATOR_TOOLS_INSTALL_TARGET_CMDS
 +    $(INSTALL_MACHINE_EMULATOR_TOOLS_YIELD)
 +    $(INSTALL_MACHINE_EMULATOR_TOOLS_IOCTL_ECHO)
-+    $(INSTALL_MACHINE_EMULATOR_TOOLS_HTTP_DISPATCHER)
++    $(INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP)
++    $(INSTALL_MACHINE_EMULATOR_TOOLS_ROLLUP_HTTP_SERVER)
 +    $(INSTALL_MACHINE_EMULATOR_TOOLS_ECHO_DAPP)
 +    $(INSTALL_MACHINE_EMULATOR_TOOLS_DEHASH)
 +    $(INSTALL_MACHINE_EMULATOR_UTILS)