xen-vtpm,mini-os : upgrade to Xen 4.11.0

drops the gcc7 compatibility patch -- no longer required as
it is present in the upstream version.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Christopher Clark 2018-07-31 12:35:45 -07:00 committed by Bruce Ashfield
parent f9650d8997
commit c5d4479698
3 changed files with 4 additions and 48 deletions

View File

@ -1,43 +0,0 @@
From d991bdbc062248221511ecb795617c36b37e1d2e Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 9 Aug 2017 13:15:48 +0100
Subject: [PATCH] lib/math.c: implement __udivmoddi4
Some code compiled by gcc 7 requires this.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
lib/math.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/lib/math.c b/lib/math.c
index 561393e..b98cc1d 100644
--- a/lib/math.c
+++ b/lib/math.c
@@ -6,6 +6,7 @@
* File: math.c
* Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk)
* Changes:
+ * Implement __udivmoddi4 (Wei Liu <wei.liu2@citrix.com>)
*
* Date: Aug 2003
*
@@ -397,6 +398,15 @@ __umoddi3(u_quad_t a, u_quad_t b)
}
/*
+ * Returns the quotient and places remainder in r
+ */
+u_quad_t
+__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *r)
+{
+ return __qdivrem(a, b, r);
+}
+
+/*
* From
* moddi3.c
*/
--
2.11.0

View File

@ -6,11 +6,10 @@ HOMEPAGE = "https://wiki.xenproject.org/wiki/Mini-OS"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8a437231894440a8f7629caa372243d0"
# git commit hash for tags: xen-RELEASE-4.9.0, xen-RELEASE-4.9.1, xen-RELEASE-4.9.2
SRCREV_minios = "ca013fa9baf92f47469ba1f2e1aaa31c41d8a0bb"
# git commit hash for: xen-RELEASE-4.11.0
SRCREV_minios = "0b4b7897e08b967a09bed2028a79fabff82342dd"
SRC_URI = "\
git://xenbits.xen.org/mini-os.git;protocol=git;nobranch=1;destsuffix=mini-os;name=minios \
file://mini-os_udivmoddi4-gcc7.patch \
"
S="${WORKDIR}/mini-os"
B="${S}"

View File

@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b1ceb1b03a49b202ee6f41ffd1ed0155 \
file://vtpm/COPYING;md5=75a98062ab0322ded060d9026a1bda61 \
"
# git commit hash for Xen's RELEASE-4.9.0 tag
SRCREV_xen = "c30bf55594a53fae8aae08aabf16fc192faad7da"
# git commit hash for Xen's RELEASE-4.11.0 tag
SRCREV_xen = "1eb6544a567e3e5133fafe0c4ef3545c5138d0e4"
SRC_URI = "\
git://xenbits.xen.org/xen.git;protocol=git;nobranch=1;name=xen;subpath=stubdom \
git://xenbits.xen.org/xen.git;protocol=git;nobranch=1;name=xen;destsuffix=stubdom/include;subpath=tools/xenstore/include \