diff options
author | Christopher Clark <christopher.w.clark@gmail.com> | 2020-07-17 14:03:47 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-07-20 14:47:15 -0400 |
commit | 5f0ded3423e010a23ac617f7811469e6c4b783b8 (patch) | |
tree | 343215b0b244393039c2c9182a75a45847a88ab6 /recipes-extended/xen/files | |
parent | 5524c6d0fbc371040b519013d81b6e945dfecbcb (diff) | |
download | meta-virtualization-5f0ded3423e010a23ac617f7811469e6c4b783b8.tar.gz |
xen, xen-tools: add recipes for Xen 4.14
Add a versioned-suffix pair of recipes for Xen 4.14, allowing selection
of which Xen version to build via setting PREFERRED_VERSION.
4.14 is currently still pre-release, so the new recipes for it set
DEFAULT_PREFERENCE to -1, and the default for now remains the existing
stable version. Forward ports of patches needed for 4.14 are included.
Implementation note: since both this version and the git recipe are
built from git branches -- important for Xen since significant updates
are made available there inbetween point releases -- the recipe includes
'stable' as a string in PV so as to distinguish it from 'git' in the git
recipe, and thereby allow PREFERRED_VERSION to select the correct recipe
in the situation where both happen to be configured with the same XEN_REL.
Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files')
-rw-r--r-- | recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch | 66 | ||||
-rw-r--r-- | recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch | 26 |
2 files changed, 92 insertions, 0 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 new file mode 100644 index 00000000..f0688fd9 --- /dev/null +++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch | |||
@@ -0,0 +1,66 @@ | |||
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) | ||
diff --git a/recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch b/recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch new file mode 100644 index 00000000..0e0a3dc4 --- /dev/null +++ b/recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 9cff3bf8425ccc593825fcde8ca5eaa32a43d04d Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Thu, 18 Jun 2020 09:05:22 -0400 | ||
4 | Subject: [PATCH] xen/build: temporarily inhibit Werror | ||
5 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
7 | Rebased on Xen 4.14: | ||
8 | Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com> | ||
9 | --- | ||
10 | tools/libxl/Makefile | 2 +- | ||
11 | xen/Rules.mk | 2 +- | ||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile | ||
15 | index 6da342ed61..c67560e269 100644 | ||
16 | --- a/tools/libxl/Makefile | ||
17 | +++ b/tools/libxl/Makefile | ||
18 | @@ -11,7 +11,7 @@ MINOR = 0 | ||
19 | XLUMAJOR = 4.14 | ||
20 | XLUMINOR = 0 | ||
21 | |||
22 | -CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ | ||
23 | +CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ | ||
24 | -Wno-declaration-after-statement -Wformat-nonliteral | ||
25 | CFLAGS += -I. -fPIC | ||
26 | |||