Skip to content

ports/esp8266: optionally include local Makefile settings#798

Closed
larsks wants to merge 1 commit into
adafruit:masterfrom
larsks:feature/circuitpython/local_make
Closed

ports/esp8266: optionally include local Makefile settings#798
larsks wants to merge 1 commit into
adafruit:masterfrom
larsks:feature/circuitpython/local_make

Conversation

@larsks
Copy link
Copy Markdown

@larsks larsks commented May 3, 2018

This commit modifies the Makefile so that it will load the file
local.mk if it exists. This permits one to persistently set things
like port, speed, and flash mode.

This is the same as micropython#3757.

This commit modifies the Makefile so that it will load the file
`local.mk` if it exists. This permits one to persistently set things
like port, speed, and flash mode.

This is the same as micropython#3757.
@dhalbert
Copy link
Copy Markdown
Collaborator

dhalbert commented May 3, 2018

In ports/atmel-samd/Makefile, we use mpconfigport.mk for this purpose, with -include mpconfigport.mk. Would that serve the purpose? We hadn't gotten around to adding it to ports/esp8266 yet. mpconfigport.mk does include long-term settings: it's not just for completely private local use.

@larsks
Copy link
Copy Markdown
Author

larsks commented May 3, 2018

@dhalbert I think it's helpful to have something that is strictly for private local use, because otherwise you're going to be committing "private local changes" by accident, all the time. Or losing them.

@dhalbert
Copy link
Copy Markdown
Collaborator

dhalbert commented May 3, 2018

In that case, are you putting local.mk in .gitignore?

@larsks
Copy link
Copy Markdown
Author

larsks commented May 3, 2018

I hadn't thought about it, but that's a good idea.

@larsks
Copy link
Copy Markdown
Author

larsks commented May 3, 2018

Also! Should it be near the top of the file (e.g., at the same place as you have -include mpconfigport.mk in atmel-smd/Makefile)? Or near the bottom of the variable definitions?

@dhalbert
Copy link
Copy Markdown
Collaborator

dhalbert commented May 3, 2018

Near the top, so it can influence stuff below. But can I ask, do you already have your own private repo that you're modifying, or are you using stock esp8266 most of the time? You can always make this change yourself and just merge from upstream as necessary.

I am not sure Damien would accept the change because he would suggest the above. Also one would want this across ports and it's only in esp8266 now.

I make local changes to Makefile all the time (like turning off inlining for debugging purposes). I just have to be careful not to commit that stuff upstream.

@larsks
Copy link
Copy Markdown
Author

larsks commented May 3, 2018

I just hate making private changes to files that are owned by the repository. But eh, I'm not going to fight for it :)

@larsks larsks closed this May 3, 2018
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.

2 participants