feat: bump emulator, rootfs and tools

Author: edubart

alpine/Makefile

@@ -97,12 +97,12 @@ test-packages:
 	@$(MAKE) --no-print-directory exec COMMAND="\
 	apk add $(PACKAGES) && \
 	rollup --help && \
-	cartesi-machine"
+	cartesi-machine --final-hash"
 else
 test-packages: ## Test built packages for given TARGET_ARCH
 	@$(MAKE) --no-print-directory exec COMMAND="\
 	apk add $(PACKAGES) && \
-	cartesi-machine"
+	cartesi-machine --final-hash"
 endif
 
 distclean: ## Remove everything from APK repository directory

alpine/cartesi-machine-emulator/APKBUILD

@@ -2,18 +2,18 @@
 pkgname=cartesi-machine-emulator
 pkgver=0.19.0
 pkgrel=1
-_pkgver=$pkgver-test1
+_pkgver=$pkgver-test4
 pkgdesc="Cartesi Machine emulator for RISC-V Linux systems"
 url="https://github.com/cartesi/machine-emulator"
 arch="all"
 license="LGPL-3.0"
 depends="libslirp lua5.4"
-makedepends="build-base boost-dev libslirp-dev lua5.4-dev"
+makedepends="build-base boost-dev libslirp-dev lua5.4-dev patchelf"
 options="!check"
 source="machine-emulator-$_pkgver.tar.gz::https://github.com/cartesi/machine-emulator/archive/refs/tags/v$_pkgver.tar.gz
 add-generated-files.diff::https://github.com/cartesi/machine-emulator/releases/download/v$_pkgver/add-generated-files.diff"
-sha256sums="93121d1c7edf5ebc8d5b8b042d3b18a4cf2454c702ec2cfe8c92086d7529e16d  machine-emulator-$_pkgver.tar.gz
-162d62ec8b66801f1ad421774050ea1d6c5cc4c7dcc8f5615956853d6baed87f  add-generated-files.diff"
+sha256sums="5a8d19cbcde81f182c8a8eb4487236e406ec4a23014897c7f59421c3e90e5515  machine-emulator-$_pkgver.tar.gz
+a892e2d9f5c331f5e80bcb5db4133e7db625aa4d14ffdf9467b75c4c34d1744f  add-generated-files.diff"
 subpackages="$pkgname-dev:package_dev cartesi-machine:package_meta"
 
 _builddir="$srcdir/machine-emulator-$_pkgver"
