summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorBertrand Marquis <bertrand.marquis@arm.com>2021-02-18 15:05:14 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-03-04 22:40:57 -0500
commit8b3264687568351532b55a4bfd1e7f57556e5563 (patch)
tree9174c15bcaef80e0cd51733c1dbd7d37f86123f5 /recipes-extended
parentb3b655cd6758ccce49d68c019f082e93504a4be2 (diff)
downloadmeta-virtualization-8b3264687568351532b55a4bfd1e7f57556e5563.tar.gz
xen: Bump SRCREV to 4.14.1 and current master
Bump SRCREV version of xen recipes to use the latest 4.14 release (4.14.1) and the current status of master. This allows to remove some patches related to gcc 10 support which have now been merged in Xen. Xen-tools is modified to include the latest tools installed with Xen: - a rename of the bash-completion, - a new xl example, - xen-access, - xen-memshare (only available on x86). A new patch to fix python and pygrub is added as the makefiles have been deeply modified in 4.15 which require a new patch (but doing the same). Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch73
-rw-r--r--recipes-extended/xen/files/0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch60
-rw-r--r--recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch26
-rw-r--r--recipes-extended/xen/xen-tools.inc14
-rw-r--r--recipes-extended/xen/xen-tools_4.14.bb4
-rw-r--r--recipes-extended/xen/xen-tools_git.bb6
-rw-r--r--recipes-extended/xen/xen_4.14.bb2
-rw-r--r--recipes-extended/xen/xen_git.bb2
8 files changed, 92 insertions, 95 deletions
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
new file mode 100644
index 00000000..35cd9a81
--- /dev/null
+++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
@@ -0,0 +1,73 @@
1From 6db88791d923167f160afbcadeffad84a4cbdbc5 Mon Sep 17 00:00:00 2001
2Message-Id: <6db88791d923167f160afbcadeffad84a4cbdbc5.1612262706.git.bertrand.marquis@arm.com>
3From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
4Date: Fri, 19 Oct 2018 11:01:37 +0200
5Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args
6
7Upstream-Status: Xen: Inappropriate [oe specific, python install issues]
8
9Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR)
10as well as other parameters set by the OpenEmbedded build system.
11This is especially useful when the target libdir is not the default one
12(/usr/lib), but for example /usr/lib64.
13
14Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
15
16Forward-ported to Xen 4.12.0
17Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
18
19Modified to support pygrub installation with python 3
20Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
21
22Forward-ported to Xen 4.14.0
23Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
24
25Forward-ported to Xen 4.15.0
26Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
27
28---
29 tools/pygrub/Makefile | 7 +++++--
30 tools/python/Makefile | 2 +-
31 2 files changed, 6 insertions(+), 3 deletions(-)
32
33diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
34index 37b2146214..ffb9270065 100644
35--- a/tools/pygrub/Makefile
36+++ b/tools/pygrub/Makefile
37@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
38 all: build
39 .PHONY: build
40 build:
41- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
42+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
43
44 .PHONY: install
45 install: all
46@@ -18,7 +18,10 @@ install: all
47 CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
48 LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
49 --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
50- --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
51+ --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \
52+ $(DISTUTILS_INSTALL_ARGS)
53+ rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
54+ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
55 set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
56 "`readlink -f $(DESTDIR)/$(bindir)`" != \
57 "`readlink -f $(LIBEXEC_BIN)`" ]; then \
58diff --git a/tools/python/Makefile b/tools/python/Makefile
59index cc76423647..5cb11ae453 100644
60--- a/tools/python/Makefile
61+++ b/tools/python/Makefile
62@@ -12,7 +12,7 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
63 SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
64 SHLIB_libxenguest="$(SHLIB_libxenguest)" \
65 SHLIB_libxenstore="$(SHLIB_libxenstore)" \
66- $(PYTHON) setup.py
67+ $(PYTHON) setup.py $(DISTUTILS_BUILD_ARGS)
68
69 .PHONY: build
70 build:
71--
722.17.1
73
diff --git a/recipes-extended/xen/files/0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch b/recipes-extended/xen/files/0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch
deleted file mode 100644
index 0a136c90..00000000
--- a/recipes-extended/xen/files/0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 0dfddb2116e3757f77a691a3fe335173088d69dc Mon Sep 17 00:00:00 2001
2Message-Id: <0dfddb2116e3757f77a691a3fe335173088d69dc.1604734077.git.bertrand.marquis@arm.com>
3From: Bertrand Marquis <bertrand.marquis@arm.com>
4Date: Thu, 15 Oct 2020 10:16:09 +0100
5Subject: [PATCH] tools/xenpmd: Fix gcc10 snprintf warning
6
7Add a check for snprintf return code and ignore the entry if we get an
8error. This should in fact never happen and is more a trick to make gcc
9happy and prevent compilation errors.
10
11This is solving the following gcc warning when compiling for arm32 host
12platforms with optimization activated:
13xenpmd.c:92:37: error: '%s' directive output may be truncated writing
14between 4 and 2147483645 bytes into a region of size 271
15[-Werror=format-truncation=]
16
17This is also solving the following Debian bug:
18https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970802
19
20Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
21Acked-by: Wei Liu <wl@xen.org>
22---
23Upstream-status: Backport from 4.15
24---
25 tools/xenpmd/xenpmd.c | 9 +++++++--
26 1 file changed, 7 insertions(+), 2 deletions(-)
27
28diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c
29index 35fd1c931a..12b82cf43e 100644
30--- a/tools/xenpmd/xenpmd.c
31+++ b/tools/xenpmd/xenpmd.c
32@@ -102,6 +102,7 @@ FILE *get_next_battery_file(DIR *battery_dir,
33 FILE *file = 0;
34 struct dirent *dir_entries;
35 char file_name[284];
36+ int ret;
37
38 do
39 {
40@@ -111,11 +112,15 @@ FILE *get_next_battery_file(DIR *battery_dir,
41 if ( strlen(dir_entries->d_name) < 4 )
42 continue;
43 if ( battery_info_type == BIF )
44- snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
45+ ret = snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
46 dir_entries->d_name);
47 else
48- snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
49+ ret = snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
50 dir_entries->d_name);
51+ /* This should not happen but is needed to pass gcc checks */
52+ if (ret < 0)
53+ continue;
54+ file_name[sizeof(file_name) - 1] = '\0';
55 file = fopen(file_name, "r");
56 } while ( !file );
57
58--
592.17.1
60
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
deleted file mode 100644
index 0e0a3dc4..00000000
--- a/recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 9cff3bf8425ccc593825fcde8ca5eaa32a43d04d Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Thu, 18 Jun 2020 09:05:22 -0400
4Subject: [PATCH] xen/build: temporarily inhibit Werror
5
6Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
7Rebased on Xen 4.14:
8Signed-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
14diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
15index 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
diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index 0c69fece..722c5032 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -234,6 +234,8 @@ PACKAGES = " \
234 ${PN}-xl-examples \ 234 ${PN}-xl-examples \
235 ${PN}-xm \ 235 ${PN}-xm \
236 ${PN}-xm-examples \ 236 ${PN}-xm-examples \
237 ${PN}-xen-access \
238 ${PN}-xen-memshare \
237 " 239 "
238 240
239PROVIDES =+ " \ 241PROVIDES =+ " \
@@ -633,6 +635,7 @@ FILES_${PN}-xen-watchdog = "\
633 635
634FILES_${PN}-xl = "\ 636FILES_${PN}-xl = "\
635 ${sysconfdir}/bash_completion.d/xl.sh \ 637 ${sysconfdir}/bash_completion.d/xl.sh \
638 ${sysconfdir}/bash_completion.d/xl \
636 ${sysconfdir}/xen/xl.conf \ 639 ${sysconfdir}/xen/xl.conf \
637 ${libdir}/xen/bin/libxl-save-helper \ 640 ${libdir}/xen/bin/libxl-save-helper \
638 ${sbindir}/xl \ 641 ${sbindir}/xl \
@@ -642,6 +645,7 @@ FILES_${PN}-xl = "\
642FILES_${PN}-xl-examples = "\ 645FILES_${PN}-xl-examples = "\
643 ${sysconfdir}/xen/xlexample.hvm \ 646 ${sysconfdir}/xen/xlexample.hvm \
644 ${sysconfdir}/xen/xlexample.pvlinux \ 647 ${sysconfdir}/xen/xlexample.pvlinux \
648 ${sysconfdir}/xen/xlexample.pvhlinux \
645 " 649 "
646 650
647FILES_${PN}-xm-examples = "\ 651FILES_${PN}-xm-examples = "\
@@ -692,6 +696,16 @@ FILES_${PN}-xendomains += "\
692 ${sysconfdir}/sysconfig/xendomains \ 696 ${sysconfdir}/sysconfig/xendomains \
693 ${systemd_unitdir}/system/xendomains.service \ 697 ${systemd_unitdir}/system/xendomains.service \
694 " 698 "
699FILES_${PN}-xen-access += "\
700 ${sbindir}/xen-access \
701 "
702
703FILES_${PN}-xen-memshare += "\
704 ${sbindir}/xen-memshare \
705 "
706
707# memshare is only built for x86, so allow empty package for other archs
708ALLOW_EMPTY_${PN}-xen-memshare = "1"
695 709
696INSANE_SKIP_${PN} = "already-stripped" 710INSANE_SKIP_${PN} = "already-stripped"
697 711
diff --git a/recipes-extended/xen/xen-tools_4.14.bb b/recipes-extended/xen/xen-tools_4.14.bb
index 73a52bc5..a79b41d9 100644
--- a/recipes-extended/xen/xen-tools_4.14.bb
+++ b/recipes-extended/xen/xen-tools_4.14.bb
@@ -1,4 +1,4 @@
1SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e" 1SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
2 2
3XEN_REL ?= "4.14" 3XEN_REL ?= "4.14"
4XEN_BRANCH ?= "stable-${XEN_REL}" 4XEN_BRANCH ?= "stable-${XEN_REL}"
@@ -6,8 +6,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
6SRC_URI = " \ 6SRC_URI = " \
7 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ 7 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
8 file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \ 8 file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
9 file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
10 file://0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch \
11 " 9 "
12 10
13LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5" 11LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index 1f6be1d1..71850ee3 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,13 +1,11 @@
1SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b" 1SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
2 2
3XEN_REL ?= "4.15" 3XEN_REL ?= "4.15"
4XEN_BRANCH ?= "master" 4XEN_BRANCH ?= "master"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ 7 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
8 file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \ 8 file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
9 file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
10 file://0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch \
11 " 9 "
12 10
13LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5" 11LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
diff --git a/recipes-extended/xen/xen_4.14.bb b/recipes-extended/xen/xen_4.14.bb
index 91e89883..653e3b63 100644
--- a/recipes-extended/xen/xen_4.14.bb
+++ b/recipes-extended/xen/xen_4.14.bb
@@ -1,4 +1,4 @@
1SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e" 1SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
2 2
3XEN_REL ?= "4.14" 3XEN_REL ?= "4.14"
4XEN_BRANCH ?= "stable-${XEN_REL}" 4XEN_BRANCH ?= "stable-${XEN_REL}"
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index 57791fc4..2b62c5c3 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,4 +1,4 @@
1SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b" 1SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
2 2
3XEN_REL ?= "4.15" 3XEN_REL ?= "4.15"
4XEN_BRANCH ?= "master" 4XEN_BRANCH ?= "master"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 06:39:40 +0000