bump Golioth SDK to tip of main

This comes with new Zephyr (v4.3.0) and NCS (v3.1.1) versions.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>

Author: mniestroj

lib/cert.c

@@ -75,18 +75,52 @@ void pouch_gateway_device_cert_abort(struct pouch_gateway_device_cert_context *c
     free(context);
 }
 
+struct device_cert_set_ctx
+{
+    struct k_sem sem;
+    enum golioth_status status;
+};
+
+static void device_cert_set_callback(struct golioth_client *client,
+                                     enum golioth_status status,
+                                     const struct golioth_coap_rsp_code *coap_rsp_code,
+                                     const char *path,
+                                     void *arg)
+{
+    struct device_cert_set_ctx *ctx = arg;
+
+    ctx->status = status;
+    k_sem_give(&ctx->sem);
+}
+
 int pouch_gateway_device_cert_finish(struct pouch_gateway_device_cert_context *context)
 {
+    struct device_cert_set_ctx ctx = {};
     enum golioth_status status;
 
+    k_sem_init(&ctx.sem, 0, 1);
+
     if (IS_ENABLED(CONFIG_POUCH_GATEWAY_CLOUD))
     {
-        status = golioth_gateway_device_cert_set(_client, context->buf, context->len, 5);
+        status = golioth_gateway_device_cert_set(_client,
+                                                 context->buf,
+                                                 context->len,
+                                                 device_cert_set_callback,
+                                                 &ctx,
+                                                 5);
         if (status != GOLIOTH_OK)
         {
             LOG_ERR("Failed to finish device cert: %d", status);
             return -EIO;
         }
+
+        k_sem_take(&ctx.sem, K_FOREVER);
+
+        if (ctx.status != GOLIOTH_OK)
+        {
+            LOG_ERR("Failed to set cert: %d", ctx.status);
+            return -EIO;
+        }
     }
 
     pouch_gateway_device_cert_abort(context);

scripts/runners/__init__.py

@@ -1,3 +1,7 @@
-from .bsim_device import BsimDeviceBinaryRunner
-from .bsim_phy import BsimPhyBinaryRunner
-from .bsim_zephyr import BsimZephyrBinaryRunner
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(__file__))
+from bsim_device import BsimDeviceBinaryRunner
+from bsim_phy import BsimPhyBinaryRunner
+from bsim_zephyr import BsimZephyrBinaryRunner

scripts/runners/bsim_device.py

@@ -6,7 +6,7 @@
 
 from pathlib import Path
 
-from .bsim_base import BsimBinaryRunnerBase
+from bsim_base import BsimBinaryRunnerBase
 
 class BsimDeviceBinaryRunner(BsimBinaryRunnerBase):
     """Runs the BabbleSim arbitrary application."""

scripts/runners/bsim_phy.py

@@ -6,7 +6,7 @@
 
 from pathlib import Path
 
-from .bsim_base import BsimBinaryRunnerBase
+from bsim_base import BsimBinaryRunnerBase
 
 class BsimPhyBinaryRunner(BsimBinaryRunnerBase):
     """Runs the BabbleSim 2G4 Phy binary."""

scripts/runners/bsim_zephyr.py

@@ -4,7 +4,7 @@
 """This file provides a ZephyrBinaryRunner that enables
 flashing (running) a BabbleSim Zephyr application."""
 
-from .bsim_base import BsimBinaryRunnerBase
+from bsim_base import BsimBinaryRunnerBase
 
 class BsimZephyrBinaryRunner(BsimBinaryRunnerBase):
     """Runs the BabbleSim Zephyr application."""

west-ncs.yml

@@ -4,7 +4,7 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: 60f0e8ab323b6a812fd68759817bc1e27f3258e5
+      revision: b1747a974e4fea00bc9d706ea9c9909efcdb0c8b
       url: https://github.com/golioth/golioth-firmware-sdk.git
       import:
         file: west-ncs.yml

west-zephyr.yml

@@ -4,7 +4,7 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: 60f0e8ab323b6a812fd68759817bc1e27f3258e5
+      revision: b1747a974e4fea00bc9d706ea9c9909efcdb0c8b
       url: https://github.com/golioth/golioth-firmware-sdk.git
       import:
         file: west-zephyr.yml

zephyr/patches.yml

@@ -1,46 +1,46 @@
 patches:
   - path: zephyr/zephyr/0001-drivers-net-nsos-support-nrf_bsim.patch
