From c76b0dc40f115ee57494ed3bbcc2cb02395a4341 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 25 Sep 2024 21:58:49 +0000 Subject: 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 --- ...001-python-pygrub-pass-DISTUTILS-xen-4.15.patch | 73 ---------------------- ...001-python-pygrub-pass-DISTUTILS-xen-4.18.patch | 24 +++---- ...001-python-pygrub-pass-DISTUTILS-xen-4.19.patch | 43 +++++++++++++ ...001-python-pygrub-pass-DISTUTILS-xen-4.20.patch | 43 +++++++++++++ recipes-extended/xen/xen-tools_4.19.bb | 2 +- recipes-extended/xen/xen-tools_git.bb | 2 +- 6 files changed, 100 insertions(+), 87 deletions(-) delete mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch create mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch create mode 100644 recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch 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 @@ -From 6db88791d923167f160afbcadeffad84a4cbdbc5 Mon Sep 17 00:00:00 2001 -Message-Id: <6db88791d923167f160afbcadeffad84a4cbdbc5.1612262706.git.bertrand.marquis@arm.com> -From: Maciej Pijanowski -Date: Fri, 19 Oct 2018 11:01:37 +0200 -Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args - -Upstream-Status: Inappropriate [oe specific, python install issues] - -Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR) -as well as other parameters set by the OpenEmbedded build system. -This is especially useful when the target libdir is not the default one -(/usr/lib), but for example /usr/lib64. - -Signed-off-by: Maciej Pijanowski - -Forward-ported to Xen 4.12.0 -Signed-off-by: Christopher Clark - -Modified to support pygrub installation with python 3 -Signed-off-by: Christopher Clark - -Forward-ported to Xen 4.14.0 -Signed-off-by: Christopher Clark - -Forward-ported to Xen 4.15.0 -Signed-off-by: Bertrand Marquis - ---- - tools/pygrub/Makefile | 7 +++++-- - tools/python/Makefile | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile -index 37b2146214..ffb9270065 100644 ---- a/tools/pygrub/Makefile -+++ b/tools/pygrub/Makefile -@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt - all: build - .PHONY: build - build: -- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build -+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS) - - .PHONY: install - install: all -@@ -18,7 +18,10 @@ install: all - CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \ - LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \ - --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ -- --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force -+ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \ -+ $(DISTUTILS_INSTALL_ARGS) -+ rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub -+ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub - set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ - "`readlink -f $(DESTDIR)/$(bindir)`" != \ - "`readlink -f $(LIBEXEC_BIN)`" ]; then \ -diff --git a/tools/python/Makefile b/tools/python/Makefile -index cc76423647..5cb11ae453 100644 ---- a/tools/python/Makefile -+++ b/tools/python/Makefile -@@ -12,7 +12,7 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA - SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \ - SHLIB_libxenguest="$(SHLIB_libxenguest)" \ - SHLIB_libxenstore="$(SHLIB_libxenstore)" \ -- $(PYTHON) setup.py -+ $(PYTHON) setup.py $(DISTUTILS_BUILD_ARGS) - - .PHONY: build - build: --- -2.17.1 - 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 @@ Upstream-Status: Pending -Index: git/tools/pygrub/Makefile -=================================================================== ---- git.orig/tools/pygrub/Makefile -+++ git/tools/pygrub/Makefile -@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG +diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile +index 4963bc89c6..c1c05eb421 100644 +--- a/tools/pygrub/Makefile ++++ b/tools/pygrub/Makefile +@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA all: build .PHONY: build build: @@ -19,13 +19,13 @@ Index: git/tools/pygrub/Makefile - --root="$(DESTDIR)" --force + --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub - - .PHONY: uninstall -Index: git/tools/python/Makefile -=================================================================== ---- git.orig/tools/python/Makefile -+++ git/tools/python/Makefile -@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG + set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ + "`readlink -f $(DESTDIR)/$(bindir)`" != \ +diff --git a/tools/python/Makefile b/tools/python/Makefile +index 437431c48e..0a99c2067e 100644 +--- a/tools/python/Makefile ++++ b/tools/python/Makefile +@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA .PHONY: build build: diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch new file mode 100644 index 00000000..bfd1acb4 --- /dev/null +++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +Index: git/tools/pygrub/Makefile +=================================================================== +--- git.orig/tools/pygrub/Makefile ++++ git/tools/pygrub/Makefile +@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG + all: build + .PHONY: build + build: +- $(setup.py) build ++ $(setup.py) build $(DISTUTILS_BUILD_ARGS) + + .PHONY: install + install: all + $(INSTALL_DIR) $(DESTDIR)/$(bindir) + $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN) + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ +- --root="$(DESTDIR)" --force ++ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) + $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub + + .PHONY: uninstall +Index: git/tools/python/Makefile +=================================================================== +--- git.orig/tools/python/Makefile ++++ git/tools/python/Makefile +@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG + + .PHONY: build + build: +- $(setup.py) build ++ $(setup.py) build $(DISTUTILS_BUILD_ARGS) + + .PHONY: install + install: + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ +- --root="$(DESTDIR)" --force ++ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + 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 @@ +Upstream-Status: Pending + +Index: git/tools/pygrub/Makefile +=================================================================== +--- git.orig/tools/pygrub/Makefile ++++ git/tools/pygrub/Makefile +@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG + all: build + .PHONY: build + build: +- $(setup.py) build ++ $(setup.py) build $(DISTUTILS_BUILD_ARGS) + + .PHONY: install + install: all + $(INSTALL_DIR) $(DESTDIR)/$(bindir) + $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN) + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ +- --root="$(DESTDIR)" --force ++ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) + $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub + + .PHONY: uninstall +Index: git/tools/python/Makefile +=================================================================== +--- git.orig/tools/python/Makefile ++++ git/tools/python/Makefile +@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG + + .PHONY: build + build: +- $(setup.py) build ++ $(setup.py) build $(DISTUTILS_BUILD_ARGS) + + .PHONY: install + install: + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ +- --root="$(DESTDIR)" --force ++ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + diff --git a/recipes-extended/xen/xen-tools_4.19.bb b/recipes-extended/xen/xen-tools_4.19.bb index 68a9491f..2d467004 100644 --- a/recipes-extended/xen/xen-tools_4.19.bb +++ b/recipes-extended/xen/xen-tools_4.19.bb @@ -6,7 +6,7 @@ XEN_BRANCH ?= "stable-4.19" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \ + file://0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch \ " LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb index f4c6b353..b11b346f 100644 --- a/recipes-extended/xen/xen-tools_git.bb +++ b/recipes-extended/xen/xen-tools_git.bb @@ -6,7 +6,7 @@ XEN_BRANCH ?= "master" SRC_URI = " \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ - file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \ + file://0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch \ " LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" -- cgit v1.2.3-54-g00ecf