From 55ac15314ad30044a178b4b37e63bf8e4e054201 Mon Sep 17 00:00:00 2001 From: Marcelo Politzer <251334+mpolitzer@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:45:36 -0300 Subject: [PATCH] feat!: Bump kernel to v6.5.9-ctsi-2 --- CHANGELOG.md | 9 +++++++-- Makefile | 13 ++++++------- build.mk | 2 +- shasumfile | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30f8a69..44d69a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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] +## [0.20.0] - 2024-03-19 +### Changed +- Updated Linux Kernel to v6.5.13-ctsi-1 +- Updated OpenSBI to v1.3.1-ctsi-2 ## [0.19.1] - 2023-12-05 ### Fix @@ -109,8 +113,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [0.2.0] - [0.1.0] -[Unreleased]: https://github.com/cartesi/image-kernel/compare/v0.19.1...HEAD -[0.19.1]: https://github.com/cartesi/image-kernel/compare/v0.19.1 +[Unreleased]: https://github.com/cartesi/image-kernel/compare/v0.20.0...HEAD +[0.20.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.20.0 +[0.19.1]: https://github.com/cartesi/image-kernel/releases/tag/v0.19.1 [0.19.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.19.0 [0.18.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.18.0 [0.17.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.17.0 diff --git a/Makefile b/Makefile index b4c3ca2..a6cdbe2 100644 --- a/Makefile +++ b/Makefile @@ -17,20 +17,20 @@ .PHONY: all build download push run pull share copy clean checksum MAJOR := 0 -MINOR := 19 -PATCH := 1 -LABEL := +MINOR := 20 +PATCH := 0 +LABEL := -output-unification-test1 IMAGE_KERNEL_VERSION?= $(MAJOR).$(MINOR).$(PATCH)$(LABEL) UNAME:=$(shell uname) TAG ?= devel TOOLCHAIN_REPOSITORY ?= cartesi/toolchain -TOOLCHAIN_TAG ?= 0.16.0 +TOOLCHAIN_TAG ?= 0.17.0-output-unification-test1 DEP_DIR := dep -KERNEL_VERSION ?= 6.5.9-ctsi-1 +KERNEL_VERSION ?= 6.5.13-ctsi-1-output-unification-test1 KERNEL_SRCPATH := $(DEP_DIR)/linux-${KERNEL_VERSION}.tar.gz OPENSBI_VERSION ?= 1.3.1-ctsi-2 @@ -129,8 +129,7 @@ clean: @rm -rf ./artifacts distclean depclean: clean - @rm -f \ - $(KERNEL_SRCPATH) $(OPENSBI_SRCPATH) + @rm -f $(KERNEL_SRCPATH) $(OPENSBI_SRCPATH) checksum: $(KERNEL_SRCPATH) $(OPENSBI_SRCPATH) shasum -ca 256 shasumfile diff --git a/build.mk b/build.mk index 7a2b3f1..b9f5326 100644 --- a/build.mk +++ b/build.mk @@ -104,7 +104,7 @@ run-selftest: # clone (for non CI environment) # ------------------------------------------------------------------------------ -clone: LINUX_BRANCH ?= linux-6.5.9-ctsi-y +clone: LINUX_BRANCH ?= linux-6.5.13-ctsi-y clone: OPENSBI_BRANCH ?= opensbi-1.3.1-ctsi-y clone: git clone --depth 1 --branch $(LINUX_BRANCH) \ diff --git a/shasumfile b/shasumfile index 592a48d..dc394b6 100644 --- a/shasumfile +++ b/shasumfile @@ -1,2 +1,2 @@ -bfc4d196b90592a2a6bef83ead9e196da6ab6d5978b48ee5e8ccf02913355bc2 dep/linux-6.5.9-ctsi-1.tar.gz +db2be853d3986f8fa84d0d4a3cc8f3433b0b7772f4459a6efd439698e4b8dcde dep/linux-6.5.13-ctsi-1-output-unification-test1.tar.gz 35082380131117aa8424d1b81ca9e6e0280baa9bffbcf3f46080a652e4cb4385 dep/opensbi-1.3.1-ctsi-2.tar.gz