From: Dan Streetman <ddstreet@canonical.com>
To: Programmingkid <programmingkidx@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: Makefile has local changes that will be overwritten
Date: Mon, 1 Feb 2021 09:48:25 -0500 [thread overview]
Message-ID: <CAOZ2QJOq6GNXMWkk_1oxqtT_GYW8FmXT8jYGHzyROXC_yoWfxA@mail.gmail.com> (raw)
In-Reply-To: <B8D9E184-5C5A-4A15-BF48-927F0138F0DE@gmail.com>
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?
>
> 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.
>
>
> My Info:
> Mac OS 11.1
> Arm64 CPU
next prev parent reply other threads:[~2021-02-01 14:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 14:23 Makefile has local changes that will be overwritten Programmingkid
2021-02-01 14:48 ` Dan Streetman [this message]
2021-02-01 14:52 ` Peter Maydell
2021-02-01 15:30 ` Programmingkid
2021-02-02 9:26 ` Greg Kurz
2021-02-02 12:47 ` Warner Losh
2021-02-01 15:07 ` Programmingkid
2021-02-01 15:21 ` Dan Streetman
2021-02-01 14:58 ` Stefan Weil
2021-02-01 15:03 ` Peter Maydell
2021-02-01 15:36 ` Programmingkid
2021-02-01 16:04 ` Stefan Weil
2021-02-01 16:08 ` Programmingkid
2021-02-01 15:46 ` Daniel P. Berrangé
2021-02-01 16:06 ` Programmingkid
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOZ2QJOq6GNXMWkk_1oxqtT_GYW8FmXT8jYGHzyROXC_yoWfxA@mail.gmail.com \
--to=ddstreet@canonical.com \
--cc=peter.maydell@linaro.org \
--cc=programmingkidx@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).