Re: Makefile has local changes that will be overwritten

[Stefan Weil]

Am 01.02.21 um 16:36 schrieb Programmingkid:

> Thank you for the suggestion. I tried it but didn't seem to help. I 
> should report this is what I see when I try to build QEMU:
> Disabling PIE due to missing toolchain support
> error: Your local changes to the following files would be overwritten by 
> checkout:
>         Makefile
> Please commit your changes or stash them before you switch branches.
> Aborting
> Unable to checkout '85e5d839847af54efab170f2b1331b2a6421e647' in submodule path 
> 'dtc'
> /Users/john/Documents/Development/Projects/Qemu/qemu-git/scripts/git-submodule.sh:
>  failed to update modules
>
> Unable to automatically checkout GIT submodules ' ui/keycodemapdb 
> tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 meson dtc capstone 
> slirp'.

So dtc/Makefile is causing the problem.

What does "git -C dtc diff" show?

"git -C dtc reset --hard" might fix the problem for you.

Stefan