Re: Makefile has local changes that will be overwritten

[Greg Kurz <groug@kaod.org>]

On Mon, 1 Feb 2021 10:30:25 -0500
Programmingkid <programmingkidx@gmail.com> wrote:

> 
> 
> > On Feb 1, 2021, at 9:52 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> > 
> > On Mon, 1 Feb 2021 at 14:49, Dan Streetman <ddstreet@canonical.com> wrote:
> >> 
> >> On Mon, Feb 1, 2021 at 9:23 AM Programmingkid <programmingkidx@gmail.com> 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
> >>> 
> >>> What I do to see this error:
> >>> ./configure --target-list=i386-softmmu
> >> 
> >> Sorry, I don't see that error, what commit are you building from?
> > 
> > ...and what does git think the local changes to Makefile are ?
> 
> This is the output of 'git status':
> On branch master
> Your branch is up to date with 'origin/master'.
> 
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git restore <file>..." to discard changes in working directory)
>   (commit or discard the untracked or modified content in submodules)
> 	modified:   dtc (new commits, modified content)
> 
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
> 	pixman/
> 
> no changes added to commit (use "git add" and/or "git commit -a")
> 
> 
> This is the output of 'git diff master':
> diff --git a/dtc b/dtc
> index 85e5d83984..88f18909db 160000
> --- a/dtc
> +++ b/dtc
> @@ -1 +1 @@
> -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
> +Subproject commit 88f18909db731a627456f26d779445f84e449536-dirty
> 

This looks like you have a change in the dtc submodule based on
an old commit:

commit 88f18909db731a627456f26d779445f84e449536 (tag: v1.4.7)
Author: David Gibson <david@gibson.dropbear.id.au>
Date:   Mon Jul 23 13:00:50 2018 +1000

    dtc: Bump version to v1.4.7
    
    We've accumulated a bunch of bugfixes, including considerable improvements
    to libfdt's memory safety, so get ready for another release.
    
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

while current head of dtc is:

commit 85e5d839847af54efab170f2b1331b2a6421e647 (HEAD)
Author: Claudio Fontana <cfontana@suse.de>
Date:   Tue May 12 12:33:15 2020 +0200

    Makefile: when building libfdt only, do not add unneeded deps
    
    implemented originally for the QEMU consumer of libfdt.
    
    Signed-off-by: Claudio Fontana <cfontana@suse.de>
    Message-Id: <20200512103315.1926-1-cfontana@suse.de>
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

> I have tried 'git clean -d -f', 'git reset --hard' and 'git pull'. I am now at 74208cd252c5da9d867270a178799abd802b9338 and still seeing the error with MakeFile.
> 

Since the change affects the dtc submodule, you should
'cd dtc && git diff' to see what these differences are,
and possibly 'git reset --hard' if you don't want them.
Then go back to the QEMU source dir and update the dtc
module with 'git submodule update dtc'.

>