From 715567b61f26ebbaf06e69ec0b98bd71d86b3360 Mon Sep 17 00:00:00 2001 From: Marcelo Politzer <251334+mpolitzer@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:29:31 -0300 Subject: [PATCH] feat!: output unification test1 --- .github/workflows/build.yml | 2 +- Makefile | 4 ++-- configs/ct-ng-config | 2 +- configs/ct-ng-config-rv64ima-lp64 | 2 +- shasumfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9de56ac..46993f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Docker on: [push] env: - KERNEL_VERSION: 6.5.9-ctsi-1 + KERNEL_VERSION: output-unification-test1 jobs: build: runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index 6ffd371..a6a3713 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ TOOLCHAIN_SUFFIX ?= TOOLCHAIN_TAG ?= devel$(TOOLCHAIN_SUFFIX) TOOLCHAIN_CONFIG ?= configs/ct-ng-config$(TOOLCHAIN_SUFFIX) CONTAINER_BASE := /opt/cartesi/toolchain$(TOOLCHAIN_SUFFIX) -KERNEL_VERSION ?= 6.5.9-ctsi-1 +KERNEL_VERSION ?= output-unification-test1 KERNEL_SRCPATH := linux-$(KERNEL_VERSION).tar.gz BUILD_ARGS = --build-arg TOOLCHAIN_CONFIG=$(TOOLCHAIN_CONFIG) \ @@ -50,7 +50,7 @@ run-as-root: # fetch the public cartesi linux sources if none was provided $(KERNEL_SRCPATH): - @wget -O $@ https://github.com/cartesi/linux/archive/v$(KERNEL_VERSION).tar.gz + @wget -O $@ https://github.com/cartesi/linux/archive/$(KERNEL_VERSION).tar.gz shasumfile: $(KERNEL_SRCPATH) @shasum -a 256 $^ > $@ diff --git a/configs/ct-ng-config b/configs/ct-ng-config index d961054..a9da885 100644 --- a/configs/ct-ng-config +++ b/configs/ct-ng-config @@ -263,7 +263,7 @@ CT_LINUX_PKG_NAME="linux" # CT_LINUX_SRC_RELEASE is not set # CT_LINUX_SRC_DEVEL is not set CT_LINUX_SRC_CUSTOM=y -CT_LINUX_CUSTOM_LOCATION="/tmp/build/linux-6.5.9-ctsi-1.tar.gz" +CT_LINUX_CUSTOM_LOCATION="/tmp/build/linux-output-unification-test1.tar.gz" CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_BUNDLED is not set # CT_LINUX_PATCH_LOCAL is not set diff --git a/configs/ct-ng-config-rv64ima-lp64 b/configs/ct-ng-config-rv64ima-lp64 index c5e4fa1..0ddf0a0 100644 --- a/configs/ct-ng-config-rv64ima-lp64 +++ b/configs/ct-ng-config-rv64ima-lp64 @@ -263,7 +263,7 @@ CT_LINUX_PKG_NAME="linux" # CT_LINUX_SRC_RELEASE is not set # CT_LINUX_SRC_DEVEL is not set CT_LINUX_SRC_CUSTOM=y -CT_LINUX_CUSTOM_LOCATION="/tmp/build/linux-6.5.9-ctsi-1.tar.gz" +CT_LINUX_CUSTOM_LOCATION="/tmp/build/linux-output-unification-test1.tar.gz" CT_LINUX_PATCH_GLOBAL=y # CT_LINUX_PATCH_BUNDLED is not set # CT_LINUX_PATCH_LOCAL is not set diff --git a/shasumfile b/shasumfile index 410f06a..e9c3012 100644 --- a/shasumfile +++ b/shasumfile @@ -1 +1 @@ -bfc4d196b90592a2a6bef83ead9e196da6ab6d5978b48ee5e8ccf02913355bc2 linux-6.5.9-ctsi-1.tar.gz +6d6174f9a432bd8aa5bd84c193761e0782a2d06d41d554e0ab4c07d734cbf8d0 linux-output-unification-test1.tar.gz