manifest: Make ArduinoCore-API a downloadable blob

Make the license-incompatible headers and implementations
a downloadable blob using `west blobs fetch`.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>

Author: soburi

.github/workflows/build.yml

@@ -50,6 +50,10 @@ jobs:
           west-project-filter: ${{ env.HAL_FILTER }}
           enable-ccache: false
 
+      - name: Fetch blobs
+        run: |
+          west blobs --auto-accept fetch arduinocore-zephyr
+
       - name: Add manifest path as module
         run: |
           echo EXTRA_ZEPHYR_MODULES="$(pwd)/$MODULE_PATH" >> $GITHUB_ENV

.github/workflows/format_check.yml

@@ -32,7 +32,6 @@ jobs:
             loader/**/*.{c,cpp,h,hpp}
             libraries/**/*.{c,cpp,h,hpp}
           files_ignore: |
-            cores/arduino/api/**
             loader/llext_exports.c
             loader/blobs/4343WA1_*.c
             loader/blobs/wifi_nvram_image.h

.github/workflows/package_core.yml

@@ -80,7 +80,7 @@ jobs:
           # Archive the build environment for later jobs
           (cd && tar cphf - .cmake work zephyr-sdk-* | zstd > build-env.tar.zstd)
           # The API is only needed for packaging, not for building, so it's separate
-          tar cphf - cores/arduino/api | zstd > arduino-api.tar.zstd
+          tar cphf - zephyr/blobs/ArduinoCore-API/api | zstd > arduino-api.tar.zstd
 
       - name: Archive build environment
         uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -1,20 +1,31 @@
 # SPDX-License-Identifier: Apache-2.0
 
-string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
-
-if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
-  set(variant_dir variants/${BOARD})
-elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${NORMALIZED_BOARD_TARGET})
-  set(variant_dir variants/${NORMALIZED_BOARD_TARGET})
-else()
 if (CONFIG_ARDUINO_API)
-  message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${NORMALIZED_BOARD_TARGET}")
-endif()
-endif()
+  string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
 
-if (CONFIG_ARDUINO_API AND NOT CONFIG_LLEXT)
-add_subdirectory(cores)
-add_subdirectory(libraries)
-zephyr_include_directories(${variant_dir})
-endif()
+  if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
+    set(variant_dir variants/${BOARD})
+  elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${NORMALIZED_BOARD_TARGET})
+    set(variant_dir variants/${NORMALIZED_BOARD_TARGET})
+  else()
+    message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${NORMALIZED_BOARD_TARGET}")
+  endif()
 
+  if (NOT CONFIG_LLEXT)
+    add_subdirectory(cores)
+    add_subdirectory(libraries)
+    zephyr_include_directories(${variant_dir})
+  endif()
+
+  zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/)
+  if(NOT DEFINED ARDUINO_BUILD_PATH)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/CanMsg.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/CanMsgRingbuffer.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/Common.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/IPAddress.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/Print.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/Stream.cpp)
+    zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/zephyr/blobs/ArduinoCore-API/api/String.cpp)
+  endif()
+
+endif()

cores/CMakeLists.txt

@@ -1,15 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(arduino)
-
-zephyr_include_directories(../../ArduinoCore-API/)
-
-if(NOT DEFINED ARDUINO_BUILD_PATH)
-zephyr_sources(../../ArduinoCore-API/api/CanMsg.cpp)
-zephyr_sources(../../ArduinoCore-API/api/CanMsgRingbuffer.cpp)
-zephyr_sources(../../ArduinoCore-API/api/Common.cpp)
-zephyr_sources(../../ArduinoCore-API/api/IPAddress.cpp)
-zephyr_sources(../../ArduinoCore-API/api/Print.cpp)
-zephyr_sources(../../ArduinoCore-API/api/Stream.cpp)
-zephyr_sources(../../ArduinoCore-API/api/String.cpp)
-endif()
+add_subdirectory(arduino)

extra/artifacts/_common.inc

@@ -16,3 +16,4 @@ doc/
 cores/
 libraries/
 variants/_ldscripts/
+zephyr/blobs/ArduinoCore-API/api/

extra/bootstrap.sh

@@ -43,6 +43,6 @@ log_msg "group" "Installing Zephyr SDK 0.16.8"
 west sdk install --version 0.16.8 -t arm-zephyr-eabi
 log_msg "endgroup"
 
-log_msg "group" "Fetching blobs for: $NEEDED_HALS"
-west blobs fetch $NEEDED_HALS
+log_msg "group" "Fetching blobs for: $NEEDED_HALS arduinocore-zephyr"
+west blobs --auto-accept fetch $NEEDED_HALS arduinocore-zephyr
 log_msg "endgroup"

extra/package_core.sh

@@ -115,6 +115,7 @@ done
 
 mkdir -p $(dirname ${OUTPUT_FILE})
 tar -cjhf ${OUTPUT_FILE} -X ${TEMP_EXC} -T ${TEMP_INC} \
+	--transform "s,zephyr/blobs/ArduinoCore-API,cores/arduino," \
 	--transform "s,${TEMP_BOARDS},boards.txt," \
 	--transform "s,${TEMP_PLATFORM},platform.txt," \
 	--transform "s,^,ArduinoCore-zephyr/,"