From e76fb76857f2e943c10fe825102593a94dbb4a44 Mon Sep 17 00:00:00 2001
From: assaf <445552+asssaf@users.noreply.github.com>
Date: Wed, 5 Aug 2026 19:27:45 -0700
Subject: [PATCH 1/2] set KERNEL for run script in test job

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7c817f..746f333 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -280,7 +280,7 @@ jobs:
           docker create --name rpi-kernel --platform linux/arm64/v8 ghcr.io/asssaf/rpi-kernel:${{ env.KERNEL_VERSION }}-default true
           docker cp rpi-kernel:/Image-${{ env.KERNEL_VERSION }} .
 
-          CPU="cortex-a72" SMP="2" MEM="1G" scripts/run-tc.sh |& tee qemu.out &
+          KERNEL="./Image-${{ env.KERNEL_VERSION }}" CPU="cortex-a72" SMP="2" MEM="1G" scripts/run-tc.sh |& tee qemu.out &
 
           until sshpass -p piCore ssh -o StrictHostKeychecking=no -p 2223 tc@127.0.0.1 echo hi
           do

From 616c7f5e1da0bee2a8b8aeb735345f4e45b31ca5 Mon Sep 17 00:00:00 2001
From: assaf <445552+asssaf@users.noreply.github.com>
Date: Wed, 5 Aug 2026 19:03:27 -0700
Subject: [PATCH 2/2] piCore 17.0

---
 .github/workflows/main.yml | 12 ++++++------
 docker/Dockerfile          |  2 +-
 scripts/build.sh           |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 746f333..f19232f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,14 +9,14 @@ on:
   workflow_dispatch:
 
 env:
-  KERNEL_VERSION: 6.18.28
+  KERNEL_VERSION: 6.18.39
   PICORE_VERSION_MAJOR: 17
   PICORE_VERSION_MINOR: 0
-  PICORE_VERSION_MICRO: 0
-  PICORE_VERSION_RC: "-beta1"
-  PICORE_SUFFIX: "zip"
+  PICORE_VERSION_MICRO: ""
+  PICORE_VERSION_RC: ""
+  PICORE_SUFFIX: "img.gz"
   ROOTFS_SUFFIX: "zst"
-  KERNEL: 6.18.28-piCore-v8
+  KERNEL: 6.18.37-piCore-v8
 
 jobs:
   build:
@@ -277,7 +277,7 @@ jobs:
         run: |
           set -euxo pipefail
 
-          docker create --name rpi-kernel --platform linux/arm64/v8 ghcr.io/asssaf/rpi-kernel:${{ env.KERNEL_VERSION }}-default true
+          docker create --name rpi-kernel --platform linux/arm64/v8 ghcr.io/asssaf/rpi-kernel:${{ env.KERNEL_VERSION }}-rpi true
           docker cp rpi-kernel:/Image-${{ env.KERNEL_VERSION }} .
 
           KERNEL="./Image-${{ env.KERNEL_VERSION }}" CPU="cortex-a72" SMP="2" MEM="1G" scripts/run-tc.sh |& tee qemu.out &
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 299c850..ee7077d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ ARG _7Z="7zz"
 
 ENV ARCH="${PACKAGE/*piCore64*/aarch64}"
 ENV ARCH="${ARCH/*piCore*/armhf}"
-ENV PACKAGE_VERSION="${PACKAGE}-${PICORE_VERSION_MAJOR}.${PICORE_VERSION_MINOR}.${PICORE_VERSION_MICRO}${PICORE_VERSION_RC}"
+ENV PACKAGE_VERSION="${PACKAGE}-${PICORE_VERSION_MAJOR}.${PICORE_VERSION_MINOR}${PACKAGE_VERSION_MICRO:+.${PICORE_VERSION_MICRO}}${PICORE_VERSION_RC}"
 
 RUN curl -sLo "/${PACKAGE_VERSION}.${PICORE_SUFFIX}" "http://tinycorelinux.net/${PICORE_VERSION_MAJOR}.x/${ARCH}/release${PICORE_VERSION_RC:+_candidates}/RPi/${PACKAGE_VERSION}.${PICORE_SUFFIX}"
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 267ad7d..24c81f4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -5,15 +5,15 @@ set -eux
 : ${PACKAGE:=piCore64}
 : ${PICORE_VERSION_MAJOR:=17}
 : ${PICORE_VERSION_MINOR:=0}
-: ${PICORE_VERSION_MICRO:=0}
-: ${PICORE_VERSION_RC:=-beta1}
-: ${PICORE_SUFFIX:=zip}
+: ${PICORE_VERSION_MICRO:=}
+: ${PICORE_VERSION_RC:=}
+: ${PICORE_SUFFIX:=img.gz}
 : ${ROOTFS_SUFFIX:=zst}
 : ${PLATFORM:=linux/arm64/v8}
 : ${TARGET:=install}
 : ${IMAGE:=asssaf/picore}
 : ${TCEMIRROR:=}
-: ${KERNEL=6.18.28-piCore-v8}
+: ${KERNEL=6.18.37-piCore-v8}
 
 if [ "$(uname -m)" = "x86_64" ]
 then