From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL 0/3] Update meson version
Date: Tue, 21 Sep 2021 13:48:31 +0100 [thread overview]
Message-ID: <YUnUn100vx++0n5C@redhat.com> (raw)
In-Reply-To: <CAFEAcA_07d87j7y1qnBeTuoKQw=9=fY0Ci=6ky=XxBQbuEqDnw@mail.gmail.com>
On Tue, Sep 21, 2021 at 01:40:36PM +0100, Peter Maydell wrote:
> On Sat, 18 Sept 2021 at 10:34, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > The following changes since commit 831aaf24967a49d7750090b9dcfd6bf356f16529:
> >
> > Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request' into staging (2021-09-14 18:14:56 +0100)
> >
> > are available in the Git repository at:
> >
> > https://gitlab.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to ccc3f971c37bd2202a21abc9f0be093f10426364:
> >
> > hexagon: use env keyword argument to pass PYTHONPATH (2021-09-15 09:12:55 +0200)
> >
> > ----------------------------------------------------------------
> > * Update Meson to 0.58.2
> >
> > ----------------------------------------------------------------
> > Paolo Bonzini (3):
> > meson: bump submodule to 0.58.2
> > meson: switch minimum meson version to 0.58.2
> > hexagon: use env keyword argument to pass PYTHONPATH
>
> So, I tried merging this, ran into some "is this an issue with this
> pullreq or is it just an intermittent or infrastructure" issues,
> and decided to postpone the merge for a bit and retry it later.
>
> It has made an absolute mess of my incremental build setups.
> They now all fail with errors like this, even after having blown
> away the build directory and re-created it:
Might want to 'git submodule deinit --all --force' to purge
all currently checked out submodules, so it'll then re-init
them in a clean (older) state. In theory this should be handled
by the git-submodule.sh script we have in QEMU, but 'deinit' is
a big hammer to try if wierd things appear to be happening
despite cleaning the build dir.
> Is there anything that can be done to make meson version bumps
> not a horrific pain to back out ? This seems to go wrong pretty
> much every time.
Save your previous 'build' directory contents somewhere safe
and record the submodule checkout hashes, so they can be
reset to that ?
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 :|
next prev parent reply other threads:[~2021-09-21 12:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 9:31 [PULL 0/3] Update meson version Paolo Bonzini
2021-09-18 9:31 ` [PULL 1/3] meson: bump submodule to 0.58.2 Paolo Bonzini
2021-09-18 9:31 ` [PULL 2/3] meson: switch minimum meson version " Paolo Bonzini
2021-09-18 9:31 ` [PULL 3/3] hexagon: use env keyword argument to pass PYTHONPATH Paolo Bonzini
2021-09-21 12:40 ` [PULL 0/3] Update meson version Peter Maydell
2021-09-21 12:48 ` Daniel P. Berrangé [this message]
2021-09-21 12:55 ` Peter Maydell
2021-09-21 13:12 ` Paolo Bonzini
2021-09-21 13:14 ` Paolo Bonzini
2021-09-22 18:22 ` Peter Maydell
2021-09-23 8:25 ` Paolo Bonzini
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=YUnUn100vx++0n5C@redhat.com \
--to=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--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).