RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #14906 from miri64/sock/cleanup/deps

Browse Source 
sock: cleanup dependencies
This commit is contained in:
benpicco 2020-09-09 12:01:28 +02:00 committed by GitHub
commit df913bf9bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.dep
View File

@ -143,18 +143,12 @@ ifneq (,$(filter gnrc_sock_%,$(USEMODULE)))
endif
ifneq (,$(filter gnrc_sock_async,$(USEMODULE)))
USEMODULE += sock_async
USEMODULE += gnrc_netapi_callbacks
endif
ifneq (,$(filter gnrc_sock_ip,$(USEMODULE)))
USEMODULE += sock_ip
endif
ifneq (,$(filter gnrc_sock_udp,$(USEMODULE)))
USEMODULE += gnrc_udp
USEMODULE += random # to generate random ports
USEMODULE += sock_udp
endif
ifneq (,$(filter gnrc_sock,$(USEMODULE)))
@ -557,17 +551,14 @@ endif
ifneq (,$(filter lwip_sock_ip,$(USEMODULE)))
USEMODULE += lwip_raw
USEMODULE += sock_ip
endif
ifneq (,$(filter lwip_sock_tcp,$(USEMODULE)))
USEMODULE += lwip_tcp
USEMODULE += sock_tcp
endif
ifneq (,$(filter lwip_sock_udp,$(USEMODULE)))
USEMODULE += lwip_udp
USEMODULE += sock_udp
endif
ifneq (,$(filter lwip_%,$(USEMODULE)))
@ -645,6 +636,12 @@ ifneq (,$(filter gnrc,$(USEMODULE)))
USEMODULE += gnrc_netif
USEMODULE += gnrc_netif_hdr
USEMODULE += gnrc_pktbuf
ifneq (,$(filter sock_async, $(USEMODULE)))
USEMODULE += gnrc_sock_async
endif
ifneq (,$(filter sock_ip, $(USEMODULE)))
USEMODULE += gnrc_sock_ip
endif
ifneq (,$(filter sock_udp, $(USEMODULE)))
USEMODULE += gnrc_sock_udp
endif
@ -848,6 +845,7 @@ ifneq (,$(filter sock_async_event,$(USEMODULE)))
endif
ifneq (,$(filter sock_dns,$(USEMODULE)))
USEMODULE += sock_udp
USEMODULE += sock_util
USEMODULE += posix_headers
endif
@ -855,7 +853,6 @@ endif
ifneq (,$(filter sock_util,$(USEMODULE)))
USEMODULE += posix_inet
USEMODULE += fmt
USEMODULE += sock_udp
endif
ifneq (,$(filter event_%,$(USEMODULE)))
@ -901,8 +898,9 @@ endif
ifneq (,$(filter gcoap,$(USEMODULE)))
USEMODULE += nanocoap
USEMODULE += gnrc_sock_async
USEMODULE += sock_async
USEMODULE += sock_async_event
USEMODULE += sock_udp
USEMODULE += sock_util
USEMODULE += event_callback
USEMODULE += event_timeout
@ -1021,7 +1019,6 @@ endif
ifneq (,$(filter tinydtls_sock_dtls, $(USEMODULE)))
USEPKG += tinydtls
USEMODULE += sock_dtls
endif
ifneq (,$(filter sock_dtls, $(USEMODULE)))

1
examples/asymcute_mqttsn/Makefile
View File

@ -12,7 +12,6 @@ RIOTBASE ?= $(CURDIR)/../..
USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_sock_udp
USEMODULE += gnrc_ipv6_default
# Include MQTT-SN
USEMODULE += asymcute

2
examples/dtls-echo/Makefile
View File

@ -13,7 +13,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Add also the shell, some shell commands
USEMODULE += shell

9
examples/dtls-sock/Makefile
View File

@ -16,10 +16,13 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_sock_udp
# Use tinydtls for sock_dtls
USEMODULE += tinydtls_sock_dtls
# Specify DTLS implementation
USEPKG += tinydtls
# Pull in sock APIs
USEMODULE += sock_dtls
USEMODULE += sock_udp
# tinydtls needs crypto secure PRNG
USEMODULE += prng_sha1prng

2
examples/dtls-wolfssl/Makefile
View File

@ -13,7 +13,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Add also the shell, some shell commands
USEMODULE += shell

3
examples/emcute_mqttsn/Makefile
View File

