diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-09-25 21:58:49 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-10-03 01:28:52 +0000 |
| commit | c76b0dc40f115ee57494ed3bbcc2cb02395a4341 (patch) | |
| tree | 75e526f3537b1a76abb766ab24dd59ce0687359c /recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch | |
| parent | 7ea990b79d1937b75c88ae9afb3c9efe3faa75b8 (diff) | |
| download | meta-virtualization-c76b0dc40f115ee57494ed3bbcc2cb02395a4341.tar.gz | |
xen-tools: refresh patch for 4.20 and drop 4.15 orphaned patch
The xen-tools patch for 4.20 was incorrectly using the 4.19
context version.
With this cleanup, we should be able to build 4.18, 4.19 and
4.20 out of master.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch')
| -rw-r--r-- | recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch new file mode 100644 index 00000000..bfd1acb4 --- /dev/null +++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Index: git/tools/pygrub/Makefile | ||
| 4 | =================================================================== | ||
| 5 | --- git.orig/tools/pygrub/Makefile | ||
| 6 | +++ git/tools/pygrub/Makefile | ||
| 7 | @@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG | ||
| 8 | all: build | ||
| 9 | .PHONY: build | ||
| 10 | build: | ||
| 11 | - $(setup.py) build | ||
| 12 | + $(setup.py) build $(DISTUTILS_BUILD_ARGS) | ||
| 13 | |||
| 14 | .PHONY: install | ||
| 15 | install: all | ||
| 16 | $(INSTALL_DIR) $(DESTDIR)/$(bindir) | ||
| 17 | $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN) | ||
| 18 | $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ | ||
| 19 | - --root="$(DESTDIR)" --force | ||
| 20 | + --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) | ||
| 21 | $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub | ||
| 22 | |||
| 23 | .PHONY: uninstall | ||
| 24 | Index: git/tools/python/Makefile | ||
| 25 | =================================================================== | ||
| 26 | --- git.orig/tools/python/Makefile | ||
| 27 | +++ git/tools/python/Makefile | ||
| 28 | @@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG | ||
| 29 | |||
| 30 | .PHONY: build | ||
| 31 | build: | ||
| 32 | - $(setup.py) build | ||
| 33 | + $(setup.py) build $(DISTUTILS_BUILD_ARGS) | ||
| 34 | |||
| 35 | .PHONY: install | ||
| 36 | install: | ||
| 37 | $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) | ||
| 38 | $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ | ||
| 39 | - --root="$(DESTDIR)" --force | ||
| 40 | + --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) | ||
| 41 | $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) | ||
| 42 | $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) | ||
| 43 | |||