Update kernel to v5.5.19-ctsi-6

cartesi · Aug 25, 2022 · b9ea18e · b9ea18e
1 parent 48285e3
commit b9ea18e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: Build
 on: [push]
 env:
-  KERNEL_VERSION: 5.5.19-ctsi-5
+  KERNEL_VERSION: 5.5.19-ctsi-6
   RISCV_PK_VERSION: 1.0.0-ctsi-1
   TOOLCHAIN_VERSION: 0.10.0
 jobs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,11 @@ 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.13.0] - 2022-08-25
+### Changed
 - Added cache to docker build and push on CI
+- Updated Linux Kernel to v5.5.19-ctsi-6
 
 ## [0.12.0] - 2022-07-04
 ### Changed
@@ -44,7 +48,8 @@ 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.12.0...HEAD
+[Unreleased]: https://github.com/cartesi/image-kernel/compare/v0.13.0...HEAD
+[0.13.0]: https://github.com/cartesi/image-kernel/compare/v0.13.0...HEAD
 [0.12.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.12.0
 [0.11.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.11.0
 [0.10.0]: https://github.com/cartesi/image-kernel/releases/tag/v0.10.0

diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ FROM ${TOOLCHAIN_REPOSITORY}:${TOOLCHAIN_VERSION}
 
 LABEL maintainer="Diego Nehab <[email protected]>"
 
-ARG KERNEL_VERSION=5.5.19-ctsi-5
+ARG KERNEL_VERSION=5.5.19-ctsi-6
 ARG RISCV_PK_VERSION=1.0.0-ctsi-1
 
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 TAG ?= devel
 TOOLCHAIN_DOCKER_REPOSITORY ?= cartesi/toolchain
 TOOLCHAIN_TAG ?= 0.10.0
-KERNEL_VERSION ?= 5.5.19-ctsi-5
+KERNEL_VERSION ?= 5.5.19-ctsi-6
 KERNEL_SRCPATH := dep/linux-${KERNEL_VERSION}.tar.gz
 RISCV_PK_VERSION ?= 1.0.0-ctsi-1
 RISCV_PK_SRCPATH := dep/riscv-pk-${RISCV_PK_VERSION}.tar.gz
@@ -110,7 +110,7 @@ dep:
 
 $(KERNEL_SRCPATH): dep
 	wget -O $@ https://github.com/cartesi/linux/archive/v${KERNEL_VERSION}.tar.gz
-	echo "4266d1c3d56f79088d9328521bcdb5ad9c385cd9ea8f28457cc61658f43092f4  $@" | shasum -ca 256 || exit 1
+	echo "c665a5eb0ac12ad457fc7cab74cb98570f0ce158942baad8923d4d3e36beda5b  $@" | shasum -ca 256 || exit 1
 
 $(RISCV_PK_SRCPATH): dep
 	wget -O $@ https://github.com/cartesi/riscv-pk/archive/v${RISCV_PK_VERSION}.tar.gz

diff --git a/build.mk b/build.mk
@@ -8,7 +8,7 @@ LINUX_TEST_DIR      := $(LINUX_DIR)/tools/testing/selftests
 
 JOBS                := -j$(shell nproc)
 
-KERNEL_VERSION      ?= 5.5.19-ctsi-5
+KERNEL_VERSION      ?= 5.5.19-ctsi-6
 HEADERS             := artifacts/linux-headers-$(KERNEL_VERSION).tar.xz
 IMAGE               := artifacts/linux-nobbl-$(KERNEL_VERSION).bin
 LINUX               := artifacts/linux-$(KERNEL_VERSION).bin
@@ -81,7 +81,8 @@ clone:
 		[email protected]:cartesi-corp/riscv-pk.git $(RISCV_PK_DIR) || \
 		cd $(RISCV_PK_DIR) && git pull
 
+run: IMG=cartesi/toolchain:devel
 run:
-	$(MAKE) run IMG=cartesi/toolchain:devel
+	$(MAKE) run IMG=$(IMG)
 
 .PHONY: $(RISCV_PK_BUILD_DIR)/Makefile $(LINUX_DIR)/vmlinux $(ARTIFACTS)
diff --git a/configs/debug-linux-config b/configs/debug-linux-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 5.5.19-ctsi-5 Kernel Configuration
+# Linux/riscv 5.5.19-ctsi-6 Kernel Configuration
 #
 
 #
@@ -1154,7 +1154,6 @@ CONFIG_SIFIVE_PLIC=y
 #
 CONFIG_CARTESI_MACHINE=y
 CONFIG_CARTESI_YIELD_DRIVER=y
-CONFIG_CARTESI_DEHASH_DRIVER=y
 CONFIG_CARTESI_ROLLUP_DRIVER=y
 CONFIG_CARTESI_HALT_ON_PANIC=y
 # end of Cartesi Machine

diff --git a/configs/default-linux-config b/configs/default-linux-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 5.5.19-ctsi-5 Kernel Configuration
+# Linux/riscv 5.5.19-ctsi-6 Kernel Configuration
 #
 
 #
@@ -1136,7 +1136,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_CARTESI_MACHINE=y
 CONFIG_CARTESI_YIELD_DRIVER=y
-CONFIG_CARTESI_DEHASH_DRIVER=y
 CONFIG_CARTESI_ROLLUP_DRIVER=y
 CONFIG_CARTESI_HALT_ON_PANIC=y
 # end of Cartesi Machine

diff --git a/configs/lp64d-linux-config b/configs/lp64d-linux-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 5.5.19-ctsi-5 Kernel Configuration
+# Linux/riscv 5.5.19-ctsi-6 Kernel Configuration
 #
 
 #
@@ -1136,7 +1136,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_CARTESI_MACHINE=y
 CONFIG_CARTESI_YIELD_DRIVER=y
-CONFIG_CARTESI_DEHASH_DRIVER=y
 CONFIG_CARTESI_ROLLUP_DRIVER=y
 CONFIG_CARTESI_HALT_ON_PANIC=y
 # end of Cartesi Machine