-    sha256sum: 25ce052740bb44d2d575a7f3187817cf1f22aa41c6328982f0f1b3c4f8ad7593
+    sha256sum: 76ee96ad695aba17be8a96d8fe908eec937238fbd9e21be09b8ad9a524b8b90b
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-01-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0002-boards-nrf_bsim-define-NSOS_IRQ-for-offloaded-socket.patch
-    sha256sum: 13916913dc7f11cd4d5d3ef875da739818e90fac8847f2ce244f3f6705c03149
+    sha256sum: 7841eab516807fdff2bfbdf5a263c3a4c6b3573ce2a7d7df7522a21749aef32a
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-01-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0003-nsi-move-nsos_fcntl-to-more-generic-nsi_fcntl.patch
-    sha256sum: 0830899d226a3b7cd1f7b002b8cd746857a41f2a19ee899bfc5cf15773f296c5
+    sha256sum: 88930ff7892bdb51d01a9416306eb972bec92c08e6bd4f96611450664bdfc3ae
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-05
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0004-nsi-fcntl-add-O_CREAT-and-O_TRUNC.patch
-    sha256sum: dd53fd69065fa432a38a53176778a529ec7cf89b5823c42fd7fa1fcedfb1fd23
+    sha256sum: 2839473d364cb08110ed0b825bd5099541540739c186dae7bdaf8d975c78132b
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0005-subsys-fs-nsim_mount-new-FS-for-mounting-host-filesy.patch
-    sha256sum: 7380f056216807ca15d220233e38b3b407c0b1fb825e5b4794ae6c926b13e4f0
+    sha256sum: 38a053f49ab2c109347bfde5a1c4d0c163ff2e5859adc1c50a52b04976733229
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0006-tests-fs-nsim_mount-add-basic-tests-for-implemented-.patch
-    sha256sum: 5117af152443b7d703e7c8b0fafa76a1d3cf34e5077b1587fbe09583129bbaad
+    sha256sum: 1a1973a8682684cbe241c873d4f381b9df52bbba47e82a927e71b3cdce58b2e1
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev

zephyr/patches/zephyr/zephyr/0001-drivers-net-nsos-support-nrf_bsim.patch

@@ -1,4 +1,4 @@
-From 073a10f50ff7275970471af29f27b6ba5c4b17b5 Mon Sep 17 00:00:00 2001
+From 8d013089772fd106241a90255c5b12ed40d1fddd Mon Sep 17 00:00:00 2001
 From: Marcin Niestroj <m.niestroj@emb.dev>
 Date: Tue, 14 Jan 2025 16:53:03 +0100
 Subject: [PATCH] drivers: net: nsos: support nrf_bsim
@@ -14,7 +14,7 @@ Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/nsos_adapt.c b/drivers/net/nsos_adapt.c
-index d1631efc651..9e908982e38 100644
+index 377649cdd1f..5e2976e49f0 100644
 --- a/drivers/net/nsos_adapt.c
 +++ b/drivers/net/nsos_adapt.c
 @@ -1164,7 +1164,11 @@ static void nsos_adapt_poll_triggered(void)
@@ -30,5 +30,5 @@ index d1631efc651..9e908982e38 100644
  	} else {
  		nsos_adapt_poll_time = nsi_hws_get_time() + NSOS_EPOLL_WAIT_INTERVAL;
 -- 
-2.51.0
+2.52.0
 

zephyr/patches/zephyr/zephyr/0002-boards-nrf_bsim-define-NSOS_IRQ-for-offloaded-socket.patch

@@ -1,4 +1,4 @@
-From dacb35a6427d1f177bada3e10cea8162af5c0757 Mon Sep 17 00:00:00 2001
+From 3d2a38e73f028b1c1333331e9250f280efbb8e10 Mon Sep 17 00:00:00 2001
 From: Marcin Niestroj <m.niestroj@emb.dev>
 Date: Tue, 14 Jan 2025 17:02:25 +0100
 Subject: [PATCH] boards: nrf_bsim: define NSOS_IRQ for offloaded sockets
@@ -18,7 +18,7 @@ Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/boards/native/nrf_bsim/board_soc.h b/boards/native/nrf_bsim/board_soc.h
-index e0b1cb60a59..a99916ec2cf 100644
+index ee77478caab..609038feee1 100644
 --- a/boards/native/nrf_bsim/board_soc.h
 +++ b/boards/native/nrf_bsim/board_soc.h
 @@ -19,6 +19,7 @@
@@ -52,5 +52,5 @@ index e0b1cb60a59..a99916ec2cf 100644
  #define FLASH_PAGE_MAX_CNT		256UL
 
 -- 
-2.51.0
+2.52.0