drivers/rtt_rtc: select rtc_utils #17530

fjmolinas · 2022-01-18T12:49:14Z

Contribution description

Spotted by @emmanuelsearch during release tests, if compiling only the rtt_rtc module with the mock then there is a missing dependency against rtc_utils.

Testing procedure

master

make -C tests/unittests/ tests-rtt_rtc
Building application "tests_unittests" for "native" with MCU "native".

"make" -C /home/francisco/workspace/RIOT2/boards/native
"make" -C /home/francisco/workspace/RIOT2/boards/native/drivers
"make" -C /home/francisco/workspace/RIOT2/core
"make" -C /home/francisco/workspace/RIOT2/cpu/native
"make" -C /home/francisco/workspace/RIOT2/cpu/native/periph
"make" -C /home/francisco/workspace/RIOT2/cpu/native/stdio_native
"make" -C /home/francisco/workspace/RIOT2/drivers
"make" -C /home/francisco/workspace/RIOT2/drivers/periph_common
"make" -C /home/francisco/workspace/RIOT2/drivers/rtt_rtc
"make" -C /home/francisco/workspace/RIOT2/sys
"make" -C /home/francisco/workspace/RIOT2/sys/embunit
"make" -C /home/francisco/workspace/RIOT2/sys/test_utils/interactive_sync
"make" -C /home/francisco/workspace/RIOT2/sys/ztimer
"make" -C /home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/rtt_rtc/rtt_rtc.o: in function `rtc_set_time':
/home/francisco/workspace/RIOT2/drivers/rtt_rtc/rtt_rtc.c:126: undefined reference to `rtc_tm_normalize'
/usr/bin/ld: /home/francisco/workspace/RIOT2/drivers/rtt_rtc/rtt_rtc.c:132: undefined reference to `rtc_mktime'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/rtt_rtc/rtt_rtc.o: in function `rtc_get_time':
/home/francisco/workspace/RIOT2/drivers/rtt_rtc/rtt_rtc.c:166: undefined reference to `rtc_localtime'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/rtt_rtc/rtt_rtc.o: in function `rtc_set_alarm':
/home/francisco/workspace/RIOT2/drivers/rtt_rtc/rtt_rtc.c:185: undefined reference to `rtc_mktime'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests-rtt_rtc/tests-rtt_rtc.o: in function `test_set_alarm_set_time':
/home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:180: undefined reference to `rtc_tm_compare'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:187: undefined reference to `rtc_tm_compare'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:200: undefined reference to `rtc_tm_compare'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests-rtt_rtc/tests-rtt_rtc.o: in function `_alarm_cb':
/home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:75: undefined reference to `rtc_tm_compare'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests-rtt_rtc/tests-rtt_rtc.o: in function `test_set_alarm_short':
/home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:141: undefined reference to `rtc_tm_compare'
/usr/bin/ld: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests-rtt_rtc/tests-rtt_rtc.o:/home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc/tests-rtt_rtc.c:148: more undefined references to `rtc_tm_compare' follow
collect2: error: ld returned 1 exit status
make: *** [/home/francisco/workspace/RIOT2/tests/unittests/../../Makefile.include:694: /home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests_unittests.elf] Error 1

pr

make -C tests/unittests/ tests-rtt_rtc
Building application "tests_unittests" for "native" with MCU "native".

"make" -C /home/francisco/workspace/RIOT2/boards/native
"make" -C /home/francisco/workspace/RIOT2/boards/native/drivers
"make" -C /home/francisco/workspace/RIOT2/core
"make" -C /home/francisco/workspace/RIOT2/cpu/native
"make" -C /home/francisco/workspace/RIOT2/cpu/native/periph
"make" -C /home/francisco/workspace/RIOT2/cpu/native/stdio_native
"make" -C /home/francisco/workspace/RIOT2/drivers
"make" -C /home/francisco/workspace/RIOT2/drivers/periph_common
"make" -C /home/francisco/workspace/RIOT2/drivers/rtt_rtc
"make" -C /home/francisco/workspace/RIOT2/sys
"make" -C /home/francisco/workspace/RIOT2/sys/embunit
"make" -C /home/francisco/workspace/RIOT2/sys/rtc_utils
"make" -C /home/francisco/workspace/RIOT2/sys/test_utils/interactive_sync
"make" -C /home/francisco/workspace/RIOT2/sys/ztimer
"make" -C /home/francisco/workspace/RIOT2/tests/unittests/tests-rtt_rtc
   text	   data	    bss	    dec	    hex	filename
  38511	    684	  51960	  91155	  16413	/home/francisco/workspace/RIOT2/tests/unittests/bin/native/tests_unittests.elf

