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

xen: upgrade to Xen 4.14 as default and advance the git recipe version

Browse Source 
Release announcement for Xen 4.14:
https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg01263.html

Make the 4.14 recipe the default preference and advance the git recipe
onto the current 4.15 development branch. Retire the patches for the
earlier versions.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Christopher Clark 2020-07-30 10:20:39 -07:00 committed by Bruce Ashfield
parent 00b472ca43
commit f84f789e96
8 changed files with 16 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch
View File

@ -1,64 +0,0 @@
From d79dcc2002008c58683de82f06c168d6eea57991 Mon Sep 17 00:00:00 2001
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
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>
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 3063c49..513314b 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -10,14 +10,17 @@ INSTALL_LOG = build/installed_files.txt
all: build
.PHONY: build
build:
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
.PHONY: install
install: all
$(INSTALL_DIR) $(DESTDIR)/$(bindir)
CC="$(CC)" CFLAGS="$(PY_CFLAGS)" 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 541858e..4d4a344 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
.PHONY: build
build:
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build
+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
.PHONY: install
install:
@@ -18,7 +18,7 @@ install:
CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) \
setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
- --root="$(DESTDIR)" --force
+ --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
$(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
$(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)

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

@ -1,42 +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.13:
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
@@ -14,7 +14,7 @@ MINOR = 0
XLUMAJOR = 4.13
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
diff --git a/xen/Rules.mk b/xen/Rules.mk
index a151b3f625..a05ceec1e5 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -54,7 +54,7 @@ CFLAGS += -fomit-frame-pointer
endif
CFLAGS += -nostdinc -fno-builtin -fno-common
-CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith
+CFLAGS += -Wredundant-decls -Wno-pointer-arith
$(call cc-option-add,CFLAGS,CC,-Wvla)
CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h
CFLAGS-$(CONFIG_DEBUG_INFO) += -g
--
2.19.1

39
recipes-extended/xen/files/xen-tools-kdd-fix-build-again.patch
View File

@ -1,39 +0,0 @@
From d44cbbe0f3243afcc56e47dcfa97bbfe23e46fbb Mon Sep 17 00:00:00 2001
From: Wei Liu <wl@xen.org>
Date: Fri, 3 Jul 2020 20:10:01 +0000
Subject: [PATCH] kdd: fix build again
Restore Tim's patch. The one that was committed was recreated by me
because git didn't accept my saved copy. I made some mistakes while
recreating that patch and here we are.
Fixes: 3471cafbdda3 ("kdd: stop using [0] arrays to access packet contents")
Reported-by: Michael Young <m.a.young@durham.ac.uk>
Signed-off-by: Wei Liu <wl@xen.org>
Reviewed-by: Tim Deegan <tim@xen.org>
Release-acked-by: Paul Durrant <paul@xen.org>
---
tools/debugger/kdd/kdd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c
index 866532f0c7..a7d0976ea4 100644
--- a/tools/debugger/kdd/kdd.c
+++ b/tools/debugger/kdd/kdd.c
@@ -79,11 +79,11 @@ typedef struct {
/* State of the debugger stub */
typedef struct {
union {
- uint8_t txb[sizeof (kdd_hdr)]; /* Marshalling area for tx */
+ uint8_t txb[sizeof (kdd_pkt)]; /* Marshalling area for tx */
kdd_pkt txp; /* Also readable as a packet structure */
};
union {
- uint8_t rxb[sizeof (kdd_hdr)]; /* Marshalling area for rx */
+ uint8_t rxb[sizeof (kdd_pkt)]; /* Marshalling area for rx */
kdd_pkt rxp; /* Also readable as a packet structure */
};
unsigned int cur; /* Offset into rx where we'll put the next byte */
--
2.17.1

60
recipes-extended/xen/files/xen-tools-kdd-stop-using-0-arrays-to-access-packet-contents.patch
View File

@ -1,60 +0,0 @@
From 3471cafbdda35eacf04670881dd2aee2558b4f08 Mon Sep 17 00:00:00 2001
From: Tim Deegan <tim@xen.org>
Date: Fri, 26 Jun 2020 10:40:44 +0000
Subject: [PATCH] kdd: stop using [0] arrays to access packet contents
GCC 10 is unhappy about this, and we already use 64k buffers
in the only places where packets are allocated, so move the
64k size into the packet definition.
Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Tim Deegan <tim@xen.org>
Acked-by: Wei Liu <wl@xen.org>
Release-acked-by: Paul Durrant <paul@xen.org>
---
tools/debugger/kdd/kdd.c | 4 ++--
tools/debugger/kdd/kdd.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c
index 3ebda9b12c..866532f0c7 100644
--- a/tools/debugger/kdd/kdd.c
+++ b/tools/debugger/kdd/kdd.c
@@ -79,11 +79,11 @@ typedef struct {
/* State of the debugger stub */
typedef struct {
union {
- uint8_t txb[sizeof (kdd_hdr) + 65536]; /* Marshalling area for tx */
+ uint8_t txb[sizeof (kdd_hdr)]; /* Marshalling area for tx */
kdd_pkt txp; /* Also readable as a packet structure */
};
union {
- uint8_t rxb[sizeof (kdd_hdr) + 65536]; /* Marshalling area for rx */
+ uint8_t rxb[sizeof (kdd_hdr)]; /* Marshalling area for rx */
kdd_pkt rxp; /* Also readable as a packet structure */
};
unsigned int cur; /* Offset into rx where we'll put the next byte */
diff --git a/tools/debugger/kdd/kdd.h b/tools/debugger/kdd/kdd.h
index bfb00ba5c5..b9a17440df 100644
--- a/tools/debugger/kdd/kdd.h
+++ b/tools/debugger/kdd/kdd.h
@@ -68,7 +68,6 @@ typedef struct {
uint16_t len; /* Payload length, excl. header and trailing byte */
uint32_t id; /* Echoed in responses */
uint32_t sum; /* Unsigned sum of all payload bytes */
- uint8_t payload[0];
} PACKED kdd_hdr;
#define KDD_PKT_CMD 0x0002 /* Debugger commands (and replies to them) */
@@ -323,7 +322,7 @@ typedef struct {
kdd_msg msg;
kdd_reg reg;
kdd_stc stc;
- uint8_t payload[0];
+ uint8_t payload[65536];
};
} PACKED kdd_pkt;
--
2.17.1

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

@ -1,4 +1,4 @@
SRCREV ?= "02d69864b51a4302a148c28d6d391238a6778b4b" SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e"
XEN_REL ?= "4.14" XEN_REL ?= "4.14"
XEN_BRANCH ?= "stable-${XEN_REL}" XEN_BRANCH ?= "stable-${XEN_REL}"
@ -15,7 +15,5 @@ PV = "${XEN_REL}+stable${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEFAULT_PREFERENCE ??= "-1"
require xen.inc require xen.inc
require xen-tools.inc require xen-tools.inc

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

@ -1,21 +1,21 @@
SRCREV ?= "9f7e8bac4ca279b3bfccb5f3730fb2e5398c95ab" SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b"
XEN_REL ?= "4.13" XEN_REL ?= "4.15"
XEN_BRANCH ?= "stable-${XEN_REL}" XEN_BRANCH ?= "master"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch \ file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
file://0001-xen-build-temporarily-inhibit-Werror.patch \ file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
file://xen-tools-kdd-stop-using-0-arrays-to-access-packet-contents.patch \
file://xen-tools-kdd-fix-build-again.patch \
" "
LIC_FILES_CHKSUM ?= "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49" LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
PV = "${XEN_REL}+git${SRCPV}" PV = "${XEN_REL}+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEFAULT_PREFERENCE ??= "-1"
require xen.inc require xen.inc
require xen-tools.inc require xen-tools.inc

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

@ -1,4 +1,4 @@
SRCREV ?= "02d69864b51a4302a148c28d6d391238a6778b4b" SRCREV ?= "456957aaa1391e0dfa969e2dd97b87c51a79444e"
XEN_REL ?= "4.14" XEN_REL ?= "4.14"
XEN_BRANCH ?= "stable-${XEN_REL}" XEN_BRANCH ?= "stable-${XEN_REL}"
@ -14,7 +14,5 @@ PV = "${XEN_REL}+stable${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEFAULT_PREFERENCE ??= "-1"
require xen.inc require xen.inc
require xen-hypervisor.inc require xen-hypervisor.inc

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

@ -1,18 +1,20 @@
SRCREV ?= "9f7e8bac4ca279b3bfccb5f3730fb2e5398c95ab" SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b"
XEN_REL ?= "4.13" XEN_REL ?= "4.15"
XEN_BRANCH ?= "stable-${XEN_REL}" XEN_BRANCH ?= "master"
SRC_URI = " \ SRC_URI = " \
git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
file://xen-arm64-implement-atomic-fetch-add.patch \ file://xen-arm64-implement-atomic-fetch-add.patch \
" "
LIC_FILES_CHKSUM ?= "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49" LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
PV = "${XEN_REL}+git${SRCPV}" PV = "${XEN_REL}+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEFAULT_PREFERENCE ??= "-1"
require xen.inc require xen.inc
require xen-hypervisor.inc require xen-hypervisor.inc