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 #19485

Browse Source 
19485: sys/shell: Fix missing dependency r=aabadie a=maribu

### Contribution description

The shell commands depend on the shell module being use. This was already the case in KConfig, but was overlooked in the shell's `Makefile.dep`.

In addition, this uncovered that `tests/memarray` had a bogus dependency on shell commands without every using the shell.

### Testing procedure

Ideally binaries should not differ (except for debug section).

### Issues/PRs references

Split out of https://github.com/RIOT-OS/RIOT/pull/19483

Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
This commit is contained in:
bors[bot] 2023-04-22 06:21:38 +00:00 committed by GitHub
commit 0101663e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 17 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/asymcute_mqttsn/Makefile
View File

@ -16,7 +16,6 @@ USEMODULE += gnrc_ipv6_default
# Include MQTT-SN
USEMODULE += asymcute
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
# For testing we also include the ping command and some stats

1
examples/benchmark_udp/Makefile
View File

@ -22,7 +22,6 @@ else
endif
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += netstats_l2

1
examples/ccn-lite-relay/Makefile
View File

@ -26,7 +26,6 @@ CFLAGS += -DNEEDS_PACKET_CRAFTING
QUIET ?= 1
USEMODULE += ps
USEMODULE += shell
USEMODULE += shell_cmds_default
# Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present

1
examples/gnrc_networking_mac/Makefile
View File

@ -30,7 +30,6 @@ USEMODULE += gnrc_pktdump
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += netstats_l2

1
examples/gnrc_networking_subnets/Makefile
View File

@ -19,7 +19,6 @@ USEMODULE += gnrc_pktdump
# Additional networking modules that can be dropped if not needed
USEMODULE += gnrc_icmpv6_echo
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += netstats_l2

1
examples/ndn-ping/Makefile
View File

@ -11,7 +11,6 @@ RIOTBASE ?= $(CURDIR)/../../
USEMODULE += netdev_default
USEMODULE += auto_init_gnrc_netif
USEMODULE += random
USEMODULE += shell
USEMODULE += shell_cmds_default
USEPKG += ndn-riot

1
examples/paho-mqtt/Makefile
View File

@ -33,7 +33,6 @@ ifneq (,$(DEFAULT_MQTT_PWD))
CFLAGS += -DDEFAULT_MQTT_PWD=\"$(DEFAULT_MQTT_PWD)\"
endif
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += netdev_default

1
examples/posix_sockets/Makefile
View File

@ -18,7 +18,6 @@ USEMODULE += posix_sockets
USEMODULE += posix_sleep
USEMODULE += posix_inet
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
examples/saul/Makefile
View File

@ -10,7 +10,6 @@ RIOTBASE ?= $(CURDIR)/../..
# we want to use SAUL:
USEMODULE += saul_default
# include the shell:
USEMODULE += shell
USEMODULE += shell_cmds_default
# additional modules for debugging:
USEMODULE += ps

18
sys/Makefile.dep
View File

@ -334,8 +334,22 @@ ifneq (,$(filter random_cmd,$(USEMODULE)))
USEMODULE += shell_cmd_random
endif
ifneq (,$(filter shell%,$(USEMODULE)))
USEMODULE += stdin
ifneq (,$(filter shell_commands,$(USEMODULE)))
# shell_commands has been renamed to shell_cmds_default, but let's keep this
# for backward compatibility
USEMODULE += shell_cmds_default
endif
ifneq (,$(filter shell_cmd%,$(USEMODULE)))
# each and every command is a submodule of shell_cmds
USEMODULE += shell_cmds
endif
ifneq (,$(filter shell_cmds,$(USEMODULE)))
USEMODULE += shell
endif
ifneq (,$(filter shell,$(USEMODULE)))
include $(RIOTBASE)/sys/shell/Makefile.dep
endif

11
sys/shell/Makefile.dep
View File

@ -1,13 +1,4 @@
ifneq (,$(filter shell_cmd_%,$(USEMODULE)))
# each and every command is a submodule of shell_cmds
USEMODULE += shell_cmds
endif
ifneq (,$(filter shell_commands,$(USEMODULE)))
# shell_commands has been renamed to shell_cmds_default, but let's keep this
# for backward compatibility
USEMODULE += shell_cmds_default
endif
USEMODULE += stdin
ifneq (,$(filter shell_cmds_default,$(USEMODULE)))
USEMODULE += shell_cmd_sys

1
tests/can_trx/Makefile
View File

@ -1,7 +1,6 @@
export APPLICATION = can_trx
include ../Makefile.tests_common
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/congure_reno/Makefile
View File

@ -3,7 +3,6 @@ include ../Makefile.tests_common
USEMODULE += congure_reno
USEMODULE += congure_test
USEMODULE += fmt
USEMODULE += shell
USEMODULE += shell_cmds_default
INCLUDES += -I$(CURDIR)

1
tests/congure_test/Makefile
View File

@ -3,7 +3,6 @@ include ../Makefile.tests_common
USEMODULE += congure_mock
USEMODULE += congure_test
USEMODULE += fmt
USEMODULE += shell
USEMODULE += shell_cmds_default
INCLUDES += -I$(CURDIR)

1
tests/conn_can/Makefile
View File

@ -2,7 +2,6 @@ BOARD ?= nucleo-f767zi
include ../Makefile.tests_common
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/cpu_cortexm_address_check/Makefile
View File

@ -4,7 +4,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED += cpu_check_address
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_at30tse75x/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += at30tse75x
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_ata8520e/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += ata8520e
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_bq2429x/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += bq2429x
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_cc110x/Makefile
View File

@ -5,7 +5,6 @@ DEVICE ?= cc1100 # The MSB-A2 uses the CC1100. New boards use CC1101
# This test will rely on a human interacting with the shell, so we better add
# the shell and some commands
USEMODULE += shell
USEMODULE += shell_cmds_default
# Add the device driver
USEMODULE += $(DEVICE)

1
tests/driver_dfplayer/Makefile
View File

@ -2,7 +2,6 @@ include ../Makefile.tests_common
USEMODULE += dfplayer
USEMODULE += event_thread
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_lis2dh12/Makefile
View File

@ -6,7 +6,6 @@ DRIVER ?= lis2dh12_spi
USEMODULE += fmt
USEMODULE += ztimer
USEMODULE += ztimer_msec
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += $(DRIVER)

1
tests/driver_motor_driver/Makefile
View File

@ -3,7 +3,6 @@ BOARD ?= native
include ../Makefile.tests_common
USEMODULE += motor_driver
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += xtimer

1
tests/driver_netdev_common/Makefile.netdev.mk
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
# Modules to include:
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/driver_nrf24l01p_lowlevel/Makefile
View File

@ -1,6 +1,5 @@
include ../Makefile.tests_common
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += ztimer_usec

1
tests/driver_nrf24l01p_ng/Makefile
View File

@ -2,7 +2,6 @@ DEBUG ?= 0
include ../Makefile.tests_common
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += gnrc

1
tests/driver_nrfmin/Makefile
View File

@ -8,7 +8,6 @@ USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6
USEMODULE += gnrc_icmpv6_echo
# also add the shell with some basic shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
# microbit qemu failing currently

1
tests/driver_rn2xx3/Makefile
View File

@ -3,7 +3,6 @@ include ../Makefile.tests_common
DRIVER ?= rn2483
USEMODULE += $(DRIVER)
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_servo/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += servo
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += saul_default

1
tests/driver_sht1x/Makefile
View File

@ -4,7 +4,6 @@ DRIVER ?= sht11
BOARD ?= msba2
USEMODULE += $(DRIVER)
USEMODULE += shell
USEMODULE += saul_default
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/driver_sx126x/Makefile
View File

@ -4,7 +4,6 @@ include ../Makefile.tests_common
LORA_DRIVER ?= sx1261
USEMODULE += $(LORA_DRIVER)
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/driver_sx127x/Makefile
View File

@ -3,7 +3,6 @@ BOARD ?= b-l072z-lrwan1
include ../Makefile.tests_common
USEMODULE += od
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/driver_sx1280/Makefile
View File

@ -5,7 +5,6 @@ include ../Makefile.tests_common
# required modules
USEMODULE += sx1280
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += iolist

2
tests/memarray/Makefile
View File

@ -1,8 +1,6 @@
include ../Makefile.tests_common
USEMODULE += memarray
# Used for invoking _ps_handler
USEMODULE += shell_cmds_default
USEMODULE += ps
include $(RIOTBASE)/Makefile.include

1
tests/nimble_statconn_gnrc/Makefile
View File

@ -2,7 +2,6 @@ BOARD ?= nrf52dk
include ../Makefile.tests_common
# include shell support
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/nimble_statconn_gnrc_ext/Makefile
View File

@ -2,7 +2,6 @@ BOARD ?= nrf52dk
include ../Makefile.tests_common
# include shell support
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/periph_eeprom/Makefile
View File

@ -2,7 +2,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED += periph_eeprom
USEMODULE += shell
USEMODULE += shell_cmds_default # provides reboot command
include $(RIOTBASE)/Makefile.include

1
tests/periph_gpio/Makefile
View File

@ -7,7 +7,6 @@ FEATURES_OPTIONAL += periph_gpio_irq
FEATURES_OPTIONAL += periph_gpio_fast_read
FEATURES_OPTIONAL += periph_gpio_tamper_wake
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += benchmark

1
tests/periph_i2c/Makefile
View File

@ -4,7 +4,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_i2c
FEATURES_OPTIONAL = periph_i2c_reconfigure
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += shell_cmd_i2c_scan
USEMODULE += xtimer

1
tests/periph_pm/Makefile
View File

@ -4,7 +4,6 @@ include ../Makefile.tests_common
FEATURES_OPTIONAL += periph_rtc
FEATURES_OPTIONAL += periph_gpio_irq
USEMODULE += shell
USEMODULE += shell_cmds_default
# avoid running Kconfig by default

