Skip to content

makefiles/info-global.inc.mk: bug: honor DEFAULT_MODULES#12011

Merged
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/info_global/default_modules
Aug 21, 2019
Merged

makefiles/info-global.inc.mk: bug: honor DEFAULT_MODULES#12011
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/info_global/default_modules

Conversation

@cladmi
Copy link
Contributor

@cladmi cladmi commented Aug 14, 2019

Contribution description

The parsing for info-boards-supported was completely ignoring default
modules.

Testing procedure

Review that both lines are done in Makefile.include.
Murdock should compile everything without error.

I will post a diff using dependencies resolution output when I have it.

When running the same procedure as in #12014
And comparing the difference of the aggregated info-boards-supported debug output I get:

diff -y --suppress-common-lines build/deps/ref/deps_info-boards-supported build/deps/2_default_modules/deps_info-boards-supported  | grep  -v USEMODULE | sort -u
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init

And we can see that USEMODULE now has values from the DEFAULT_MODULE:

diff -y --suppress-common-lines build/deps/ref/deps_info-boards-supported build/deps/2_default_modules/deps_info-boards-supported  | head -n 10
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = checksum periph_common periph_gpio periph_pm riot | USEMODULE = board checksum core core_msg cpu periph_common pe
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = checksum periph_common periph_gpio periph_pm riot | USEMODULE = board checksum core core_msg cpu periph_common pe
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = boards_common_arduino-atmega boards_common_atmega | USEMODULE = board boards_common_arduino-atmega boards_common_
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init

Issues/PRs references

This is based on

@cladmi cladmi force-pushed the pr/makefiles/info_global/default_modules branch from 5753905 to 081eb9c Compare August 15, 2019 12:51
@cladmi
Copy link
Contributor Author

cladmi commented Aug 15, 2019

Rebased due to conflict in Makefile.include.

@jcarrano jcarrano 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 Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Aug 20, 2019
@jcarrano jcarrano self-requested a review August 20, 2019 14:12
Copy link
Contributor

@jcarrano jcarrano left a comment

Choose a reason for hiding this comment

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

Looks good to me and restores the original, sensible behaviour of this variable.

@cladmi
Copy link
Contributor Author

cladmi commented Aug 20, 2019

This one is implemented on top of #12010 and the debug targets from #12004

Should I squash to remove the test commits ?

I just noticed I did not provide the diff in the description.

When running the same procedure as in #12014
And comparing the difference of the aggregated info-boards-supported debug output I get:

diff -y --suppress-common-lines build/deps/ref/deps_info-boards-supported build/deps/2_default_modules/deps_info-boards-supported  | grep  -v USEMODULE | sort -u
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init

And we can see that USEMODULE now has values from the DEFAULT_MODULE:

diff -y --suppress-common-lines build/deps/ref/deps_info-boards-supported build/deps/2_default_modules/deps_info-boards-supported  | head -n 10
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = checksum periph_common periph_gpio periph_pm riot | USEMODULE = board checksum core core_msg cpu periph_common pe
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = checksum periph_common periph_gpio periph_pm riot | USEMODULE = board checksum core core_msg cpu periph_common pe
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init
DISABLE_MODULE =                                              | DISABLE_MODULE = auto_init
USEMODULE = boards_common_arduino-atmega boards_common_atmega | USEMODULE = board boards_common_arduino-atmega boards_common_
DEFAULT_MODULE =                                              | DEFAULT_MODULE = board cpu core core_msg sys auto_init

The parsing for info-boards-supported was completely ignoring default
modules.
@cladmi cladmi force-pushed the pr/makefiles/info_global/default_modules branch from 081eb9c to 4516905 Compare August 21, 2019 15:57
@cladmi
Copy link
Contributor Author

cladmi commented Aug 21, 2019

Rebased and removed the debug target commit now that #12010 is in.

@jcarrano jcarrano merged commit 8724078 into RIOT-OS:master Aug 21, 2019
@cladmi cladmi deleted the pr/makefiles/info_global/default_modules branch August 21, 2019 16:53
@cladmi
Copy link
Contributor Author

cladmi commented Aug 21, 2019

Thank you for the review.

@kb2ma kb2ma added this to the Release 2019.10 milestone Sep 16, 2019
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: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants