Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mesh-minimal build failure due to line endings in PinNames.h #3346

Closed
kimlep01 opened this issue Nov 30, 2016 · 3 comments
Closed

Mesh-minimal build failure due to line endings in PinNames.h #3346

kimlep01 opened this issue Nov 30, 2016 · 3 comments

Comments

@kimlep01
Copy link

kimlep01 commented Nov 30, 2016

Description

  • Type: Bug
  • Priority: Major

Building mbed-os-mesh-minimal against mbed-os master fails in Linux due to file line endings in:
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVA_NINA/PinNames.h

[K64F GCC_ARM ATMEL 6lp] + mbed deploy --protocol ssh
[K64F GCC_ARM ATMEL 6lp] error: Your local changes to the following files would be overwritten by checkout:
[K64F GCC_ARM ATMEL 6lp] targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVA_NINA/PinNames.h
[K64F GCC_ARM ATMEL 6lp] Please, commit your changes or stash them before you can switch branches.
[K64F GCC_ARM ATMEL 6lp] Aborting
[K64F GCC_ARM ATMEL 6lp] [mbed] ERROR: Unable to update "mbed-os" to rev #d5de476f74dd

Detected originally by CI today (30.11.2016) and can be reproduced manually also.


Bug

mbed-cli version:
1.0.0

meed-os sha:
c57427f (HEAD -> master, origin/master, origin/HEAD) Merge pull request #3321 from jeromecoutant/PR_L432KC

Steps to reproduce
Under Linux:
git clone [email protected]:ARMmbed/mbed-os-example-mesh-minimal.git
cd mbed-os-example-mesh-minimal
mbed deploy --protocol ssh
cd mbed-os
git checkout master
git pull
"Cannot pull with rebase: You have unstaged changes."
git diff
"warning: CRLF will be replaced by LF in targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/TARGET_UBLOX_EVA_NINA/PinNames.h."

@0xc0170
Copy link
Contributor

0xc0170 commented Nov 30, 2016

This is the pull request adding that target and the code referenced above: #3291

cc @mazgch - please have a look

@JanneKiiskila
Copy link
Contributor

Merge this in quickly, please....

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 1, 2016

Merge this in quickly, please....

I am looking at this, will fix it

@0xc0170 0xc0170 closed this as completed in bcdb866 Dec 1, 2016
adbridge pushed a commit that referenced this issue Dec 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants