Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnrc_rpl: fix dependencies #3653

Merged
merged 1 commit into from
Aug 18, 2015
Merged

gnrc_rpl: fix dependencies #3653

merged 1 commit into from
Aug 18, 2015

Conversation

miri64
Copy link
Member

@miri64 miri64 commented Aug 18, 2015

Follow-up to #3050.

The dependency conditional for RPL was at the very end of Makefile.dep, giving depending modules no chance to pull in their dependencies (rpl just lists them as dependencies too).

Also it pulled in the deprecated module net_help, though it did not use any of it's functions (it just included inet_pton.h for AF_INET6).

@miri64 miri64 added Area: build system Area: Build system Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Aug 18, 2015
@miri64 miri64 added this to the Release 2015.08 milestone Aug 18, 2015
@OlegHahm OlegHahm added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Aug 18, 2015
@OlegHahm
Copy link
Member

Also it pulled in the deprecated module net_help, though it did not use any of it's functions (it just included inet_pton.h for AF_INET6).

Hence, the include should not be removed, right?

/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c: In function 'ng_rpl_parent_add_by_addr'
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c:245:67: error: 'AF_INET6' undeclared (first use in this function)
             if (fib_add_entry(if_id, def.u8, sizeof(ipv6_addr_t), AF_INET6, dodag->parents->addr.u8,
                                                                   ^
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c:245:67: note: each undeclared identifier is reported only once for each function it appears in
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c: In function 'ng_rpl_parent_update'
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c:327:67: error: 'AF_INET6' undeclared (first use in this function)
                 fib_add_entry(if_id, def.u8, sizeof(ipv6_addr_t), AF_INET6,
                                                                   ^
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c: In function 'ng_rpl_find_preferred_parent'
/home/oleg/git/RIOT/sys/net/routing/ng_rpl/ng_rpl_dodag.c:388:59: error: 'AF_INET6' undeclared (first use in this function)
         fib_add_entry(if_id, def.u8, sizeof(ipv6_addr_t), AF_INET6, dodag->parents->addr.u8,
    ```

@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

Hence, the include should not be removed, right?
I thought I did -.-

@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

Addressed.

@miri64 miri64 added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Aug 18, 2015
@cgundogan
Copy link
Member

looks sane. Could you please also remove the USEMODULE += timex as it gets pulled in by vtimer?

@cgundogan
Copy link
Member

You could also remove the vtimer entry, because the fib pulls it in

@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

You could also remove the vtimer entry, because the fib pulls it in

Isn't RPL using vtimers itself too?

@cgundogan
Copy link
Member

Yes it is, but I assumed the dependency gets pulled in transitively?

@OlegHahm
Copy link
Member

Yes it is, but I assumed the dependency gets pulled in transitively?

In general they are, but I would also strongly vote for making them explicit. fib may drop the need for timers in a theoretical future version.

@cgundogan
Copy link
Member

makes sense. never mind then, forget what I wrote before

@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

Removed the timex dependency.

@cgundogan
Copy link
Member

I am fine with the changes. ACK. Fixup please

@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

Squashed.

@OlegHahm OlegHahm removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Aug 18, 2015
@cgundogan
Copy link
Member

please rememove the extra pe in depependencies (commit msg)

The dependency conditional for RPL was at the very end of
`Makefile.dep`, giving depending modules no chance to pull in their
dependencies.

Also it pulled in the deprecated module `net_help`, though it did not
use any of it's functions (it just included `inet_pton.h` for `AF_INET6`).
@miri64 miri64 changed the title gnrc_rpl: fix depependencies gnrc_rpl: fix dependencies Aug 18, 2015
@miri64
Copy link
Member Author

miri64 commented Aug 18, 2015

Done.

miri64 added a commit that referenced this pull request Aug 18, 2015
@miri64 miri64 merged commit 70d40f1 into RIOT-OS:master Aug 18, 2015
@miri64 miri64 deleted the gnrc_rpl/fix/deps branch August 18, 2015 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants