refactor: remove image-toolchain dependency

Author: diegonehab

.github/workflows/main.yml

@@ -53,8 +53,6 @@ jobs:
           push: false
           load: true
           build-args: |
-            TOOLCHAIN_REPOSITORY=${{ env.TOOLCHAIN_REPOSITORY }}
-            TOOLCHAIN_VERSION=${{ env.TOOLCHAIN_VERSION }}
             KERNEL_VERSION=${{ env.KERNEL_VERSION }}
             KERNEL_TIMESTAMP=${{ env.KERNEL_TIMESTAMP }}
             IMAGE_KERNEL_VERSION=${{ env.IMAGE_KERNEL_VERSION }}
@@ -98,8 +96,6 @@ jobs:
           push: true
           load: false
           build-args: |
-            TOOLCHAIN_REPOSITORY=${{ env.TOOLCHAIN_REPOSITORY }}
-            TOOLCHAIN_VERSION=${{ env.TOOLCHAIN_VERSION }}
             KERNEL_VERSION=${{ env.KERNEL_VERSION }}
             KERNEL_TIMESTAMP=${{ env.KERNEL_TIMESTAMP }}
             IMAGE_KERNEL_VERSION=${{ env.IMAGE_KERNEL_VERSION }}

Dockerfile

@@ -14,23 +14,37 @@
 # limitations under the License.
 #
 
-ARG TOOLCHAIN_REPOSITORY=cartesi/toolchain
-ARG TOOLCHAIN_VERSION=latest
-FROM ${TOOLCHAIN_REPOSITORY}:${TOOLCHAIN_VERSION}
+FROM debian:trixie-20250811
 
 ARG KERNEL_VERSION=0.0.0-ctsi-y
 ARG KERNEL_TIMESTAMP="Thu, 01 Jan 1970 00:00:00 +0000"
 ARG OPENSBI_VERSION=0.0.0-ctsi-y
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ENV OLDPATH=$PATH
-
+ENV BASE=/opt/riscv
 ENV BUILD_BASE=$BASE/kernel
 
+# install cross-compiler and build dependencies
+# ------------------------------------------------------------------------------
+RUN apt-get update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get install --no-install-recommends -y \
+    bc \
+    bison \
+    build-essential \
+    flex \
+    gcc-14-riscv64-linux-gnu=14.2.0-19cross1 \
+    genext2fs \
+    libc6-dev-riscv64-cross=2.41-11cross1 \
+    rsync \
+    xz-utils \
+  && \
+  rm -rf /var/lib/apt/lists/*
+
 # setup dirs
 # ------------------------------------------------------------------------------
 RUN \
+  useradd developer && \
   mkdir -p ${BUILD_BASE}/artifacts && \
   chown -R developer:developer ${BUILD_BASE} && \
   chmod go+w ${BUILD_BASE}

Makefile

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-.PHONY: all build download push run pull share copy clean checksum
+.PHONY: all build download push pull copy clean checksum
 
 MAJOR := 0
 MINOR := 21
@@ -25,8 +25,6 @@ IMAGE_KERNEL_VERSION?= $(MAJOR).$(MINOR).$(PATCH)$(LABEL)
 UNAME:=$(shell uname)
 
 TAG ?= devel
-TOOLCHAIN_REPOSITORY ?= cartesi/toolchain
-TOOLCHAIN_TAG ?= 0.17.0
 
 DEP_DIR := dep
 
@@ -36,8 +34,6 @@ KERNEL_SRCPATH := $(DEP_DIR)/linux-${KERNEL_VERSION}.tar.gz
 OPENSBI_VERSION ?= 1.3.1-ctsi-2
 OPENSBI_SRCPATH := $(DEP_DIR)/opensbi-${OPENSBI_VERSION}.tar.gz
 
-CONTAINER_BASE := /opt/cartesi/kernel
-
 IMG ?= cartesi/linux-kernel:$(TAG)
 BASE:=/opt/riscv
 
@@ -53,14 +49,6 @@ ifneq ($(IMAGE_KERNEL_VERSION),)
 BUILD_ARGS += --build-arg IMAGE_KERNEL_VERSION=$(IMAGE_KERNEL_VERSION)
 endif
 
-ifneq ($(TOOLCHAIN_REPOSITORY),)
-BUILD_ARGS += --build-arg TOOLCHAIN_REPOSITORY=$(TOOLCHAIN_REPOSITORY)
-endif
-
-ifneq ($(TOOLCHAIN_TAG),)
-BUILD_ARGS += --build-arg TOOLCHAIN_VERSION=$(TOOLCHAIN_TAG)
-endif
-
 ifneq ($(KERNEL_VERSION),)
 BUILD_ARGS += --build-arg KERNEL_VERSION=$(KERNEL_VERSION)
 endif
@@ -85,28 +73,11 @@ push:
 pull:
 	docker pull $(IMG)
 
-run:
-	docker run --hostname toolchain-env -it --rm \
-		-e USER=$$(id -u -n) \
-		-e GROUP=$$(id -g -n) \
-		-e UID=$$(id -u) \
-		-e GID=$$(id -g) \
-		-v `pwd`:$(CONTAINER_BASE) \
-		-w $(CONTAINER_BASE) \
-		$(IMG) $(CONTAINER_COMMAND)
-
-run-as-root:
-	docker run --hostname toolchain-env -it --rm \
-		-v `pwd`:$(CONTAINER_BASE) \
-		$(IMG) $(CONTAINER_COMMAND)
-
 env:
 	@echo KERNEL_VERSION="$(KERNEL_VERSION)"
 	@echo KERNEL_TIMESTAMP="$(KERNEL_TIMESTAMP)"
 	@echo IMAGE_KERNEL_VERSION="$(IMAGE_KERNEL_VERSION)"
 	@echo OPENSBI_VERSION="$(OPENSBI_VERSION)"
-	@echo TOOLCHAIN_REPOSITORY="$(TOOLCHAIN_REPOSITORY)"
-	@echo TOOLCHAIN_VERSION="$(TOOLCHAIN_TAG)"
 	@make -srf build.mk \
 		KERNEL_VERSION=$(KERNEL_VERSION) \
 		KERNEL_TIMESTAMP="$(KERNEL_TIMESTAMP)" \

build.mk

@@ -1,4 +1,4 @@
-TOOLCHAIN_PREFIX    := riscv64-cartesi-linux-gnu
+TOOLCHAIN_PREFIX    := riscv64-linux-gnu
 
 OPENSBI_DIR        := work/opensbi
 OPENSBI_BUILD_DIR  := $(OPENSBI_DIR)/build
@@ -114,8 +114,4 @@ clone:
 		git@github.com:cartesi/opensbi.git $(OPENSBI_DIR) || \
 		cd $(OPENSBI_DIR) && git pull
 
-run: IMG=cartesi/toolchain:devel
-run:
-	$(MAKE) run IMG=$(IMG)
-
 .PHONY: $(OPENSBI_BUILD_DIR)/Makefile $(LINUX_DIR)/vmlinux $(ARTIFACTS)