[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Makefile has local changes that will be overwritten
From: |
Programmingkid |
Subject: |
Re: Makefile has local changes that will be overwritten |
Date: |
Mon, 1 Feb 2021 11:06:35 -0500 |
> On Feb 1, 2021, at 10:46 AM, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Mon, Feb 01, 2021 at 09:23:24AM -0500, Programmingkid wrote:
>> When trying to build QEMU I see this error:
>>
>> 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
>
> This suggests you've made changes to "Makefile" in your local
> checkout that aren't committed. What does 'git diff Makefile"
> say ?
It didn't say anything.
>> What I do to see this error:
>> ./configure --target-list=i386-softmmu
>>
>> I did some bisecting and found out this is the patch that causes the problem:
>>
>> commit 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8
>> Author: Dan Streetman <ddstreet@canonical.com>
>> Date: Tue Jan 19 12:20:46 2021 -0500
>>
>> configure: replace --enable/disable-git-update with --with-git-submodules
>>
>> Replace the --enable-git-update and --disable-git-update configure params
>> with the param --with-git-submodules=(update|validate|ignore) to
>> allow 3 options for building from a git repo.
>
> That commit includes changes to "Makefile", so if you have made local
> changes to Makefile yourself, this will cause the message you see from
> git. Either stash your changes, or rebase to resolve them.
I didn't make any changes to the Makefile. I even deleted it and tried
configure again. Saw the same error about MakeFile again.
- Re: Makefile has local changes that will be overwritten, (continued)
Re: Makefile has local changes that will be overwritten, Programmingkid, 2021/02/01
Re: Makefile has local changes that will be overwritten, Stefan Weil, 2021/02/01
Re: Makefile has local changes that will be overwritten, Daniel P . Berrangé, 2021/02/01
- Re: Makefile has local changes that will be overwritten,
Programmingkid <=