Skip to content

Commit b471d57

Browse files
committed
refactor!: rename repository to machine-guest-tools
1 parent 37b1e25 commit b471d57

File tree

11 files changed

+42
-42
lines changed

11 files changed

+42
-42
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
machine-emulator-tools-*.ext2
1+
machine-guest-tools-*.ext2
22
rootfs*
33
.clang-format
44
.github

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*.ext2
2-
machine-emulator-tools-*.tar.gz
2+
machine-guest-tools-*.tar.gz
33
rootfs.*
44
package.json
55
*.bin

CHANGELOG.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -178,24 +178,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
178178
- [0.2.0]
179179
- [0.1.0]
180180

181-
[Unreleased]: https://github.com/cartesi/machine-emulator-tools/compare/v0.16.1...HEAD
182-
[0.16.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.16.1
183-
[0.16.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.16.0
184-
[0.15.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.15.0
185-
[0.14.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.14.1
186-
[0.14.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.14.0
187-
[0.13.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.13.0
188-
[0.12.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.12.0
189-
[0.11.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.11.0
190-
[0.10.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.10.0
191-
[0.9.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.9.0
192-
[0.8.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.8.0
193-
[0.7.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.7.0
194-
[0.6.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.6.0
195-
[0.5.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.5.1
196-
[0.5.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.5.0
197-
[0.4.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.4.1
198-
[0.4.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.4.0
199-
[0.3.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.3.0
200-
[0.2.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.2.0
201-
[0.1.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.1.0
181+
[Unreleased]: https://github.com/cartesi/machine-guest-tools/compare/v0.16.1...HEAD
182+
[0.16.1]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.16.1
183+
[0.16.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.16.0
184+
[0.15.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.15.0
185+
[0.14.1]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.14.1
186+
[0.14.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.14.0
187+
[0.13.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.13.0
188+
[0.12.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.12.0
189+
[0.11.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.11.0
190+
[0.10.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.10.0
191+
[0.9.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.9.0
192+
[0.8.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.8.0
193+
[0.7.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.7.0
194+
[0.6.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.6.0
195+
[0.5.1]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.5.1
196+
[0.5.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.5.0
197+
[0.4.1]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.4.1
198+
[0.4.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.4.0
199+
[0.3.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.3.0
200+
[0.2.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.2.0
201+
[0.1.0]: https://github.com/cartesi/machine-guest-tools/releases/tag/v0.1.0

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ RUN make -j$(nproc) libcmt
6262
RUN make -j$(nproc) sys-utils
6363
RUN make -j$(nproc) rollup-http
6464
RUN make install DESTDIR=$(pwd)/_install PREFIX=/usr
65-
ARG TOOLS_TARGZ=machine-emulator-tools.tar.gz
65+
ARG TOOLS_TARGZ=machine-guest-tools.tar.gz
6666
RUN cd _install && tar -czf /work/${TOOLS_TARGZ} *

Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ PATCH := 2
2020
LABEL := -test2
2121
VERSION := $(MAJOR).$(MINOR).$(PATCH)$(LABEL)
2222

23-
TOOLS_TARGZ := machine-emulator-tools-v$(VERSION).tar.gz
24-
TOOLS_IMAGE := cartesi/machine-emulator-tools:$(VERSION)
23+
TOOLS_TARGZ := machine-guest-tools-v$(VERSION).tar.gz
24+
TOOLS_IMAGE := cartesi/machine-guest-tools:$(VERSION)
2525
TOOLS_ROOTFS := rootfs-tools-v$(VERSION).ext2
2626
TOOLS_ROOTFS_IMAGE := cartesi/rootfs-tools:$(VERSION)
2727

28-
IMAGE_KERNEL_VERSION ?= v0.20.0
28+
LINUX_IMAGE_VERSION ?= v0.20.0
2929
LINUX_VERSION ?= 6.5.13-ctsi-1
30-
LINUX_HEADERS_URLPATH := https://github.com/cartesi/image-kernel/releases/download/${IMAGE_KERNEL_VERSION}/linux-libc-dev-riscv64-cross-${LINUX_VERSION}-${IMAGE_KERNEL_VERSION}.deb
30+
LINUX_HEADERS_URLPATH := https://github.com/cartesi/machine-linux-image/releases/download/${LINUX_IMAGE_VERSION}/linux-libc-dev-riscv64-cross-${LINUX_VERSION}-${LINUX_IMAGE_VERSION}.deb
3131
LINUX_HEADERS_SHA256 := 2723435e8b45d8fb7a79e9344f6dc517b3dbc08e03ac17baab311300ec475c08
3232

3333
PREFIX ?= /usr
@@ -88,7 +88,7 @@ env: ## Print useful Makefile information
8888
@echo TOOLS_ROOTFS=$(TOOLS_ROOTFS)
8989
@echo TOOLS_IMAGE=$(TOOLS_IMAGE)
9090
@echo TOOLS_ROOTFS_IMAGE=$(TOOLS_ROOTFS_IMAGE)
91-
@echo IMAGE_KERNEL_VERSION=$(IMAGE_KERNEL_VERSION)
91+
@echo LINUX_IMAGE_VERSION=$(LINUX_IMAGE_VERSION)
9292
@echo LINUX_VERSION=$(LINUX_VERSION)
9393
@echo LINUX_HEADERS_URLPATH=$(LINUX_HEADERS_URLPATH)
9494
@echo LINUX_HEADERS_SHA256=$(LINUX_HEADERS_SHA256)
@@ -117,8 +117,8 @@ shell: ## Spawn a cross compilation shell with tools Docker image
117117
-e UID=$$(id -u) \
118118
-e GID=$$(id -g) \
119119
-u $$(id -u):$$(id -g) \
120-
-v `pwd`:/work/machine-emulator-tools \
121-
-w /work/machine-emulator-tools \
120+
-v `pwd`:/work/machine-guest-tools \
121+
-w /work/machine-guest-tools \
122122
$(TOOLS_IMAGE)-tools-env /bin/bash
123123

124124
libcmt: ## Compile libcmt

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Cartesi Machine Emulator Tools
1+
# Cartesi Machine Guest Tools
22

3-
The Cartesi Machine Emulator Tools is a repository that contains a set of tools developed for the RISC-V Linux OS. It provides a RISC-V Debian package and a root filesystem for Ubuntu 24.04.
3+
The Cartesi Machine Guest Tools is a repository that contains a set of tools developed for the RISC-V Linux OS. It provides a RISC-V Debian package and a root filesystem for Ubuntu 24.04.
44

55
## Getting Started
66

@@ -37,7 +37,7 @@ In case you need to patch and develop tools, you can cross compile using Docker
3737
make build
3838
```
3939

40-
This creates the `machine-emulator-tools-$VERSION.tar.gz` archive and the `rootfs-tools-$VERSION.ext2` root filesystem artifacts.
40+
This creates the `machine-guest-tools-$VERSION.tar.gz` archive and the `rootfs-tools-$VERSION.ext2` root filesystem artifacts.
4141
Both should only be use for testing and development purposes, not directly in dapps.
4242

4343
#### Makefile targets
@@ -53,5 +53,5 @@ Please note we have a [Code of Conduct](CODE_OF_CONDUCT.md), please follow it in
5353

5454
## License
5555

56-
The machine-emulator-tools repository and all contributions are licensed under
56+
The machine-guest-tools repository and all contributions are licensed under
5757
[APACHE 2.0](https://www.apache.org/licenses/LICENSE-2.0). Please review our [LICENSE](LICENSE) file.

fs/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Final image
22
FROM --platform=linux/riscv64 ubuntu:24.04
3-
ARG TOOLS_TARGZ=machine-emulator-tools.tar.gz
3+
ARG TOOLS_TARGZ=machine-guest-tools.tar.gz
44
ADD ${TOOLS_TARGZ} /
55
RUN apt-get update && \
66
apt-get upgrade -y --no-install-recommends && \

package.json.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"name": "machine-emulator-tools",
2+
"name": "cartesi-machine-guest-tools",
33
"version": "ARG_VERSION"
44
}

rollup-http/echo-dapp/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ To install Rust follow the instructions [here](https://www.rust-lang.org/tools/i
1818
This DApp is built during the docker build process:
1919

2020
```shell
21-
$ cd machine-emulator-tools
21+
$ cd machine-guest-tools
2222
$ make
2323
```
2424

2525
## Execution
2626

27-
Utility script `rollup-init` is used to start simultaneously DApp application and Rollup HTTP server (available in `linux/utils` folder of the root `machine-emulator-tools` project).
27+
Utility script `rollup-init` is used to start simultaneously DApp application and Rollup HTTP server (available in `linux/utils` folder of the root `machine-guest-tools` project).
2828

2929
After build copy Dapp and http dispatcher application to the new directory. Create ext2 filesystem image from that directory.
3030

rollup-http/rollup-http-server/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ To install Rust follow the instructions [here](https://www.rust-lang.org/tools/i
1313
This service is built within the docker build step when building all other tools:
1414

1515
```shell
16-
cd machine-emulator-tools
16+
cd machine-guest-tools
1717
make
1818
```
1919

2020
### Build using the libcmt mock version (for development and tests)
2121
First build libcmt mock on host:
2222

2323
```shell
24-
cd machine-emulator-tools/sys-utils/libcmt/
24+
cd machine-guest-tools/sys-utils/libcmt/
2525
make host
2626
```
2727

sys-utils/libcmt/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ And finally, a couple of utility modules used by the high level API are also exp
1414
- @ref libcmt\_merkle is a sparse merkle tree implementation on top of keccak.
1515
- @ref libcmt\_keccak is the hashing function used extensively by Ethereum.
1616

17-
The header files and a compiled RISC-V version of this library can be found [here](https://github.com/cartesi/machine-emulator-tools/).
17+
The header files and a compiled RISC-V version of this library can be found [here](https://github.com/cartesi/machine-guest-tools/).
1818
We also provide `.pc` (pkg-config) files to facilitate linking.
1919

2020
# mock and testing

0 commit comments

Comments
 (0)