Skip to content

Commit

Permalink
feat!: Add Linux with output unification
Browse files Browse the repository at this point in the history
  • Loading branch information
mpolitzer committed Jan 11, 2024
1 parent 167b334 commit 0618249
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
[email protected]:cartesi/linux.git $(LINUX_DIR) || \
cd $(LINUX_DIR) && git pull
git clone --depth 1 --branch $(OPENSBI_BRANCH) \
Expand Down
2 changes: 1 addition & 1 deletion shasumfile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0618249

Please sign in to comment.