diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e9607b..838340d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,15 +13,15 @@ jobs: # Building from source cause the provided debian package is for Debian Bookworm - name: Download, build and install xgenext2fs run: | - wget https://github.com/cartesi/genext2fs/archive/refs/tags/v1.5.3.tar.gz - echo "af62ec69916ffc15fa5921b19630c9935e69a0d8b1bf529d7f26cefdc23a5120 v1.5.3.tar.gz" | sha256sum -c - - tar -xzf v1.5.3.tar.gz - cd genext2fs-1.5.3 + wget https://github.com/cartesi/genext2fs/archive/refs/tags/v1.5.6.tar.gz + echo "34bfc26a037def23b85b676912462a3d126a87ef15c66c212b3500650da44f9e v1.5.6.tar.gz" | sha256sum -c - + tar -xzf v1.5.6.tar.gz + cd genext2fs-1.5.6 ./autogen.sh ./configure make sudo make install - rm -rf genext2fs-1.5.3 v1.5.3.tar.gz + rm -rf genext2fs-1.5.6 v1.5.6.tar.gz - name: Login to GHCR uses: docker/login-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5281775..1aa25c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ 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 xgenext2fs to v1.5.6 ## [0.14.1] - 2023-12-18 ### Fixed diff --git a/Dockerfile b/Dockerfile index 96fbc75..983d934 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,15 +65,15 @@ ENV PATH="/home/developer/.cargo/bin:${PATH}" USER developer RUN cd && \ - wget https://github.com/rust-lang/rustup/archive/refs/tags/1.26.0.tar.gz && \ - echo "6f20ff98f2f1dbde6886f8d133fe0d7aed24bc76c670ea1fca18eb33baadd808 1.26.0.tar.gz" | sha256sum --check && \ - tar -xzf 1.26.0.tar.gz && \ - bash rustup-1.26.0/rustup-init.sh \ + wget https://github.com/rust-lang/rustup/archive/refs/tags/1.27.0.tar.gz && \ + echo "3d331ab97d75b03a1cc2b36b2f26cd0a16d681b79677512603f2262991950ad1 1.27.0.tar.gz" | sha256sum --check && \ + tar -xzf 1.27.0.tar.gz && \ + bash rustup-1.27.0/rustup-init.sh \ -y \ - --default-toolchain 1.74.0 \ + --default-toolchain 1.77.2 \ --profile minimal \ --target riscv64gc-unknown-linux-gnu && \ - rm -rf rustup-1.26.0 1.26.0.tar.gz + rm -rf rustup-1.27.0 1.27.0.tar.gz FROM rust-env as rust-builder COPY --chown=developer:developer rollup-http/rollup-init ${BUILD_BASE}/tools/rollup-http/rollup-init diff --git a/Makefile b/Makefile index 7b1ea40..b600fac 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,8 @@ $(TOOLS_ROOTFS) fs: $(TOOLS_DEB) --output type=tar,dest=rootfs.tar \ --file fs/Dockerfile \ . && \ - bsdtar -cf rootfs.gnutar --format=gnutar @rootfs.tar && \ - xgenext2fs -fzB 4096 -b 25600 -i 4096 -a rootfs.gnutar -L rootfs $(TOOLS_ROOTFS) && \ - rm -f rootfs.gnutar rootfs.tar + xgenext2fs -fzB 4096 -b 25600 -i 4096 -a rootfs.tar -L rootfs $(TOOLS_ROOTFS) && \ + rm -f rootfs.tar env: @echo TOOLS_DEB=$(TOOLS_DEB) diff --git a/README.md b/README.md index f94d996..2e28e02 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ Users looking to create cartesi-machine applications can use the provided Debian - Docker >= 18.x - GNU Make >= 3.81 -- bsdtar >= 3.7.2 -- xgenext2fs >= 1.5.3 +- xgenext2fs >= 1.5.6 ### Docker buildx setup