* Makefile has local changes that will be overwritten
@ 2021-02-01 14:23 Programmingkid
2021-02-01 14:48 ` Dan Streetman
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Programmingkid @ 2021-02-01 14:23 UTC (permalink / raw)
To: Peter Maydell, QEMU Developers, ddstreet
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
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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: Makefile has local changes that will be overwritten 2021-02-01 14:23 Makefile has local changes that will be overwritten Programmingkid @ 2021-02-01 14:48 ` Dan Streetman 2021-02-01 14:52 ` Peter Maydell 2021-02-01 15:07 ` Programmingkid 2021-02-01 14:58 ` Stefan Weil 2021-02-01 15:46 ` Daniel P. Berrangé 2 siblings, 2 replies; 15+ messages in thread From: Dan Streetman @ 2021-02-01 14:48 UTC (permalink / raw) To: Programmingkid; +Cc: Peter Maydell, QEMU Developers 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:48 ` Dan Streetman @ 2021-02-01 14:52 ` Peter Maydell 2021-02-01 15:30 ` Programmingkid 2021-02-01 15:07 ` Programmingkid 1 sibling, 1 reply; 15+ messages in thread From: Peter Maydell @ 2021-02-01 14:52 UTC (permalink / raw) To: Dan Streetman; +Cc: Programmingkid, QEMU Developers 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 ? thanks -- PMM ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:52 ` Peter Maydell @ 2021-02-01 15:30 ` Programmingkid 2021-02-02 9:26 ` Greg Kurz 0 siblings, 1 reply; 15+ messages in thread From: Programmingkid @ 2021-02-01 15:30 UTC (permalink / raw) To: Peter Maydell; +Cc: Dan Streetman, QEMU Developers > 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 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. ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 15:30 ` Programmingkid @ 2021-02-02 9:26 ` Greg Kurz 2021-02-02 12:47 ` Warner Losh 0 siblings, 1 reply; 15+ messages in thread From: Greg Kurz @ 2021-02-02 9:26 UTC (permalink / raw) To: Programmingkid; +Cc: Dan Streetman, Peter Maydell, QEMU Developers 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'. > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-02 9:26 ` Greg Kurz @ 2021-02-02 12:47 ` Warner Losh 0 siblings, 0 replies; 15+ messages in thread From: Warner Losh @ 2021-02-02 12:47 UTC (permalink / raw) To: Greg Kurz; +Cc: Dan Streetman, Programmingkid, QEMU Developers, Peter Maydell [-- Attachment #1: Type: text/plain, Size: 3500 bytes --] On Tue, Feb 2, 2021, 2:27 AM Greg Kurz <groug@kaod.org> wrote: > 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: > I see this all the time while bisecting and moving the version around a lot. It seems a git submodule bug to me and unrelated to Makefile with local changes. .. Warner 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'. > > > > > > [-- Attachment #2: Type: text/html, Size: 5696 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:48 ` Dan Streetman 2021-02-01 14:52 ` Peter Maydell @ 2021-02-01 15:07 ` Programmingkid 2021-02-01 15:21 ` Dan Streetman 1 sibling, 1 reply; 15+ messages in thread From: Programmingkid @ 2021-02-01 15:07 UTC (permalink / raw) To: Dan Streetman; +Cc: Peter Maydell, QEMU Developers > On Feb 1, 2021, at 9:48 AM, 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? 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 15:07 ` Programmingkid @ 2021-02-01 15:21 ` Dan Streetman 0 siblings, 0 replies; 15+ messages in thread From: Dan Streetman @ 2021-02-01 15:21 UTC (permalink / raw) To: Programmingkid; +Cc: Peter Maydell, QEMU Developers On Mon, Feb 1, 2021 at 10:07 AM Programmingkid <programmingkidx@gmail.com> wrote: > > > > > On Feb 1, 2021, at 9:48 AM, 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? > > 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8 It doesn't fail for me, as Peter said you should check what uncommitted changes you have in your makefile. > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:23 Makefile has local changes that will be overwritten Programmingkid 2021-02-01 14:48 ` 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 15:46 ` Daniel P. Berrangé 2 siblings, 2 replies; 15+ messages in thread From: Stefan Weil @ 2021-02-01 14:58 UTC (permalink / raw) To: Programmingkid, Peter Maydell, QEMU Developers, ddstreet Am 01.02.21 um 15:23 schrieb Programmingkid: > 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 I suggest to start with a clean installation (or clean your existing installation manually, especially remove the generated Makefile) and run configure from a subdirectory: mkdir -p build && cd build && ../configure --target-list=i386-softmmu Running ./configure is no longer supported. Regards, Stefan ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:58 ` Stefan Weil @ 2021-02-01 15:03 ` Peter Maydell 2021-02-01 15:36 ` Programmingkid 1 sibling, 0 replies; 15+ messages in thread From: Peter Maydell @ 2021-02-01 15:03 UTC (permalink / raw) To: Stefan Weil; +Cc: Dan Streetman, Programmingkid, QEMU Developers On Mon, 1 Feb 2021 at 14:58, Stefan Weil <stefan.weil@weilnetz.de> wrote: > Running ./configure is no longer supported. Yes it is; it is a convenience wrapper for "do the configure and make in a subdirectory named 'build' which we create for you". thanks -- PMM ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 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 1 sibling, 1 reply; 15+ messages in thread From: Programmingkid @ 2021-02-01 15:36 UTC (permalink / raw) To: Stefan Weil; +Cc: ddstreet, Peter Maydell, QEMU Developers > On Feb 1, 2021, at 9:58 AM, Stefan Weil <stefan.weil@weilnetz.de> wrote: > > Am 01.02.21 um 15:23 schrieb Programmingkid: > >> 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 > > > I suggest to start with a clean installation (or clean your existing installation manually, especially remove the generated Makefile) and run configure from a subdirectory: > > mkdir -p build && cd build && ../configure --target-list=i386-softmmu > > Running ./configure is no longer supported. > > Regards, > > Stefan 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'. If you require use of an alternative GIT binary (for example to enable use of a transparent proxy), then please specify it by running configure by with the '--with-git' argument. e.g. $ ./configure --with-git='tsocks git' Alternatively you may disable automatic GIT submodule checkout with: $ ./configure --with-git-submodules=validate and then manually update submodules prior to running make, with: $ scripts/git-submodule.sh update ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 meson dtc capstone slirp ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 15:36 ` Programmingkid @ 2021-02-01 16:04 ` Stefan Weil 2021-02-01 16:08 ` Programmingkid 0 siblings, 1 reply; 15+ messages in thread From: Stefan Weil @ 2021-02-01 16:04 UTC (permalink / raw) To: Programmingkid; +Cc: ddstreet, Peter Maydell, QEMU Developers 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 16:04 ` Stefan Weil @ 2021-02-01 16:08 ` Programmingkid 0 siblings, 0 replies; 15+ messages in thread From: Programmingkid @ 2021-02-01 16:08 UTC (permalink / raw) To: Stefan Weil; +Cc: ddstreet, Peter Maydell, QEMU Developers > On Feb 1, 2021, at 11:04 AM, Stefan Weil <stefan.weil@weilnetz.de> wrote: > > 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? diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 > "git -C dtc reset --hard" might fix the problem for you. This does make configure work now :) Thank you. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 14:23 Makefile has local changes that will be overwritten Programmingkid 2021-02-01 14:48 ` Dan Streetman 2021-02-01 14:58 ` Stefan Weil @ 2021-02-01 15:46 ` Daniel P. Berrangé 2021-02-01 16:06 ` Programmingkid 2 siblings, 1 reply; 15+ messages in thread From: Daniel P. Berrangé @ 2021-02-01 15:46 UTC (permalink / raw) To: Programmingkid; +Cc: ddstreet, Peter Maydell, QEMU Developers 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 ? > > 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. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Makefile has local changes that will be overwritten 2021-02-01 15:46 ` Daniel P. Berrangé @ 2021-02-01 16:06 ` Programmingkid 0 siblings, 0 replies; 15+ messages in thread From: Programmingkid @ 2021-02-01 16:06 UTC (permalink / raw) To: "Daniel P. Berrangé" Cc: ddstreet, Peter Maydell, QEMU Developers > 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. ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-02-02 12:49 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-01 14:23 Makefile has local changes that will be overwritten Programmingkid 2021-02-01 14:48 ` Dan Streetman 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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.