@ -11,8 +11,7 @@ RIOTBASE ?= $(CURDIR)/../..
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_sock_udp
# Specify the mandatory networking modules for IPv6
USEMODULE += gnrc_ipv6_default
# Include MQTT-SN
USEMODULE += emcute

3
examples/nanocoap_server/Makefile
View File

@ -13,8 +13,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo

9
examples/paho-mqtt/Makefile
View File

@ -41,7 +41,6 @@ ifneq (0,$(LWIP_IPV4))
USEMODULE += lwip_arp
USEMODULE += lwip_ipv4
USEMODULE += lwip_dhcp_auto
USEMODULE += lwip_sock_udp
CFLAGS += -DETHARP_SUPPORT_STATIC_ENTRIES=1
LWIP_IPV6 ?= 0
else
@ -54,11 +53,13 @@ ifneq (0,$(LWIP_IPV6))
endif
USEMODULE += lwip_netdev
USEMODULE += lwip lwip_sock_ip
USEMODULE += lwip_tcp lwip_sock_tcp
USEMODULE += lwip_sock_async
USEMODULE += lwip
USEMODULE += sock_async_event
USEMODULE += sock_ip
USEMODULE += sock_udp
USEMODULE += sock_tcp
####
include $(RIOTBASE)/Makefile.include

3
examples/posix_select/Makefile
View File

@ -14,8 +14,7 @@ USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for socket communication via UDP
USEMODULE += gnrc_ipv6_default
# Add stack-specific implementations of sock modules
USEMODULE += gnrc_sock_async
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Add POSIX modules
USEMODULE += posix_select
USEMODULE += posix_sockets

3
examples/posix_sockets/Makefile
View File

@ -13,8 +13,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for socket communication via UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEMODULE += posix_sockets
USEMODULE += posix_time
USEMODULE += posix_inet

3
examples/suit_update/Makefile
View File

@ -25,8 +25,7 @@ endif
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_router_default
USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo

2
examples/wakaama/Makefile
View File

@ -15,7 +15,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules
USEMODULE += gnrc_ipv6_router_default
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo
# Add also the shell, some shell commands

13
pkg/lwip/Makefile.dep
View File

@ -4,8 +4,17 @@ FEATURES_REQUIRED += arch_32bit
DEFAULT_MODULE += auto_init_lwip
ifneq (,$(filter lwip_sock_async,$(USEMODULE)))
USEMODULE += sock_async
ifneq (,$(filter sock_async,$(USEMODULE)))
USEMODULE += lwip_sock_async
endif
ifneq (,$(filter sock_ip,$(USEMODULE)))
USEMODULE += lwip_sock_ip
endif
ifneq (,$(filter sock_tcp,$(USEMODULE)))
USEMODULE += lwip_sock_tcp
endif
ifneq (,$(filter sock_udp,$(USEMODULE)))
USEMODULE += lwip_sock_udp
endif
ifneq (,$(filter stm32_eth,$(USEMODULE)))

4
pkg/tinydtls/Makefile.dep
View File

@ -8,3 +8,7 @@ USEMODULE += tinydtls_ecc
# TinyDTLS only has support for 32-bit architectures ATM
FEATURES_REQUIRED += arch_32bit
ifneq (,$(filter sock_dtls,$(USEMODULE)))
USEMODULE += tinydtls_sock_dtls
endif

2
tests/emcute/Makefile
View File

@ -16,7 +16,7 @@ else
endif
USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEMODULE += gnrc_netif_single # Only one interface used and it makes
# shell commands easier
USEMODULE += emcute

2
tests/gnrc_ipv6_nib_dns/Makefile
View File

@ -5,7 +5,7 @@ RIOTBASE ?= $(CURDIR)/../..
export TAP ?= tap0
USEMODULE += sock_dns
USEMODULE += gnrc_sock_udp
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_ipv6_nib_dns
# use Ethernet as link-layer protocol

5
tests/gnrc_sock_async_event/Makefile
View File

@ -3,10 +3,9 @@ include ../Makefile.tests_common
USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_hdr
USEMODULE += gnrc_pktdump
USEMODULE += gnrc_sock_async
USEMODULE += gnrc_sock_ip
USEMODULE += gnrc_sock_udp
USEMODULE += sock_async_event
USEMODULE += sock_ip
USEMODULE += sock_udp
USEMODULE += od
USEMODULE += xtimer

1
tests/gnrc_sock_dns/Makefile
View File

