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

Keep signing commands in platform.txt on release #5491

Merged
merged 2 commits into from
Dec 13, 2018

Conversation

earlephilhower
Copy link
Collaborator

The boards packager was deleting what was at the time it was written
unused lines in the platform.txt file before deploying to Arduino.
One of these lines is now needed for signing to work, so don't delete
it.

Also, explicitly call "python signing.py" because it looks like Arduino
is sanitizing/removing executable bits on files when extracting from
boards manager installations.

Fixes #5483

The boards packager was deleting what was at the time it was written
unused lines in fht platform.txt file before deploying to Arduino.
One of these lines is now needed for signing to work, so don't delete
it.

Also, explicitly call "python signing.py" because it looks like Arduino
is sanitizing/removing executable bits on files when extracting from
boards manager installations.

Fixes esp8266#5483
@earlephilhower earlephilhower changed the title Keep signing commands in platform.txt on release WIP - Keep signing commands in platform.txt on release Dec 13, 2018
@earlephilhower
Copy link
Collaborator Author

@devyte , @d-a-v , @igrr
Without this change the -beta1 release will fail as shown in #5483.

WIP because even with this change, signing fails on the Arduino boards-manager installed version. The directory structure is different vs. the git version when building, so the generated /tmp/arduino_xxx/core directory isn't even created.

If the temporary build/core directory isn't available, make it in order
that Updater.cpp will see the generated signing header and not the one
in the main core.
@earlephilhower earlephilhower changed the title WIP - Keep signing commands in platform.txt on release Keep signing commands in platform.txt on release Dec 13, 2018
@earlephilhower
Copy link
Collaborator Author

WIP removed.

Did manual testing by copying platform.txt and tools./signing.py of the board_package script to a board manager installed version of -b1. Signed and unsigned binaries back to good AFAICT, no more bombs in compilation.

@devyte devyte merged commit 68f5a3d into esp8266:master Dec 13, 2018
@earlephilhower
Copy link
Collaborator Author

Just tested on a Windows install as well and it's clean. Thanks for merging overnight.

@earlephilhower earlephilhower deleted the fixsign branch December 13, 2018 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants