From 67b8c6709c088f522da89332e954793bfa697c8f Mon Sep 17 00:00:00 2001 From: Dylan Laduranty Date: Thu, 14 Mar 2024 21:48:29 +0100 Subject: [PATCH] treewide: remove deprecated gnrc_pktbuf_cmd module Signed-off-by: Dylan Laduranty --- makefiles/deprecated_modules.inc.mk | 1 - makefiles/pseudomodules.inc.mk | 7 ------- sys/net/gnrc/pktbuf/Makefile.include | 2 +- sys/shell/Makefile.dep | 3 --- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/makefiles/deprecated_modules.inc.mk b/makefiles/deprecated_modules.inc.mk index 415b4818ed..1327f043fb 100644 --- a/makefiles/deprecated_modules.inc.mk +++ b/makefiles/deprecated_modules.inc.mk @@ -1,7 +1,6 @@ # Add deprecated modules here # Keep this list ALPHABETICALLY SORTED!!!!111elven DEPRECATED_MODULES += gnrc_netif_cmd_lora # use shell_cmd_gnrc_netif_lorawan instead -DEPRECATED_MODULES += gnrc_pktbuf_cmd # use shell_cmd_gnrc_pktbuf instead DEPRECATED_MODULES += gnrc_udp_cmd # use shell_cmd_gnrc_udp instead DEPRECATED_MODULES += heap_cmd # use shell_cmd_heap instead DEPRECATED_MODULES += i2c_scan # use shell_cmd_i2c_scan instead diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index b7ad372cc7..e33d2c00c6 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -114,13 +114,6 @@ PSEUDOMODULES += gnrc_netapi_callbacks PSEUDOMODULES += gnrc_netapi_mbox PSEUDOMODULES += gnrc_netif_bus PSEUDOMODULES += gnrc_netif_timestamp -## @defgroup net_gnrc_pktbuf_cmd gnrc_pktbuf_cmd -## @ingroup net_gnrc_pktbuf -## @{ -## @deprecated Use module `shell_cmd_gnrc_pktbuf` instead; -## will be removed after 2023.07 release. -PSEUDOMODULES += gnrc_pktbuf_cmd -## @} PSEUDOMODULES += gnrc_netif_6lo PSEUDOMODULES += gnrc_netif_ipv6 PSEUDOMODULES += gnrc_netif_mac diff --git a/sys/net/gnrc/pktbuf/Makefile.include b/sys/net/gnrc/pktbuf/Makefile.include index f74fa7611b..7ca4e8154d 100644 --- a/sys/net/gnrc/pktbuf/Makefile.include +++ b/sys/net/gnrc/pktbuf/Makefile.include @@ -1,5 +1,5 @@ # Check that only one implementation of pktbuf is used -USED_PKTBUF_IMPLEMENTATIONS := $(filter-out gnrc_pktbuf_cmd,$(filter gnrc_pktbuf_%,$(USEMODULE))) +USED_PKTBUF_IMPLEMENTATIONS := $(filter gnrc_pktbuf_%,$(USEMODULE)) ifneq (1,$(words $(USED_PKTBUF_IMPLEMENTATIONS))) $(error Only one implementation of gnrc_pktbuf should be used. Currently using: $(USED_PKTBUF_IMPLEMENTATIONS)) endif diff --git a/sys/shell/Makefile.dep b/sys/shell/Makefile.dep index e82cf2f2db..d4dafc779d 100644 --- a/sys/shell/Makefile.dep +++ b/sys/shell/Makefile.dep @@ -60,9 +60,6 @@ ifneq (,$(filter shell_cmds_default,$(USEMODULE))) ifneq (,$(filter gnrc_netif_lorawan,$(USEMODULE))) USEMODULE += shell_cmd_gnrc_netif_lorawan endif - ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) - USEMODULE += shell_cmd_gnrc_pktbuf - endif ifneq (,$(filter gnrc_rpl,$(USEMODULE))) USEMODULE += shell_cmd_gnrc_rpl endif