From 061824945dc9fbfef00cc16f7fb944c370a56fe4 Mon Sep 17 00:00:00 2001
From: Marcelo Politzer <251334+mpolitzer@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:18:19 -0300
Subject: [PATCH] feat!: Add Linux with output unification

---
 Makefile   | 10 +++++-----
 build.mk   |  4 ++--
 shasumfile |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 191a556..1ed67f3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@
 .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-rc1
 IMAGE_KERNEL_VERSION?= $(MAJOR).$(MINOR).$(PATCH)$(LABEL)
 
 UNAME:=$(shell uname)
@@ -30,7 +30,7 @@ TOOLCHAIN_TAG ?= 0.16.0
 
 DEP_DIR := dep
 
-KERNEL_VERSION ?= 6.5.9-ctsi-1
+KERNEL_VERSION ?= 6.5.9-ctsi-y
 KERNEL_SRCPATH := $(DEP_DIR)/linux-${KERNEL_VERSION}.tar.gz
 
 OPENSBI_VERSION ?= 1.3.1-ctsi-1
@@ -120,7 +120,7 @@ $(DEP_DIR):
 	mkdir dep
 
 $(KERNEL_SRCPATH): | $(DEP_DIR)
-	wget -O $@ https://github.com/cartesi/linux/archive/refs/tags/v$(KERNEL_VERSION).tar.gz
+	wget -O $@ https://github.com/cartesi/linux/archive/refs/heads/linux-$(KERNEL_VERSION).tar.gz
 
 $(OPENSBI_SRCPATH): | $(DEP_DIR)
 	wget -O $@ https://github.com/cartesi/opensbi/archive/refs/tags/v$(OPENSBI_VERSION).tar.gz
diff --git a/build.mk b/build.mk
index 7a2b3f1..726b598 100644
--- a/build.mk
+++ b/build.mk
@@ -104,10 +104,10 @@ run-selftest:
 
 # clone (for non CI environment)
 # ------------------------------------------------------------------------------
-clone: LINUX_BRANCH ?= linux-6.5.9-ctsi-y
+clone: LINUX_BRANCH ?= feature/rollup-rework
 clone: OPENSBI_BRANCH ?= opensbi-1.3.1-ctsi-y
 clone:
-	git clone --depth 1 --branch $(LINUX_BRANCH) \
+	git clone --branch $(LINUX_BRANCH) \
 		git@github.com:cartesi/linux.git $(LINUX_DIR) || \
 		cd $(LINUX_DIR) && git pull
 	git clone --depth 1 --branch $(OPENSBI_BRANCH) \
diff --git a/shasumfile b/shasumfile
index c879197..a743627 100644
--- a/shasumfile
+++ b/shasumfile
@@ -1,2 +1,2 @@
-bfc4d196b90592a2a6bef83ead9e196da6ab6d5978b48ee5e8ccf02913355bc2  dep/linux-6.5.9-ctsi-1.tar.gz
+e6f40a008501ee0e372cfd4475d43c7804abb366d003bee90795ee84927415a6  dep/linux-6.5.9-ctsi-y.tar.gz
 267da33a34a023d9dcff3e7d9a8d58e7caefaff65441e38ff0114e4683dff176  dep/opensbi-1.3.1-ctsi-1.tar.gz