From 1973533fd45d30876923667031c3f9d0c069dfa1 Mon Sep 17 00:00:00 2001
From: Jauhersaeed <jauhersaeed@gmail.com>
Date: Tue, 1 Apr 2025 07:13:30 +0500
Subject: [PATCH 1/4] excluding windows api from portmacro.h and adding it to
 port.c to avoid yeild() defined as macro in freertos-addons

---
 portable/MSVC-MingW/port.c      | 11 +++++++++++
 portable/MSVC-MingW/portmacro.h |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/portable/MSVC-MingW/port.c b/portable/MSVC-MingW/port.c
index 0a0fba6a3..0cbe2a4d8 100644
--- a/portable/MSVC-MingW/port.c
+++ b/portable/MSVC-MingW/port.c
@@ -33,6 +33,17 @@
 #include "FreeRTOS.h"
 #include "task.h"
 
+#ifdef WIN32_LEAN_AND_MEAN
+    #include <winsock2.h>
+#else
+    #include <winsock.h>
+#endif
+
+#include <windows.h>
+#include <timeapi.h>
+#include <mmsystem.h>
+#include <winbase.h>
+
 #ifdef __GNUC__
     #include "mmsystem.h"
 #else
diff --git a/portable/MSVC-MingW/portmacro.h b/portable/MSVC-MingW/portmacro.h
index 48a8bf4b0..4a824b5ae 100644
--- a/portable/MSVC-MingW/portmacro.h
+++ b/portable/MSVC-MingW/portmacro.h
@@ -29,16 +29,7 @@
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
-#ifdef WIN32_LEAN_AND_MEAN
-    #include <winsock2.h>
-#else
-    #include <winsock.h>
-#endif
 
-#include <windows.h>
-#include <timeapi.h>
-#include <mmsystem.h>
-#include <winbase.h>
 
 /******************************************************************************
 *   Defines

From b8d21ede7cbf80bf13696b363c7daaf06981b875 Mon Sep 17 00:00:00 2001
From: usman-pak1991 <usman.pak@outlook.com>
Date: Fri, 13 Jun 2025 12:42:24 +0500
Subject: [PATCH 2/4] event_group.c visibilty converted to public from private.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5323ec19b..018e10b5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,7 @@ add_library(freertos_kernel STATIC)
 add_subdirectory(include)
 add_subdirectory(portable)
 
-target_sources(freertos_kernel PRIVATE
+target_sources(freertos_kernel PUBLIC
     croutine.c
     event_groups.c
     list.c

From 48a4939c9f86aee414042962a1776dd99a09348f Mon Sep 17 00:00:00 2001
From: Florian La Roche <florian.laroche@gmail.com>
Date: Wed, 9 Jul 2025 07:46:00 +0200
Subject: [PATCH 3/4] Fix compiler warning (#1291)

- In list.h fix a typo in comments.
- In portable/ThirdParty/GCC/Posix/port.c fix compiler warning about
  "gcc -Wwrite-strings".

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
---
 include/list.h                       | 2 +-
 portable/ThirdParty/GCC/Posix/port.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/list.h b/include/list.h
index b64450c72..b6e0d34f4 100644
--- a/include/list.h
+++ b/include/list.h
@@ -44,7 +44,7 @@
  *
  * In addition to it's value, each list item contains a pointer to the next
  * item in the list (pxNext), a pointer to the list it is in (pxContainer)
- * and a pointer to back to the object that contains it.  These later two
+ * and a pointer back to the object that contains it.  These later two
  * pointers are included for efficiency of list manipulation.  There is
  * effectively a two way link between the object containing the list item and
  * the list item itself.
diff --git a/portable/ThirdParty/GCC/Posix/port.c b/portable/ThirdParty/GCC/Posix/port.c
index b5a4a1b62..d0b81dc1e 100644
--- a/portable/ThirdParty/GCC/Posix/port.c
+++ b/portable/ThirdParty/GCC/Posix/port.c
@@ -193,7 +193,7 @@ void prvFatalError( const char * pcCall,
 }
 /*-----------------------------------------------------------*/
 
-static void prvPortSetCurrentThreadName( char * pxThreadName )
+static void prvPortSetCurrentThreadName( const char * pxThreadName )
 {
     #ifdef __APPLE__
         pthread_setname_np( pxThreadName );

From f5e6151b1433227ca0afe2e1ec6cca6b31b7014c Mon Sep 17 00:00:00 2001
From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:53:13 -0700
Subject: [PATCH 4/4] Update artifact path in the backup action (#1292)

* Add artifact backup action

* Fix artifact path
---
 .github/workflows/auto-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 19f6c0167..2cd6fde6e 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -124,7 +124,7 @@ jobs:
         with:
           # This is dependent on the release script putting this zip file
           # in this exact location.
-          artifact_path: ./tools/.github/scripts/FreeRTOS-KernelV${{ github.event.inputs.version_number }}.zip
+          artifact_path: ./FreeRTOS-KernelV${{ github.event.inputs.version_number }}.zip
           release_tag: ${{ github.event.inputs.version_number }}
 
       - name: Cleanup