@@ -33,6 +33,8 @@ package() {
     cd "$_builddir"
     make install-shared-libs install-lua-libs install-bins install-lua-bins install-shared-files \
         PREFIX=/usr DESTDIR="$pkgdir"
+
+    patchelf --set-rpath '/usr/lib/lua/5.4' "$pkgdir/usr/lib/lua/5.4/cartesi/jsonrpc.so"
 }
 
 package_dev() {

alpine/cartesi-machine-guest-tools/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Eduardo Bart <[email protected]>
 pkgname=cartesi-machine-guest-tools
 pkgver=0.17.0
-_pkgver=$pkgver-test2
+_pkgver=$pkgver
 pkgrel=1
 pkgdesc="Cartesi Machine guest tools"
 url="https://github.com/cartesi/machine-guest-tools"
@@ -11,7 +11,7 @@ depends="busybox"
 makedepends="build-base cartesi-machine-guest-linux-headers cargo clang-libclang"
 options="!check"
 source="machine-guest-tools-$_pkgver.tar.gz::https://github.com/cartesi/machine-guest-tools/archive/refs/tags/v$_pkgver.tar.gz"
-sha256sums="82e600f1610a03d0660af849a54b0ff7db6f88172203f77a54f3bfd5241f3b8b  machine-guest-tools-$_pkgver.tar.gz"
+sha256sums="fa883ca4de66ccf082ddbc0a873c0a5a87105e235b5ca6d54dac1a8838384c45  machine-guest-tools-$_pkgver.tar.gz"
 subpackages="cartesi-machine-guest-libcmt:package_libcmt cartesi-machine-guest-libcmt-dev:package_libcmt_dev"
 install="$pkgname.pre-install"
 _builddir="$srcdir/machine-guest-tools-$_pkgver"

alpine/cartesi-machine-rootfs-image/APKBUILD

@@ -1,15 +1,15 @@
 # Maintainer: Eduardo Bart <[email protected]>
 pkgname=cartesi-machine-rootfs-image
-pkgver=0.17.0
-_pkgver=$pkgver-test2
+pkgver=0.20.0
+_pkgver=$pkgver-test1
 pkgrel=1
 pkgdesc="Cartesi Machine guest root filesystem image"
 url="https://github.com/cartesi/machine-guest-tools"
 arch="noarch"
 license="GPL-2.0"
 options="!check"
-source="rootfs.ext2::https://github.com/cartesi/machine-guest-tools/releases/download/v$_pkgver/rootfs-tools-v$_pkgver.ext2"
-sha256sums="293f377b0cb32cc477ef2c71be9430bab3a25d54eb0ab9aff07a4e6fac6aa829  rootfs.ext2"
+source="rootfs.ext2::https://github.com/cartesi/machine-rootfs-image/releases/download/v${_pkgver}/rootfs-ubuntu.ext2"
+sha256sums="a38dbf39bdadc644bb31f1fc427be037b3082c9007afe1d9f2220b20d2789271  rootfs.ext2"
 
 package() {
     cd "$srcdir"

debian/Makefile

@@ -112,12 +112,12 @@ test-packages:
 	@$(MAKE) --no-print-directory exec COMMAND="\
 	apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) $(PACKAGES_RISCV64) && \
 	rollup --help && \
-	cartesi-machine"
+	cartesi-machine --final-hash"
 else
 test-packages: ## Test built packages for given TARGET_ARCH
 	@$(MAKE) --no-print-directory exec COMMAND="\
 	apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) && \
-	cartesi-machine"
+	cartesi-machine --final-hash"
 endif
 
 distclean: ## Remove everything from APT repository directory

debian/cartesi-machine-emulator/DEBBUILD

@@ -2,11 +2,11 @@
 pkgname=cartesi-machine-emulator
 pkgver=0.19.0
 pkgrel=1
-_pkgver=${pkgver}-test1
+_pkgver=${pkgver}-test4
 sources=("${pkgname}_${pkgver}.orig.tar.gz::https://github.com/cartesi/machine-emulator/archive/refs/tags/v${_pkgver}.tar.gz"
          "debian/patches/add-generated-files.diff::https://github.com/cartesi/machine-emulator/releases/download/v${_pkgver}/add-generated-files.diff")
-sha256sums=("93121d1c7edf5ebc8d5b8b042d3b18a4cf2454c702ec2cfe8c92086d7529e16d  ${pkgname}_${pkgver}.orig.tar.gz"
-            "162d62ec8b66801f1ad421774050ea1d6c5cc4c7dcc8f5615956853d6baed87f  debian/patches/add-generated-files.diff")
+sha256sums=("5a8d19cbcde81f182c8a8eb4487236e406ec4a23014897c7f59421c3e90e5515  ${pkgname}_${pkgver}.orig.tar.gz"
+            "a892e2d9f5c331f5e80bcb5db4133e7db625aa4d14ffdf9467b75c4c34d1744f  debian/patches/add-generated-files.diff")
 arch=any
 
 prepare() {

debian/cartesi-machine-guest-tools/DEBBUILD

@@ -1,10 +1,10 @@
 #!/bin/bash
 pkgname=cartesi-machine-guest-tools
 pkgver=0.17.0
-_pkgver=$pkgver-test2
+_pkgver=$pkgver
 pkgrel=1
 sources=("${pkgname}_${pkgver}.orig.tar.gz::https://github.com/cartesi/machine-guest-tools/archive/refs/tags/v$_pkgver.tar.gz")
-sha256sums=("82e600f1610a03d0660af849a54b0ff7db6f88172203f77a54f3bfd5241f3b8b  ${pkgname}_${pkgver}.orig.tar.gz")
+sha256sums=("fa883ca4de66ccf082ddbc0a873c0a5a87105e235b5ca6d54dac1a8838384c45  ${pkgname}_${pkgver}.orig.tar.gz")
 arch=riscv64
 
 prepare() {

debian/cartesi-machine-rootfs-image/DEBBUILD

@@ -1,10 +1,10 @@
 #!/bin/bash
 pkgname=cartesi-machine-rootfs-image
-pkgver=0.17.0
+pkgver=0.20.0
 pkgrel=1
-_pkgver=${pkgver}-test2
-sources=("rootfs.ext2::https://github.com/cartesi/machine-guest-tools/releases/download/v${_pkgver}/rootfs-tools-v${_pkgver}.ext2")
-sha256sums="293f377b0cb32cc477ef2c71be9430bab3a25d54eb0ab9aff07a4e6fac6aa829 rootfs.ext2"
+_pkgver=${pkgver}-test1
+sources=("rootfs.ext2::https://github.com/cartesi/machine-rootfs-image/releases/download/v${_pkgver}/rootfs-ubuntu.ext2")
+sha256sums="a38dbf39bdadc644bb31f1fc427be037b3082c9007afe1d9f2220b20d2789271 rootfs.ext2"
 arch=all
 
 prepare() {