@ -5,7 +5,6 @@ RIOTBASE ?= $(CURDIR)/../..
export TAP ?= tap0
USEMODULE += sock_dns
USEMODULE += gnrc_sock_udp
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_ipv6_nib_dns
USEMODULE += gnrc_netif_single # Only one interface used and it makes

2
tests/gnrc_sock_ip/Makefile
View File

@ -1,6 +1,6 @@
include ../Makefile.tests_common
USEMODULE += gnrc_sock_ip
USEMODULE += sock_ip
USEMODULE += gnrc_ipv6
USEMODULE += ps

2
tests/gnrc_sock_neterr/Makefile
View File

@ -3,7 +3,7 @@ include ../Makefile.tests_common
USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_neterr
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEMODULE += od
USEMODULE += xtimer

2
tests/gnrc_sock_udp/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.tests_common
USEMODULE += gnrc_sock_check_reuse
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEMODULE += gnrc_ipv6
USEMODULE += ps

10
tests/lwip/Makefile
View File

@ -21,11 +21,13 @@ ifneq (0, $(LWIP_IPV6))
endif
# including lwip_ipv6_mld would currently break this test on at86rf2xx radios
USEMODULE += lwip lwip_sock_ip lwip_netdev
USEMODULE += lwip_udp lwip_sock_udp
USEMODULE += lwip_tcp lwip_sock_tcp
USEMODULE += lwip_sock_async
USEMODULE += lwip lwip_netdev
USEMODULE += lwip_udp
USEMODULE += lwip_tcp
USEMODULE += sock_async_event
USEMODULE += sock_ip
USEMODULE += sock_tcp
USEMODULE += sock_udp
USEMODULE += sock_util
USEMODULE += shell
USEMODULE += shell_commands

2
tests/lwip_sock_ip/Makefile
View File

@ -20,10 +20,10 @@ endif
USEMODULE += inet_csum
USEMODULE += l2util
USEMODULE += lwip_netdev
USEMODULE += lwip_sock_ip
USEMODULE += netdev_eth
USEMODULE += netdev_test
USEMODULE += ps
USEMODULE += sock_ip
DISABLE_MODULE += auto_init_lwip

2
tests/lwip_sock_tcp/Makefile
View File

@ -19,10 +19,10 @@ endif
USEMODULE += inet_csum
USEMODULE += lwip_netdev
USEMODULE += lwip_sock_tcp
USEMODULE += netdev_eth
USEMODULE += netdev_test
USEMODULE += ps
USEMODULE += sock_tcp
DISABLE_MODULE += auto_init_lwip

2
tests/lwip_sock_udp/Makefile
View File

@ -20,10 +20,10 @@ endif
USEMODULE += inet_csum
USEMODULE += l2util
USEMODULE += lwip_netdev
USEMODULE += lwip_sock_udp
USEMODULE += netdev_eth
USEMODULE += netdev_test
USEMODULE += ps
USEMODULE += sock_udp
DISABLE_MODULE += auto_init_lwip

3
tests/nanocoap_cli/Makefile
View File

@ -6,8 +6,7 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEMODULE += nanocoap_sock

2
tests/pkg_libcoap/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.tests_common
USEMODULE += gnrc_ipv6
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEPKG += libcoap
include $(RIOTBASE)/Makefile.include

6
tests/pkg_microcoap/Makefile
View File

@ -4,14 +4,12 @@ include ../Makefile.tests_common
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
# Specify the mandatory networking modules for IPv6
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_udp
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo
#
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
USEPKG += microcoap

6
tests/pkg_tinydtls_sock_async/Makefile
View File

@ -9,14 +9,14 @@ USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_sock_async
USEMODULE += gnrc_sock_udp
USEMODULE += sock_async_event
USEMODULE += sock_dtls
USEMODULE += sock_udp
USEMODULE += event_thread_medium
USEMODULE += event_timeout
# Use tinydtls for sock_dtls
USEMODULE += tinydtls_sock_dtls
USEPKG += tinydtls
# tinydtls needs crypto secure PRNG
USEMODULE += prng_sha1prng

3
tests/riotboot_flashwrite/Makefile
View File

@ -9,8 +9,7 @@ USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_ipv6_router_default
USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += sock_udp
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo

1
tests/sntp/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += sntp
USEMODULE += gnrc_sock_udp
USEMODULE += gnrc_ipv6_default
USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_netdev_default