MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen-tools: refresh patch for 4.20 and drop 4.15 orphaned patch

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2024-09-25 21:58:49 +00:00
parent 7ea990b79d
commit c76b0dc40f
6 changed files with 100 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
View File

@ -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 <maciej.pijanowski@3mdeb.com>
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 <maciej.pijanowski@3mdeb.com>
Forward-ported to Xen 4.12.0
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Modified to support pygrub installation with python 3
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Forward-ported to Xen 4.14.0
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Forward-ported to Xen 4.15.0
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
---
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

24
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
View File

@ -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:

43
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch Normal file
View File

@ -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)

43
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch Normal file
View File

@ -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)

2
recipes-extended/xen/xen-tools_4.19.bb
View File

@ -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"

2
recipes-extended/xen/xen-tools_git.bb
View File

@ -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"