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

New init system #140

Merged
merged 7 commits into from
Oct 25, 2023
Merged

New init system #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5118040
refactor: remove lua md5 dependency by using keccak instead
edubart Oct 5, 2023
24b75cb
feat: replace MTD drives with PMEM drives
edubart Oct 5, 2023
525f04d
feat!: introduce machine init and entrypoint config and options
edubart Oct 5, 2023
958765a
refactor!: adjust bootargs and rename bootargs command line option
edubart Oct 7, 2023
eee575d
feat: introduce -it option for colored and bigger interactive terminal
edubart Oct 7, 2023
86cddbe
fix: reserve memory for firmware M-mode code in FDT
edubart Oct 8, 2023
08ca12d
ci: bump kernel and rootfs version
edubart Oct 13, 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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] --features lua54
Expand Down
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -69,7 +67,6 @@ luarocks --lua-dir=$(brew --prefix)/opt/[email protected] install dkjson
luarocks --lua-dir=$(brew --prefix)/opt/[email protected] install luasocket
luarocks --lua-dir=$(brew --prefix)/opt/[email protected] install luasec
luarocks --lua-dir=$(brew --prefix)/opt/[email protected] install luaposix
luarocks --lua-dir=$(brew --prefix)/opt/[email protected] 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`.
Expand Down
2 changes: 1 addition & 1 deletion lib/grpc-interfaces
Open in desktop
Submodule grpc-interfaces updated 1 files
+2 −0 cartesi-machine.proto
4 changes: 2 additions & 2 deletions src/cartesi-machine-tests.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ",
Expand Down
Loading