ruuvitag_fw icon indicating copy to clipboard operation
ruuvitag_fw copied to clipboard

Duplicate entry in bootloader production Makefile

Open DG12 opened this issue 5 years ago • 3 comments

$(SDK_ROOT)/components/drivers_nrf/rng/nrf_drv_rng.c \ is included twice in bootloader/ruuvitag_b_production/armgcc/Makefile

There seems to be an extraneous $(SDK_ROOT)/components/drivers_nrf/rng/ \ Notice it's a directory

Additionally Makefile in ruuvi_examples/ruuvi_firmware/ruuvitag_b/s132/armgcc includes duplicate entries:

$(SDK_ROOT)/components/drivers_nrf/delay \
$(SDK_ROOT)/components/drivers_nrf/gpiote/nrf_drv_gpiote.c \
$(SDK_ROOT)/components/libraries/scheduler \
$(SDK_ROOT)/components/libraries/timer \

DG12 avatar Sep 22 '19 20:09 DG12

Thanks for pointing this out. Can you open a pull request with the duplicates removed? I can do it too at some point if needed.

ojousima avatar Sep 23 '19 10:09 ojousima

I'm a little unclear on how to do that. I have a fork that is "This branch is 5 commits ahead, 35 commits behind ruuvi:master." Do I need to delete my fork, refork it, make the change and then issue the pull request?

DG12 avatar Sep 23 '19 11:09 DG12

You probably could sort the fork out with some rebases, but maybe it's easier if I remove the duplicates later

ojousima avatar Sep 23 '19 12:09 ojousima