Update kernel to v5.15.63-ctsi-1-rc1

cartesi · Nov 16, 2022 · 7a73b3b · 7a73b3b
1 parent 565c6e5
commit 7a73b3b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3,102 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-6
+  KERNEL_VERSION: 5.15.63-ctsi-1
   RISCV_PK_VERSION: 1.0.0-ctsi-1
   TOOLCHAIN_VERSION: 0.11.0
 jobs:

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@
 TAG ?= devel
 TOOLCHAIN_DOCKER_REPOSITORY ?= cartesi/toolchain
 TOOLCHAIN_TAG ?= 0.11.0
-KERNEL_VERSION ?= 5.5.19-ctsi-6
+KERNEL_VERSION ?= 5.15.63-ctsi-1
 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
@@ -105,13 +105,13 @@ depclean: clean
 	rm -f \
 		$(KERNEL_SRCPATH) $(RISCV_PK_SRCPATH)
 
-dep:
-	mkdir dep
+checksum: $(KERNEL_SRCPATH) $(RISCV_PK_SRCPATH)
+	shasum -ca 256 shasumfile
 
+$(KERNEL_SRCPATH): URL=https://github.com/cartesi/linux/archive/v${KERNEL_VERSION}.tar.gz
 $(KERNEL_SRCPATH): dep
-	wget -O $@ https://github.com/cartesi/linux/archive/v${KERNEL_VERSION}.tar.gz
-	echo "c665a5eb0ac12ad457fc7cab74cb98570f0ce158942baad8923d4d3e36beda5b  $@" | shasum -ca 256 || exit 1
+	T=`mktemp` && wget "$(URL)" -O $$T && mv $$T $@ || rm $$T
 
+$(RISCV_PK_SRCPATH): URL=https://github.com/cartesi/riscv-pk/archive/v${RISCV_PK_VERSION}.tar.gz
 $(RISCV_PK_SRCPATH): dep
-	wget -O $@ https://github.com/cartesi/riscv-pk/archive/v${RISCV_PK_VERSION}.tar.gz
-	echo "9a873345b9914940e7bf03a167da823910c8a2acadd818b780ffbd1a3edcc4c5  $@" | shasum -ca 256 || exit 1
+	T=`mktemp` && wget "$(URL)" -O $$T && mv $$T $@ || rm $$T
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-6
+KERNEL_VERSION      ?= $(shell make -sC $(LINUX_DIR) kernelversion)
 HEADERS             := artifacts/linux-headers-$(KERNEL_VERSION).tar.xz
 IMAGE               := artifacts/linux-nobbl-$(KERNEL_VERSION).bin
 LINUX               := artifacts/linux-$(KERNEL_VERSION).bin
@@ -57,7 +57,7 @@ $(SELFTEST):
 	genext2fs -i 4096 -b 1024 -UPd $(LINUX_TEST_DIR)/kselftest_install $@
 
 clean:
-	$(MAKE) $(LINUX_ARGS) clean
+	$(MAKE) -rC $(LINUX_DIR) $(LINUX_OPTS) clean
 	$(MAKE) $(JOBS) -rC $(RISCV_PK_BUILD_DIR) clean
 
 run-selftest: