diff options
Diffstat (limited to 'recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch')
| -rw-r--r-- | recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch deleted file mode 100644 index 476f5ddc..00000000 --- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch +++ /dev/null | |||
| @@ -1,73 +0,0 @@ | |||
| 1 | From 6db88791d923167f160afbcadeffad84a4cbdbc5 Mon Sep 17 00:00:00 2001 | ||
| 2 | Message-Id: <6db88791d923167f160afbcadeffad84a4cbdbc5.1612262706.git.bertrand.marquis@arm.com> | ||
| 3 | From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
| 4 | Date: Fri, 19 Oct 2018 11:01:37 +0200 | ||
| 5 | Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args | ||
| 6 | |||
| 7 | Upstream-Status: Inappropriate [oe specific, python install issues] | ||
| 8 | |||
| 9 | Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR) | ||
| 10 | as well as other parameters set by the OpenEmbedded build system. | ||
| 11 | This is especially useful when the target libdir is not the default one | ||
| 12 | (/usr/lib), but for example /usr/lib64. | ||
| 13 | |||
| 14 | Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
| 15 | |||
| 16 | Forward-ported to Xen 4.12.0 | ||
| 17 | Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> | ||
| 18 | |||
| 19 | Modified to support pygrub installation with python 3 | ||
| 20 | Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> | ||
| 21 | |||
| 22 | Forward-ported to Xen 4.14.0 | ||
| 23 | Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com> | ||
| 24 | |||
| 25 | Forward-ported to Xen 4.15.0 | ||
| 26 | Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> | ||
| 27 | |||
| 28 | --- | ||
| 29 | tools/pygrub/Makefile | 7 +++++-- | ||
| 30 | tools/python/Makefile | 2 +- | ||
| 31 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
| 32 | |||
| 33 | diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile | ||
| 34 | index 37b2146214..ffb9270065 100644 | ||
| 35 | --- a/tools/pygrub/Makefile | ||
| 36 | +++ b/tools/pygrub/Makefile | ||
| 37 | @@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt | ||
| 38 | all: build | ||
| 39 | .PHONY: build | ||
| 40 | build: | ||
| 41 | - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build | ||
| 42 | + CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS) | ||
| 43 | |||
| 44 | .PHONY: install | ||
| 45 | install: all | ||
| 46 | @@ -18,7 +18,10 @@ install: all | ||
| 47 | CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \ | ||
| 48 | LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \ | ||
| 49 | --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ | ||
| 50 | - --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force | ||
| 51 | + --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \ | ||
| 52 | + $(DISTUTILS_INSTALL_ARGS) | ||
| 53 | + rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub | ||
| 54 | + $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub | ||
| 55 | set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ | ||
| 56 | "`readlink -f $(DESTDIR)/$(bindir)`" != \ | ||
| 57 | "`readlink -f $(LIBEXEC_BIN)`" ]; then \ | ||
| 58 | diff --git a/tools/python/Makefile b/tools/python/Makefile | ||
| 59 | index cc76423647..5cb11ae453 100644 | ||
| 60 | --- a/tools/python/Makefile | ||
| 61 | +++ b/tools/python/Makefile | ||
| 62 | @@ -12,7 +12,7 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA | ||
| 63 | SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \ | ||
| 64 | SHLIB_libxenguest="$(SHLIB_libxenguest)" \ | ||
| 65 | SHLIB_libxenstore="$(SHLIB_libxenstore)" \ | ||
| 66 | - $(PYTHON) setup.py | ||
| 67 | + $(PYTHON) setup.py $(DISTUTILS_BUILD_ARGS) | ||
| 68 | |||
| 69 | .PHONY: build | ||
| 70 | build: | ||
| 71 | -- | ||
| 72 | 2.17.1 | ||
| 73 | |||
