Attention is currently required from: Felix Singer, Martin Roth, Stefan Reinauer. Hello Felix Singer, build bot (Jenkins), Martin Roth, Stefan Reinauer,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/60007
to look at the new patch set (#3).
Change subject: payload/external/iPXE/Makefile: Clean up the repo before checking out ......................................................................
payload/external/iPXE/Makefile: Clean up the repo before checking out
The iPXE file src/config/general.h is being modified when built for the first time due to various options like HAS_SCRIPT,PXE_NO_PROMPT or PXE_HAS_HTTPS. This leaves the repo in an unclean state and when rebuilt git yields an error when checking out the master branch:
error: Your local changes to the following files would be overwritten by checkout: src/config/general.h Please commit your changes or stash them before you switch branches. Aborting fatal: A branch named 'coreboot' already exists.
Avoid the error by forcing master branch checkout.
TEST=Build coreboot apu2 with iPXE, then change an arbitrary configuration option to trigger rebuild of payloads. iPXE is rebuild without issues.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: If3cfbb4c74c6397b00463087aeac58efb2777bbe --- M payloads/external/iPXE/Makefile 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/60007/3