1
tests/periph_spi/Makefile
View File

@ -12,7 +12,6 @@ endif
USEMODULE += ztimer_usec
USEMODULE += ztimer_sec
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += schedstatistics

1
tests/pkg_edhoc_c/Makefile
View File

@ -28,7 +28,6 @@ USEMODULE += gnrc_icmpv6_echo
USEMODULE += nanocoap_sock
# include this for printing IP addresses
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps
USEMODULE += xtimer

1
tests/pkg_openwsn/Makefile
View File

@ -79,7 +79,6 @@ endif
## Test application Modules
USEMODULE += ps
USEMODULE += od_string
USEMODULE += shell
USEMODULE += shell_cmds_default
# ztimer is used instead of xtimer because it's a dependency of some

1
tests/pkg_semtech-loramac/Makefile
View File

@ -20,7 +20,6 @@ ifeq (,$(filter $(BOARD),$(BOARD_WITHOUT_LORAMAC_RX)))
endif
USEMODULE += auto_init_loramac
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += fmt

1
tests/pkg_tinydtls_sock_async/Makefile
View File

@ -22,7 +22,6 @@ USEPKG += tinydtls
USEMODULE += prng_sha1prng
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_cmds_default
# Bitfield to log open sessions

1
tests/riotboot/Makefile
View File

@ -6,7 +6,6 @@ FEATURES_REQUIRED += riotboot
# Include modules to test the bootloader
USEMODULE += riotboot_slot
USEMODULE += shell
# Add shell_cmds_default to use the shell version of `test_utils_interactive_sync`
USEMODULE += shell_cmds_default

1
tests/riotboot_flashwrite/Makefile
View File

@ -15,7 +15,6 @@ USEMODULE += gnrc_icmpv6_echo
USEMODULE += nanocoap_sock
# include this for printing IP addresses
USEMODULE += shell
USEMODULE += shell_cmds_default
# include riotboot modules

1
tests/rng/Makefile
View File

@ -10,7 +10,6 @@ CFLAGS += -DTHREAD_STACKSIZE_MAIN=\($(MAIN_THREAD_SIZE)\)
USEMODULE += fmt
USEMODULE += random
USEMODULE += shell_cmd_random
USEMODULE += shell
USEMODULE += xtimer
FEATURES_OPTIONAL += periph_hwrng

1
tests/sched_change_priority/Makefile
View File

@ -2,7 +2,6 @@ include ../Makefile.tests_common
USEMODULE += nice
USEMODULE += ps
USEMODULE += shell
USEMODULE += shell_cmds_default
# Use a terminal that does not introduce extra characters into the stream.

1
tests/shell/Makefile
View File

@ -2,7 +2,6 @@ DEVELHELP=0
include ../Makefile.tests_common
USEMODULE += app_metadata
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/shell_ble/Makefile
View File

@ -3,7 +3,6 @@ BOARD ?= nrf52dk
include ../Makefile.tests_common
USEMODULE += app_metadata
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/sntp/Makefile
View File

@ -4,7 +4,6 @@ USEMODULE += sntp
USEMODULE += gnrc_ipv6_default
USEMODULE += auto_init_gnrc_netif
USEMODULE += netdev_default
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include

1
tests/sock_udp_aux/Makefile
View File

@ -13,7 +13,6 @@ USEMODULE += sock_udp
USEMODULE += netstats_ipv6
USEMODULE += netstats_l2
USEMODULE += ps
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += sock_aux_local

1
tests/stm32_bootloader/Makefile
View File

@ -3,7 +3,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = bootloader_stm32
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += usb_board_reset

1
tests/sys_stdio_semihosting/Makefile
View File

@ -1,7 +1,6 @@
include ../Makefile.tests_common
USEMODULE += stdio_semihosting
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/usbus_board_reset/Makefile
View File

@ -4,7 +4,6 @@ FEATURES_REQUIRED += periph_usbdev
USEMODULE += app_metadata
USEMODULE += ps
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += usb_board_reset
USEMODULE += usbus_cdc_acm

1
tests/usbus_cdc_acm_stdio/Makefile
View File

@ -2,7 +2,6 @@ BOARD ?= samr21-xpro
include ../Makefile.tests_common
USEMODULE += stdio_cdc_acm
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/usbus_cdc_ecm/Makefile
View File

@ -5,7 +5,6 @@ USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_router_default
USEMODULE += gnrc_icmpv6_echo
USEMODULE += usbus_cdc_ecm
USEMODULE += shell
USEMODULE += shell_cmds_default
USEMODULE += ps

1
tests/vfs_default/Makefile
View File

@ -4,7 +4,6 @@ USEMODULE += vfs_default
USEMODULE += vfs_auto_format
USEMODULE += ps
USEMODULE += shell
USEMODULE += shell_cmds_default
include $(RIOTBASE)/Makefile.include