From 9955e81b23eb6bb264b32c5bb02b326097a4ec02 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Tue, 31 Jul 2018 12:35:42 -0700 Subject: xen: upgrade to 4.10.1, and apply patches for gcc 8.1 compatibility Adds packaging for new binary: xen-shim. Builds the hypervisor before building the tools to workaround an upstream parallel build bug that causes the shim to be rebuilt during install. Signed-off-by: Christopher Clark Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'recipes-extended/xen/xen.inc') diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index cadbd78e..42c93b4c 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -91,6 +91,7 @@ RRECOMMENDS_${PN}-base = " \ ${PN}-libvhd \ ${PN}-flask \ ${PN}-hvmloader \ + ${PN}-shim \ ${PN}-xenpaging \ " @@ -213,6 +214,7 @@ PACKAGES = "\ ${PN}-scripts-block \ ${PN}-scripts-common \ ${PN}-scripts-network \ + ${PN}-shim \ ${PN}-staticdev \ ${PN}-volatiles \ ${PN}-xcutils \ @@ -638,6 +640,11 @@ FILES_${PN}-scripts-common = " \ ${sysconfdir}/xen/scripts/xen-script-common.sh \ " +INSANE_SKIP_${PN}-shim = "arch" +FILES_${PN}-shim = " \ + ${libdir}/xen/boot/xen-shim \ + " + FILES_${PN}-volatiles = "\ ${sysconfdir}/default/volatiles/99_xen \ ${sysconfdir}/tmpfiles.d/xen.conf \ @@ -930,10 +937,17 @@ do_compile() { # workaround for build bug when CFLAGS is exported # https://www.mail-archive.com/xen-devel@lists.xen.org/msg67822.html unset CFLAGS + + # Workaround for parallel build bug: build xen first. + # https://lists.xenproject.org/archives/html/xen-devel/2018-07/msg02551.html + oe_runmake xen oe_runmake } do_install() { + # CFLAGS is used to set PY_CFLAGS which affects the pygrub install + # so also need to unset CFLAGS here: + unset CFLAGS oe_runmake DESTDIR="${D}" install # remove installed volatiles -- cgit v1.2.3-54-g00ecf