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.18.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.18.patch')
| -rw-r--r-- | recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch index bfd1acb4..7ac1a399 100644 --- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch +++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
| 2 | 2 | ||
| 3 | Index: git/tools/pygrub/Makefile | 3 | diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile |
| 4 | =================================================================== | 4 | index 4963bc89c6..c1c05eb421 100644 |
| 5 | --- git.orig/tools/pygrub/Makefile | 5 | --- a/tools/pygrub/Makefile |
| 6 | +++ git/tools/pygrub/Makefile | 6 | +++ b/tools/pygrub/Makefile |
| 7 | @@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG | 7 | @@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA |
| 8 | all: build | 8 | all: build |
| 9 | .PHONY: build | 9 | .PHONY: build |
| 10 | build: | 10 | build: |
| @@ -19,13 +19,13 @@ Index: git/tools/pygrub/Makefile | |||
| 19 | - --root="$(DESTDIR)" --force | 19 | - --root="$(DESTDIR)" --force |
| 20 | + --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) | 20 | + --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) |
| 21 | $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub | 21 | $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub |
| 22 | 22 | set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ | |
| 23 | .PHONY: uninstall | 23 | "`readlink -f $(DESTDIR)/$(bindir)`" != \ |
| 24 | Index: git/tools/python/Makefile | 24 | diff --git a/tools/python/Makefile b/tools/python/Makefile |
| 25 | =================================================================== | 25 | index 437431c48e..0a99c2067e 100644 |
| 26 | --- git.orig/tools/python/Makefile | 26 | --- a/tools/python/Makefile |
| 27 | +++ git/tools/python/Makefile | 27 | +++ b/tools/python/Makefile |
| 28 | @@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG | 28 | @@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA |
| 29 | 29 | ||
| 30 | .PHONY: build | 30 | .PHONY: build |
| 31 | build: | 31 | build: |