Skip to content

gnrc_ipv6_nib: make configurable via Kconfig again [backport 2022.07]#18362

Merged
miri64 merged 1 commit intoRIOT-OS:2022.07-branchfrom
miri64:backport/2022.07/gnrc_nib/fix/config-deps
Jul 23, 2022
Merged

gnrc_ipv6_nib: make configurable via Kconfig again [backport 2022.07]#18362
miri64 merged 1 commit intoRIOT-OS:2022.07-branchfrom
miri64:backport/2022.07/gnrc_nib/fix/config-deps

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Jul 23, 2022

Backport of #18360

Contribution description

Some CFLAGS snuck into the Makefile.dep of GNRC which makes it impossible to configure gnrc_ipv6_nib via Kconfig. As an added bonus I added the symbol CONFIG_GNRC_IPV6_NIB_ADD_RIO_IN_LAST_RA which was also induced via CFLAGS in GNRC's Makefile.dep to the Kconfig configuration.

Testing procedure

I noticed this by increasing the size of the forwarding table for the border router (e.g. to allow for large networks with RPL storing mode). I added examples/gnrc_border_router/app.config with content

CONFIG_KCONFIG_USEMODULE_GNRC_IPV6_NIB=y
CONFIG_GNRC_IPV6_NIB_NUMOF=50
CONFIG_GNRC_IPV6_NIB_OFFL_NUMOF=50

Trying to make -C examples/gnrc_border_router will get you a bunch of these error messages in current master:

make[4]: *** [/home/mlenders/Repositories/RIOT-OS/RIOT/Makefile.base:146: /home/mlenders/Repositories/RIOT-OS/RIOT/examples/gnrc_border_router/bin/native/gnrc_netif/gnrc_netif.o] Error 1
make[3]: *** [/home/mlenders/Repositories/RIOT-OS/RIOT/Makefile.base:31: ALL--/home/mlenders/Repositories/RIOT-OS/RIOT/sys/net/gnrc/netif] Error 2
In file included from <command-line>:
/home/mlenders/Repositories/RIOT-OS/RIOT/examples/gnrc_border_router/bin/native/generated/autoconf.h:200: error: "CONFIG_GNRC_IPV6_NIB_ADV_ROUTER" redefined [-Werror]
  200 | #define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 1
      | 
<command-line>: note: this is the location of the previous definition
In file included from <command-line>:
/home/mlenders/Repositories/RIOT-OS/RIOT/examples/gnrc_border_router/bin/native/riotbuild/riotbuild.h:6: error: "CONFIG_GNRC_IPV6_NIB_ADV_ROUTER" redefined [-Werror]
    6 | #define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 0
      | 
/home/mlenders/Repositories/RIOT-OS/RIOT/examples/gnrc_border_router/bin/native/generated/autoconf.h:200: note: this is the location of the previous definition
  200 | #define CONFIG_GNRC_IPV6_NIB_ADV_ROUTER 1
      | 
cc1: all warnings being treated as errors

This PR fixes that.

Issues/PRs references

None

@miri64 miri64 added Area: Kconfig Area: Kconfig integration Area: network Area: Networking Area: sys Area: System CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Jul 23, 2022
@miri64 miri64 requested a review from maribu July 23, 2022 08:39
@miri64 miri64 mentioned this pull request Jul 23, 2022
Merged
@miri64 miri64 added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Jul 23, 2022
@miri64 miri64 merged commit 1ee0ef8 into RIOT-OS:2022.07-branch Jul 23, 2022
@miri64 miri64 deleted the backport/2022.07/gnrc_nib/fix/config-deps branch July 23, 2022 18:58
@chrysn chrysn added this to the Release 2022.07 milestone Aug 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maribu maribu maribu approved these changes

@leandrolanzieri leandrolanzieri Awaiting requested review from leandrolanzieri leandrolanzieri is a code owner

@jia200x jia200x Awaiting requested review from jia200x jia200x is a code owner

@MrKevinWeiss MrKevinWeiss Awaiting requested review from MrKevinWeiss MrKevinWeiss is a code owner

@haukepetersen haukepetersen Awaiting requested review from haukepetersen haukepetersen is a code owner

@PeterKietzmann PeterKietzmann Awaiting requested review from PeterKietzmann PeterKietzmann is a code owner

@cgundogan cgundogan Awaiting requested review from cgundogan cgundogan is a code owner

Assignees

No one assigned

Labels

Area: Kconfig Area: Kconfig integration Area: network Area: Networking Area: sys Area: System CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2022.07

Development

Successfully merging this pull request may close these issues.

3 participants

@miri64 @maribu @chrysn