diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b70c7d6..d92116d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,15 +14,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.5.tar.gz - echo "ea648aa2a149c732aa07cd44218cdf63e881cfdfbb7e5cad3ecc6963661e31e2 v1.5.5.tar.gz" | sha256sum -c - - tar -xzf v1.5.5.tar.gz - cd genext2fs-1.5.5 + wget https://github.com/cartesi/genext2fs/releases/download/v1.5.6/xgenext2fs_amd64.deb + echo "996e4e68a638b5dc5967d3410f92ecb8d2f41e32218bbe0f8b4c4474d7eebc59 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.5 v1.5.5.tar.gz + rm -rf genext2fs-1.5.6 v1.5.6.tar.gz - name: Login to GHCR uses: docker/login-action@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e1a493..5e9607b 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.15.0] - 2024-04-19 ### Added diff --git a/Makefile b/Makefile index 3e66862..7ba5ada 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 $(TOOLS_LIBCMT) libcmt: @docker buildx build --load \ 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