Skip to content

makefiles/info-global.inc.mk: add initial default modules inclusion - #15022

Merged
aabadie merged 1 commit into
RIOT-OS:masterfrom
fjmolinas:pr_default_modules_info_global
Oct 1, 2020
Merged

makefiles/info-global.inc.mk: add initial default modules inclusion#15022
aabadie merged 1 commit into
RIOT-OS:masterfrom
fjmolinas:pr_default_modules_info_global

Conversation

@fjmolinas

Copy link
Copy Markdown
Contributor

Contribution description

In #14132 the cache mechanism was removed, but default modules initial inclusion
should still be present to mimic Makefile.include unless I'm missing soemthing.

I think none of the initially included default modules has an impact on dependencies so save_all_dependencies should be the same.

Testing procedure

./dist/tools/buildsystem_sanity_ check/save_all_dependencies_resolution_variables.sh, but if its not the same it would mean that something in $(RIOTMAKE)/defaultmodules.inc.mk is triggering some dependency.

Issues/PRs references

@fjmolinas fjmolinas added the Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation label Sep 14, 2020
@fjmolinas fjmolinas added 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 labels Sep 14, 2020
@fjmolinas
fjmolinas requested review from aabadie and maribu September 21, 2020 07:23
@maribu

maribu commented Sep 22, 2020

Copy link
Copy Markdown
Member

I forgot how slow ./dist/tools/buildsystem_sanity_check/save_all_dependencies_resolution_variables.sh is :-/

@aabadie

aabadie commented Sep 25, 2020

Copy link
Copy Markdown
Contributor

@maribu do you have some results to share ? (or did you gave up with the script ? :) )

@maribu

maribu commented Sep 25, 2020

Copy link
Copy Markdown
Member

@maribu do you have some results to share ? (or did you gave up with the script ? :) )

No. I decided after 30 minutes that this is something my notebook should do over night, when I'm not trying to also use it for working.

Maybe it is time to buy a new one...

@aabadie aabadie self-assigned this Sep 28, 2020
@aabadie

aabadie commented Sep 30, 2020

Copy link
Copy Markdown
Contributor

I ran the script 😎 and there are differences. Here a partial output of the diff

diff /tmp/review_riot_15022/deps_info-boards-supported /tmp/review_riot_15022_master/deps_info-boards-supported
38,39c38,39
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_pm riotboot riotboot_hdr riotboot_slot stdio_null
> DEFAULT_MODULE = cortexm_fpu
58,59c58,59
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_init_gpio periph_init_pm periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init periph_init_gpio periph_init_pm sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_pm riotboot riotboot_hdr riotboot_slot stdio_null
> DEFAULT_MODULE = cortexm_fpu
78,79c78,79
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_init_gpio periph_init_pm periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init periph_init_gpio periph_init_pm sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_pm riotboot riotboot_hdr riotboot_slot stdio_null
> DEFAULT_MODULE = cortexm_fpu
298,299c298,299
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_pm riotboot riotboot_hdr riotboot_slot stdio_null
> DEFAULT_MODULE = cortexm_fpu
458,459c458,459
< USEMODULE = board checksum core core_idle_thread cortexm_common cortexm_common_periph cpu netdev_register newlib newlib_nano newlib_syscalls_default periph periph_common periph_gpio periph_init periph_pm pm_layered riotboot riotboot_hdr riotboot_slot stdio_null stm32_clk stm32_vectors sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cpu periph_init sys
---
> USEMODULE = checksum core_idle_thread cortexm_common cortexm_common_periph netdev_register newlib newlib_nano newlib_syscalls_default periph periph_common periph_gpio periph_pm pm_layered riotboot riotboot_hdr riotboot_slot stdio_null stm32_clk stm32_vectors
> DEFAULT_MODULE =
478,479c478,479
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu netdev_register newlib newlib_nano newlib_syscalls_default periph periph_common periph_gpio periph_init periph_init_gpio periph_init_pm periph_pm pm_layered riotboot riotboot_hdr riotboot_slot stdio_null stm32_clk stm32_vectors sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init periph_init_gpio periph_init_pm sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu netdev_register newlib newlib_nano newlib_syscalls_default periph periph_common periph_gpio periph_pm pm_layered riotboot riotboot_hdr riotboot_slot stdio_null stm32_clk stm32_vectors
> DEFAULT_MODULE = cortexm_fpu
758,759c758,759
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cortexm_fpu cpu periph_init sys
---
> USEMODULE = checksum cortexm_common cortexm_common_periph cortexm_fpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_pm riotboot riotboot_hdr riotboot_slot stdio_null
> DEFAULT_MODULE = cortexm_fpu
778,779c778,779
< USEMODULE = board checksum core cortexm_common cortexm_common_periph cortexm_fpu cpu cpu_common netdev_register newlib newlib_nano newlib_syscalls_default nrf52_vectors nrf5x_common_periph periph periph_common periph_gpio periph_init periph_init_gpio periph_init_pm periph_pm riotboot riotboot_hdr riotboot_slot stdio_null sys
< DEFAULT_MODULE = auto_init board core core_init core_msg core_panic cpu periph_init periph_init_gpio periph_init_pm sys

The master commit corresponds to the commit just before this PR.

@fjmolinas

Copy link
Copy Markdown
Contributor Author

What is first in the diff master or pr?

@fjmolinas

Copy link
Copy Markdown
Contributor Author

@aabadie I believe the differences are to be expected since before the default modules where not added, and now they are so we can of course them now.

@aabadie aabadie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After some off-line discussion with @fjmolinas, we came up to the conclusion that this PR is good to merge.

The analysis of the dependencies check script shows that no module are removed and make info-board-supported is based on the same dependencies as the ones generated by the regular build system.

ACK!

@aabadie
aabadie merged commit 0941867 into RIOT-OS:master Oct 1, 2020
@fjmolinas
fjmolinas deleted the pr_default_modules_info_global branch October 1, 2020 20:01
@fjmolinas

Copy link
Copy Markdown
Contributor Author

Thanks for the review!

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