The first commit is the best "easy" fix I can come up with. I'd like this to be a temporary workaround, as it's not optimal: copying the stage 2 dir copies a lot more stuff than you'd find in a typical sysroot. We could try and remove the bits we don't need, but it's difficult to know what, and we'd have to keep it in sync with upstream. I'm hoping upstream will fix x.py install soon...
The second commit allows us to run .buildbot.sh in scenarios where there isn't necessarily a bors merge commit on the top of the branch (i.e. during a manual or forced build). I needed this to test my changes and it seems generally useful.
x.py install
seems to be broken at the moment and this in turn broke our CI. This branch proposes a workaround.The first commit is the best "easy" fix I can come up with. I'd like this to be a temporary workaround, as it's not optimal: copying the stage 2 dir copies a lot more stuff than you'd find in a typical sysroot. We could try and remove the bits we don't need, but it's difficult to know what, and we'd have to keep it in sync with upstream. I'm hoping upstream will fix
x.py
install soon...Tested on https://github.com/softdevteam/yk/pull/206. And here is the forced build log.
The second commit allows us to run
.buildbot.sh
in scenarios where there isn't necessarily a bors merge commit on the top of the branch (i.e. during a manual or forced build). I needed this to test my changes and it seems generally useful.