treewide: Update after removal of CONFIG_NET_SOCKETS_POSIX_NAMES

anangl · rlubos · commit 5b2e801942e4 · 2025-02-12T17:27:07.000+01:00
This deprecated option was finally removed. See Zephyr PR 82398.
Remove references to it and, where needed, replace it with POSIX_API.

Signed-off-by: Andrzej Głąbek &lt;andrzej.glabek@nordicsemi.no&gt;
diff --git a/doc/zephyr/zephyr.doxyfile.in b/doc/zephyr/zephyr.doxyfile.in
@@ -2448,7 +2448,6 @@ PREDEFINED             = __DOXYGEN__ \
                          CONFIG_NET_L2_IEEE802154_MGMT \
                          CONFIG_NET_L2_IEEE802154_SECURITY \
                          CONFIG_NET_MGMT_EVENT \
-                         CONFIG_NET_SOCKETS_POSIX_NAMES \
                          CONFIG_NET_TCP \
                          CONFIG_NET_UDP \
                          CONFIG_SCHED_CPU_MASK \
diff --git a/ext/curl/Kconfig b/ext/curl/Kconfig
@@ -10,7 +10,7 @@ config NRF_CURL_PROMPTLESS
 
 config NRF_CURL
 	bool "Curl" if !NRF_CURL_PROMPTLESS
-	depends on POSIX_API && !PTHREAD_IPC && !NET_SOCKETS_POSIX_NAMES && NEWLIB_LIBC
+	depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC
 	imply NEWLIB_LIBC_FLOAT_PRINTF
 	help
 	  Curl support for NRF.
diff --git a/ext/iperf3/Kconfig b/ext/iperf3/Kconfig
@@ -12,7 +12,7 @@ config NRF_IPERF3_PROMPTLESS
 
 config  NRF_IPERF3
 	bool "Iperf3 NRF integration" if !NRF_IPERF3_PROMPTLESS
-	depends on POSIX_API && !PTHREAD_IPC && !NET_SOCKETS_POSIX_NAMES && NEWLIB_LIBC && CJSON_LIB
+	depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC && CJSON_LIB
 	help
 	  Enable Iperf3 NRF integration
 
diff --git a/lib/nrf_modem_lib/Kconfig b/lib/nrf_modem_lib/Kconfig
@@ -9,7 +9,6 @@ menuconfig NRF_MODEM_LIB
 	select EXPERIMENTAL if SOC_NRF9280_CPUAPP
 	select NRF_MODEM
 	imply NET_SOCKETS_OFFLOAD
-	imply NET_SOCKETS_POSIX_NAMES if !POSIX_API
 	# The modem must be turned on to achieve low power consumption.
 	# But disable it for ZTEST's as some tests have HW
 	# resource-conflicts with NRF_MODEM_LIB.
