diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04fef06ec..889b9bf13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,9 @@ name: Build/Test/Release on: [push] env: - KERNEL_VERSION: v0.17.0 - LINUX_VERSION: 5.15.63-ctsi-2-v0.17.0 - ROOTFS_VERSION: v0.18.0 + KERNEL_VERSION: v0.18.0 + LINUX_VERSION: 5.15.63-ctsi-2-v0.18.0 + ROOTFS_VERSION: v0.19.0 TEST_VERSION: v0.29.0 CARTESI_TESTS_PATH: /usr/share/cartesi-machine/tests CARTESI_IMAGES_PATH: /usr/share/cartesi-machine/images diff --git a/Dockerfile b/Dockerfile index 3b493bf81..4bf4b6788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,6 @@ RUN luarocks install --lua-version=5.4 luasocket && \ luarocks install --lua-version=5.4 luasec && \ luarocks install --lua-version=5.4 luaposix && \ luarocks install --lua-version=5.4 lpeg && \ - luarocks install --lua-version=5.4 md5 && \ luarocks install --lua-version=5.4 dkjson && \ luarocks install --lua-version=5.4 luacheck && \ cargo install stylua@0.18.1 --features lua54 diff --git a/README.md b/README.md index 2739b4b3b..1f3d683a3 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ sudo luarocks install --lua-version=5.4 dkjson sudo luarocks install --lua-version=5.4 luasocket sudo luarocks install --lua-version=5.4 luasec sudo luarocks install --lua-version=5.4 luaposix -sudo luarocks install --lua-version=5.4 md5 ``` #### MacOS @@ -58,7 +57,6 @@ sudo luarocks install --lua-version=5.4 dkjson sudo luarocks install --lua-version=5.4 luasocket sudo luarocks install --lua-version=5.4 luasec sudo luarocks install --lua-version=5.4 luaposix -sudo luarocks install --lua-version=5.4 md5 ``` ##### Homebrew @@ -69,7 +67,6 @@ luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install dkjson luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install luasocket luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install luasec luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install luaposix -luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install md5 ``` For emulator scripts to work it is expected that `lua5.4` binary is available in the system PATH. If operating system/package manager that you are using provides only `lua` or lua binary named in a different way (e.g. on `Homebrew`), please create symbolic link or alias `lua5.4`. diff --git a/lib/grpc-interfaces b/lib/grpc-interfaces index 4ec6e6620..de85ec68a 160000 --- a/lib/grpc-interfaces +++ b/lib/grpc-interfaces @@ -1 +1 @@ -Subproject commit 4ec6e6620abce44048b9a8493124683ef15e0731 +Subproject commit de85ec68a10fded1da7dfa215351603764ad3f76 diff --git a/src/cartesi-machine-tests.lua b/src/cartesi-machine-tests.lua index d8192ddd3..4afc7bff2 100755 --- a/src/cartesi-machine-tests.lua +++ b/src/cartesi-machine-tests.lua @@ -668,7 +668,7 @@ local function print_machine(test_name, expected_cycles) "./cartesi-machine.lua \ --ram-length=32Mi\ --ram-image='%s'\ - --no-dtb-bootargs\ + --no-bootargs\ --max-mcycle=%d ", test_path .. "/" .. test_name, 2 * expected_cycles @@ -679,7 +679,7 @@ local function print_machine(test_name, expected_cycles) "./cartesi-machine.lua \ --ram-length=32Mi\ --ram-image='%s'\ - --no-dtb-bootargs\ + --no-bootargs\ --uarch-ram-length=%d\ --uarch-ram-image=%s\ --max-mcycle=%d ", diff --git a/src/cartesi-machine.lua b/src/cartesi-machine.lua index d07840464..cccba4f40 100755 --- a/src/cartesi-machine.lua +++ b/src/cartesi-machine.lua @@ -78,10 +78,10 @@ where options are: --dtb-image= name of file containing DTB image (default: auto generated flattened device tree). - --no-dtb-bootargs + --no-bootargs clear default bootargs. - --append-dtb-bootargs= + --append-bootargs= append to bootargs. --no-root-flash-drive @@ -89,7 +89,7 @@ where options are: --flash-drive=:[,:[,...]...] defines a new flash drive, or modify an existing flash drive definition - flash drives appear as /dev/mtdblock[1-7]. + flash drives appear as /dev/pmem[0-7]. : is one of label: