Skip to content
This repository has been archived by the owner on Sep 23, 2021. It is now read-only.

Duplicate entry in bootloader production Makefile #160

Open
DG12 opened this issue Sep 22, 2019 · 3 comments
Open

Duplicate entry in bootloader production Makefile #160

DG12 opened this issue Sep 22, 2019 · 3 comments

Comments

@DG12
Copy link
Contributor

DG12 commented Sep 22, 2019

$(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 \

@ojousima
Copy link
Member

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.

@DG12
Copy link
Contributor Author

DG12 commented Sep 23, 2019

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?

@ojousima
Copy link
Member

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants