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

xen: Bump SRCREV to 4.14.1 and current master

Browse Source 
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>
This commit is contained in:
Bertrand Marquis 2021-02-18 15:05:14 +00:00 committed by Bruce Ashfield
parent a4439b76db
commit 55ccbab52e
8 changed files with 92 additions and 95 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 Normal file
View File

@ -0,0 +1,73 @@
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: Xen: 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

60
recipes-extended/xen/files/0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch
View File

@ -1,60 +0,0 @@
From 0dfddb2116e3757f77a691a3fe335173088d69dc Mon Sep 17 00:00:00 2001
Message-Id: <0dfddb2116e3757f77a691a3fe335173088d69dc.1604734077.git.bertrand.marquis@arm.com>
From: Bertrand Marquis <bertrand.marquis@arm.com>
Date: Thu, 15 Oct 2020 10:16:09 +0100
Subject: [PATCH] tools/xenpmd: Fix gcc10 snprintf warning
Add a check for snprintf return code and ignore the entry if we get an
error. This should in fact never happen and is more a trick to make gcc
happy and prevent compilation errors.
This is solving the following gcc warning when compiling for arm32 host
platforms with optimization activated:
xenpmd.c:92:37: error: '%s' directive output may be truncated writing
between 4 and 2147483645 bytes into a region of size 271
[-Werror=format-truncation=]
This is also solving the following Debian bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=970802
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Wei Liu <wl@xen.org>
---
Upstream-status: Backport from 4.15
---
tools/xenpmd/xenpmd.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c
index 35fd1c931a..12b82cf43e 100644
--- a/tools/xenpmd/xenpmd.c
+++ b/tools/xenpmd/xenpmd.c
@@ -102,6 +102,7 @@ FILE *get_next_battery_file(DIR *battery_dir,
FILE *file = 0;
struct dirent *dir_entries;
char file_name[284];
+ int ret;
do
{
@@ -111,11 +112,15 @@ FILE *get_next_battery_file(DIR *battery_dir,
if ( strlen(dir_entries->d_name) < 4 )
continue;
if ( battery_info_type == BIF )
- snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
+ ret = snprintf(file_name, sizeof(file_name), BATTERY_INFO_FILE_PATH,
dir_entries->d_name);
else
- snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
+ ret = snprintf(file_name, sizeof(file_name), BATTERY_STATE_FILE_PATH,
dir_entries->d_name);
+ /* This should not happen but is needed to pass gcc checks */
+ if (ret < 0)
+ continue;
+ file_name[sizeof(file_name) - 1] = '\0';
file = fopen(file_name, "r");
} while ( !file );
--
2.17.1

26
recipes-extended/xen/files/0001-xen-build-temporarily-inhibit-Werror-4.14.patch
View File

@ -1,26 +0,0 @@
From 9cff3bf8425ccc593825fcde8ca5eaa32a43d04d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 18 Jun 2020 09:05:22 -0400
Subject: [PATCH] xen/build: temporarily inhibit Werror
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Rebased on Xen 4.14:
Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
---
tools/libxl/Makefile | 2 +-
xen/Rules.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 6da342ed61..c67560e269 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -11,7 +11,7 @@ MINOR = 0
XLUMAJOR = 4.14
XLUMINOR = 0
-CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
-Wno-declaration-after-statement -Wformat-nonliteral
CFLAGS += -I. -fPIC

14
recipes-extended/xen/xen-tools.inc
View File

@ -234,6 +234,8 @@ PACKAGES = " \
${PN}-xl-examples \
${PN}-xm \
${PN}-xm-examples \
${PN}-xen-access \
${PN}-xen-memshare \
"
PROVIDES =+ " \
@ -633,6 +635,7 @@ FILES_${PN}-xen-watchdog = "\
FILES_${PN}-xl = "\
${sysconfdir}/bash_completion.d/xl.sh \
${sysconfdir}/bash_completion.d/xl \
${sysconfdir}/xen/xl.conf \
${libdir}/xen/bin/libxl-save-helper \
${sbindir}/xl \
@ -642,6 +645,7 @@ FILES_${PN}-xl = "\
FILES_${PN}-xl-examples = "\
${sysconfdir}/xen/xlexample.hvm \
${sysconfdir}/xen/xlexample.pvlinux \
${sysconfdir}/xen/xlexample.pvhlinux \
"
FILES_${PN}-xm-examples = "\
@ -692,6 +696,16 @@ FILES_${PN}-xendomains += "\
${sysconfdir}/sysconfig/xendomains \
${systemd_unitdir}/system/xendomains.service \
"
FILES_${PN}-xen-access += "\
${sbindir}/xen-access \
"
FILES_${PN}-xen-memshare += "\
${sbindir}/xen-memshare \
"
# memshare is only built for x86, so allow empty package for other archs
ALLOW_EMPTY_${PN}-xen-memshare = "1"
INSANE_SKIP_${PN} = "already-stripped"

4
recipes-extended/xen/xen-tools_4.14.bb
View File

@ -1,4 +1,4 @@
SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e"
SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
XEN_REL ?= "4.14"
XEN_BRANCH ?= "stable-${XEN_REL}"
@ -6,8 +6,6 @@ XEN_BRANCH ?= "stable-${XEN_REL}"
SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
file://0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch \
"
LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"

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

@ -1,13 +1,11 @@
SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b"
SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
XEN_REL ?= "4.15"
XEN_BRANCH ?= "master"
SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
file://0001-tools-xenpmd-Fix-gcc10-snprintf-warning.patch \
file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
"
LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"

2
recipes-extended/xen/xen_4.14.bb
View File

@ -1,4 +1,4 @@
SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e"
SRCREV ?= "ad844aa352559a8b1f36e391a27d9d7dbddbdc36"
XEN_REL ?= "4.14"
XEN_BRANCH ?= "stable-${XEN_REL}"

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

@ -1,4 +1,4 @@
SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b"
SRCREV ?= "9dc687f155a57216b83b17f9cde55dd43e06b0cd"
XEN_REL ?= "4.15"
XEN_BRANCH ?= "master"