Merge pull request #20840 from mguetschow/riotbuild-bump

makefiles/docker.inc.mk: bump riotbuild docker image to last available

makefiles/docker.inc.mk

@@ -1,8 +1,8 @@
 # This *MUST* be updated in lock-step with the riotbuild image in
 # https://github.com/RIOT-OS/riotdocker. The idea is that when checking out
 # a random RIOT merge commit, `make BUILD_IN_DOCKER=1` should always succeed.
-DOCKER_TESTED_IMAGE_ID := f5951bc41dfface6cac869181d703e62cbdd3b7976b0946130a38f2e658000b3
-DOCKER_TESTED_IMAGE_REPO_DIGEST := 75dec511ba26424987a26bdee5ac2f94d5f4928d79b627d1620b9d2391aab3e1
+DOCKER_TESTED_IMAGE_ID := bbd6bc053ac3eafb173a475e0439376db91b9a88f4b504e1bfa4e0d432204e63
+DOCKER_TESTED_IMAGE_REPO_DIGEST := 52ee7ae8ec4f9b8852aac15cf349d748484cd4d0732b6e030eddf4fff854e799
 
 DOCKER_PULL_IDENTIFIER := docker.io/riot/riotbuild@sha256:$(DOCKER_TESTED_IMAGE_REPO_DIGEST)
 DOCKER_IMAGE_DEFAULT := sha256:$(DOCKER_TESTED_IMAGE_ID)

pkg/emlearn/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME=emlearn
 PKG_URL=https://github.com/emlearn/emlearn
-# 0.12
-PKG_VERSION=d8cffb6cdd5619eb26d01287f07a530128958b60
+# 0.17.1
+PKG_VERSION=7a21d49b13fb82d57b4768c1ac821825809bf4b1
 PKG_LICENSE=MIT
 
 include $(RIOTBASE)/pkg/pkg.mk

pkg/emlearn/patches/0001-emlearn-eml_common.h-remove-redundant-check.patch

@@ -0,0 +1,25 @@
+From d35146dc1cf3c766f3d9bc6c8e83ef438047fb42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mikolai=20G=C3=BCtschow?= <[email protected]>
+Date: Thu, 29 Aug 2024 11:00:07 +0200
+Subject: [PATCH] emlearn/eml_common.h: remove redundant check
+
+---
+ emlearn/eml_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/emlearn/eml_common.h b/emlearn/eml_common.h
+index e4d2adf..1f8a599 100644
+--- a/emlearn/eml_common.h
++++ b/emlearn/eml_common.h
+@@ -37,7 +37,7 @@ eml_error_strs[EmlErrors] = {
+
+ bool
+ eml_error_valid(EmlError e) {
+-    return (e >= EmlOk && e < EmlErrors);
++    return (e < EmlErrors);
+ }
+
+ /**
+-- 
+2.39.2
+