aabadie · 2022-01-18T13:45:32Z

sys/Makefile.dep

@@ -853,4 +853,8 @@ ifneq (,$(filter fido2_ctap,$(USEMODULE)))
  USEMODULE += fido2
 endif

+ifneq (,$(filter rtt_rtc,$(USEMODULE)))
+  USEMODULE += rtc_utils


Couldn't this be added inside drivers/rtt_rtc/Makefile.dep instead ?

Hmm yeah not sure why added it there

aabadie · 2022-01-18T14:04:27Z

drivers/rtt_rtc/Makefile.dep

@@ -2,3 +2,8 @@
 ifeq (,$(UNIT_TESTS))
  FEATURES_REQUIRED += periph_rtt
 endif
+
+ifneq (,$(filter rtt_rtc,$(USEMODULE)))


You don't need to filter on whether rtt_rtc is used, this is already done at that level.

drivers/rtt_rtc/Makefile.dep

aabadie

ACK

fjmolinas · 2022-01-18T16:08:25Z

Backport provided in #17532

fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jan 18, 2022

fjmolinas requested review from cgundogan, jia200x and leandrolanzieri as code owners January 18, 2022 12:49

fjmolinas requested review from aabadie and removed request for cgundogan, jia200x and leandrolanzieri January 18, 2022 12:49

github-actions bot added Area: build system Area: Build system Area: drivers Area: Device drivers Area: Kconfig Area: Kconfig integration Area: sys Area: System labels Jan 18, 2022

fjmolinas added the Process: needs backport Integration Process: The PR is required to be backported to a release or feature branch label Jan 18, 2022

aabadie reviewed Jan 18, 2022

View reviewed changes

fjmolinas force-pushed the pr_rtt_rtc_utils branch from 3fafd6a to c071d7d Compare January 18, 2022 14:00

github-actions bot removed the Area: sys Area: System label Jan 18, 2022

aabadie reviewed Jan 18, 2022

View reviewed changes

drivers/rtt_rtc/Makefile.dep Outdated Show resolved Hide resolved

fjmolinas force-pushed the pr_rtt_rtc_utils branch from c071d7d to d043714 Compare January 18, 2022 14:20

aabadie approved these changes Jan 18, 2022

View reviewed changes

aabadie enabled auto-merge January 18, 2022 14:21

drivers/rtt_rtc: select rtc_utils

8b45ed8

fjmolinas force-pushed the pr_rtt_rtc_utils branch from d043714 to 8b45ed8 Compare January 18, 2022 14:32

aabadie merged commit 52781dc into RIOT-OS:master Jan 18, 2022

fjmolinas deleted the pr_rtt_rtc_utils branch January 18, 2022 16:07

fjmolinas mentioned this pull request Jan 18, 2022

drivers/rtt_rtc: select rtc_utils [backport 2022.01] #17532

Merged

OlegHahm added this to the Release 2022.04 milestone Apr 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

drivers/rtt_rtc: select rtc_utils #17530

drivers/rtt_rtc: select rtc_utils #17530

fjmolinas commented Jan 18, 2022

aabadie Jan 18, 2022

fjmolinas Jan 18, 2022

aabadie Jan 18, 2022

aabadie left a comment

fjmolinas commented Jan 18, 2022

drivers/rtt_rtc: select rtc_utils #17530

drivers/rtt_rtc: select rtc_utils #17530

Conversation

fjmolinas commented Jan 18, 2022

Contribution description

Testing procedure

aabadie Jan 18, 2022

Choose a reason for hiding this comment

fjmolinas Jan 18, 2022

Choose a reason for hiding this comment

aabadie Jan 18, 2022

Choose a reason for hiding this comment

aabadie left a comment

Choose a reason for hiding this comment

fjmolinas commented Jan 18, 2022