diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-02-24 12:48:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-02-24 12:48:14 +0000 |
| commit | fa435db8ce1dff3b15e3f59a12f55f7b3a347b08 (patch) | |
| tree | 0637100e8a0eb8e9f6c03ec95688adccd018be3a /python/Makefile | |
| parent | 4aa2e497a98bafe962e72997f67a369e4b52d9c1 (diff) | |
| parent | 89d38c74f4b69a93696392b55a9fee573055d78b (diff) | |
| download | focaccia-qemu-fa435db8ce1dff3b15e3f59a12f55f7b3a347b08.tar.gz focaccia-qemu-fa435db8ce1dff3b15e3f59a12f55f7b3a347b08.zip | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Python patches New functionality in qmp-shell from Dan, and some packaging fixes. # gpg: Signature made Wed 23 Feb 2022 22:08:35 GMT # gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full] # Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB # Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E * remotes/jsnow-gitlab/tags/python-pull-request: MAINTAINERS: python - remove ehabkost and add bleal Revert "python: pin setuptools below v60.0.0" Python: add setuptools v60.0 workaround Python: discourage direct setup.py install python: support recording QMP session to a file python: introduce qmp-shell-wrap convenience tool Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/Makefile')
| -rw-r--r-- | python/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/python/Makefile b/python/Makefile index 949c472624..3334311362 100644 --- a/python/Makefile +++ b/python/Makefile @@ -68,8 +68,6 @@ $(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate: setup.cfg echo "ACTIVATE $(QEMU_VENV_DIR)"; \ . $(QEMU_VENV_DIR)/bin/activate; \ echo "INSTALL qemu[devel] $(QEMU_VENV_DIR)"; \ - pip install --disable-pip-version-check \ - "setuptools<60.0.0" 1>/dev/null; \ make develop 1>/dev/null; \ ) @touch $(QEMU_VENV_DIR) |