diff --git a/lib/nrf_modem_lib/sanity.c b/lib/nrf_modem_lib/sanity.c
@@ -161,19 +161,23 @@ BUILD_ASSERT(NRF_SPROTO_DTLS1v2 == IPPROTO_DTLS_1_2, "Socket value not aligned w
 BUILD_ASSERT(SOL_TLS == NRF_SOL_SECURE, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(SOL_SOCKET == NRF_SOL_SOCKET, "Socket value not aligned with modemlib.");
 
+#if defined(CONFIG_POSIX_API)
 BUILD_ASSERT(MSG_DONTWAIT == NRF_MSG_DONTWAIT, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(MSG_PEEK == NRF_MSG_PEEK, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(MSG_WAITALL == NRF_MSG_WAITALL, "Socket value not aligned with modemlib.");
+#endif
 
 BUILD_ASSERT(AI_CANONNAME == NRF_AI_CANONNAME, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(AI_NUMERICSERV == NRF_AI_NUMERICSERV, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(AI_PDNSERV == NRF_AI_PDNSERV, "Socket value not aligned with modemlib.");
 
+#if defined(CONFIG_POSIX_API)
 BUILD_ASSERT(POLLIN == NRF_POLLIN, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(POLLOUT == NRF_POLLOUT, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(POLLERR == NRF_POLLERR, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(POLLHUP == NRF_POLLHUP, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(POLLNVAL == NRF_POLLNVAL, "Socket value not aligned with modemlib.");
+#endif
 
 BUILD_ASSERT(DNS_EAI_ADDRFAMILY == NRF_EAI_ADDRFAMILY, "Socket value not aligned with modemlib.");
 BUILD_ASSERT(DNS_EAI_AGAIN == NRF_EAI_AGAIN, "Socket value not aligned with modemlib.");
diff --git a/samples/cellular/modem_shell/prj.conf b/samples/cellular/modem_shell/prj.conf
@@ -69,7 +69,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_NATIVE=n
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
-CONFIG_NET_SOCKETS_POSIX_NAMES=n
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 
diff --git a/samples/cellular/modem_shell/src/gnss/gnss_supl_support.c b/samples/cellular/modem_shell/src/gnss/gnss_supl_support.c
@@ -7,15 +7,11 @@
 #include <stdio.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#if !defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
 #include <zephyr/posix/unistd.h>
 #include <zephyr/posix/netdb.h>
 #include <zephyr/posix/sys/time.h>
 #include <zephyr/posix/sys/socket.h>
 #include <zephyr/posix/arpa/inet.h>
-#else
-#include <zephyr/net/socket.h>
-#endif
 #include <supl_session.h>
 
 #include "mosh_print.h"
diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml
@@ -224,19 +224,6 @@ tests:
       - ci_build
       - sysbuild
       - ci_samples_wifi
-  sample.nrf7002.shell.posix_names:
-    sysbuild: true
-    build_only: true
-    extra_args:
-      - CONFIG_POSIX_API=n
-      - CONIFG_NET_SOCKETS_POSIX_NAMES=y
-    integration_platforms:
-      - nrf7002dk/nrf5340/cpuapp
-    platform_allow: nrf7002dk/nrf5340/cpuapp
-    tags:
-      - ci_build
-      - sysbuild
-      - ci_samples_wifi
   sample.nrf7002_ns.shell:
     sysbuild: true
     build_only: true
diff --git a/subsys/net/lib/mqtt_helper/Kconfig b/subsys/net/lib/mqtt_helper/Kconfig
@@ -5,7 +5,6 @@
 
 menuconfig MQTT_HELPER
 	bool "MQTT helper library"
-	select NET_SOCKETS_POSIX_NAMES if !POSIX_API
 	select MQTT_LIB
 	help
 	  Convenience library that simplifies Zephyr MQTT API and socket handling.
diff --git a/tests/subsys/net/lib/downloader/CMakeLists.txt b/tests/subsys/net/lib/downloader/CMakeLists.txt
@@ -38,7 +38,7 @@ target_compile_options(app
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=256
   -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_DOWNLOADER_STACK_SIZE=2048
-  -DCONFIG_NET_SOCKETS_POSIX_NAMES=y
+  -DCONFIG_POSIX_API=y
   -DCONFIG_NET_IPV6=y
   -DCONFIG_NET_IPV4=y
   -DCONFIG_COAP_MAX_RETRANSMIT=2
diff --git a/tests/subsys/net/lib/mqtt_helper/CMakeLists.txt b/tests/subsys/net/lib/mqtt_helper/CMakeLists.txt
@@ -30,7 +30,7 @@ target_include_directories(app PRIVATE ${ZEPHYR_NRF_MODULE_DIR}/include/zephyr/n
 # Options that cannot be passed through Kconfig fragments.
 target_compile_options(app PRIVATE
         -DCONFIG_MQTT_LIB_TLS=1
-        -DCONFIG_NET_SOCKETS_POSIX_NAMES=1
+        -DCONFIG_POSIX_API=1
         -DCONFIG_MQTT_HELPER_HOSTNAME="test-some-hostname.com"
         -DCONFIG_MQTT_HELPER_STATIC_IP_ADDRESS=""
         -DCONFIG_MQTT_HELPER_PORT=8883
diff --git a/tests/subsys/net/lib/nrf_cloud/cloud/CMakeLists.txt b/tests/subsys/net/lib/nrf_cloud/cloud/CMakeLists.txt
@@ -52,8 +52,8 @@ if (CONFIG_NRF_CLOUD_MQTT OR CONFIG_NRF_CLOUD_FOTA OR CONFIG_NRF_MODEM_LIB)
 		)
 
 		# This code file has functions/structs/variables defined when
-		# NET_SOCKETS_POSIX_NAMES=y in zephyr/net/socket.h, so
-		# it needs to be excluded when NET_SOCKETS_POSIX_NAMES=n
+		# POSIX_API=y in zephyr/net/socket.h, so it needs to be excluded
+		# when POSIX_API=n
 		set_source_files_properties(
 			${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/downloader.c
 			DIRECTORY ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/
@@ -64,7 +64,7 @@ if (CONFIG_NRF_CLOUD_MQTT OR CONFIG_NRF_CLOUD_FOTA OR CONFIG_NRF_MODEM_LIB)
 
 	if (CONFIG_NRF_MODEM_LIB)
 
-		# Similarly, these files need to be excluded when NET_SOCKETS_POSIX_NAMES=n
+		# Similarly, these files need to be excluded when POSIX_API=n
 		set_source_files_properties(
 			${ZEPHYR_NRF_MODULE_DIR}/lib/nrf_modem_lib/sanity.c
 			${ZEPHYR_NRF_MODULE_DIR}/lib/nrf_modem_lib/nrf9x_sockets.c
diff --git a/tests/subsys/net/lib/nrf_cloud/cloud/prj.conf b/tests/subsys/net/lib/nrf_cloud/cloud/prj.conf
@@ -10,9 +10,8 @@ CONFIG_ZTEST=y
 # Network
 CONFIG_NETWORKING=y
 
-# Disable sockets and POSIX wrappers
+# Disable sockets
 CONFIG_NET_SOCKETS=n
-CONFIG_NET_SOCKETS_POSIX_NAMES=n
 
 # Dependencies
 CONFIG_NEWLIB_LIBC=y
diff --git a/tests/subsys/net/lib/nrf_cloud/fota_common/prj.conf b/tests/subsys/net/lib/nrf_cloud/fota_common/prj.conf
@@ -11,7 +11,7 @@ CONFIG_NRF_CLOUD_MQTT=y
 
 CONFIG_NETWORKING=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_POSIX_NAMES=y
+CONFIG_POSIX_API=y
 CONFIG_NRF_MODEM_LIB=y
 CONFIG_NRF_CLOUD_CONNECTION_POLL_THREAD=n
 CONFIG_FLASH=y
diff --git a/tests/subsys/net/lib/nrf_provisioning/CMakeLists.txt b/tests/subsys/net/lib/nrf_provisioning/CMakeLists.txt
@@ -42,7 +42,7 @@ elseif(CONFIG_NRF_PROVISIONING_COAP)
     -DCONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48
     -DCONFIG_COAP_CLIENT_MESSAGE_SIZE=512
     -DCONFIG_COAP_CLIENT_STACK_SIZE=1024
-    -DCONFIG_NET_SOCKETS_POSIX_NAMES=y
+    -DCONFIG_POSIX_API=y
     -DCONFIG_MODEM_INFO_BUFFER_SIZE=128
     -DCONFIG_COAP_CLIENT_MAX_REQUESTS=2
     -DCONFIG_COAP_CLIENT_BLOCK_SIZE=256
