On Tue, Sep 21, 2021 at 01:40:36PM +0100, Peter Maydell wrote: > On Sat, 18 Sept 2021 at 10:34, Paolo Bonzini <pbonz...@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 :|
