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