From c5d44796981afb32cad6c685cde6d6175423c4d7 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Tue, 31 Jul 2018 12:35:45 -0700 Subject: 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 Signed-off-by: Bruce Ashfield --- .../xen/files/mini-os_udivmoddi4-gcc7.patch | 43 ---------------------- recipes-extended/xen/mini-os_4.11.0.bb | 17 +++++++++ recipes-extended/xen/mini-os_4.9.0.bb | 18 --------- recipes-extended/xen/xen-vtpm_4.11.0.bb | 21 +++++++++++ recipes-extended/xen/xen-vtpm_4.9.0.bb | 21 ----------- 5 files changed, 38 insertions(+), 82 deletions(-) delete mode 100644 recipes-extended/xen/files/mini-os_udivmoddi4-gcc7.patch create mode 100644 recipes-extended/xen/mini-os_4.11.0.bb delete mode 100644 recipes-extended/xen/mini-os_4.9.0.bb create mode 100644 recipes-extended/xen/xen-vtpm_4.11.0.bb delete mode 100644 recipes-extended/xen/xen-vtpm_4.9.0.bb diff --git a/recipes-extended/xen/files/mini-os_udivmoddi4-gcc7.patch b/recipes-extended/xen/files/mini-os_udivmoddi4-gcc7.patch deleted file mode 100644 index a3745bda..00000000 --- a/recipes-extended/xen/files/mini-os_udivmoddi4-gcc7.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d991bdbc062248221511ecb795617c36b37e1d2e Mon Sep 17 00:00:00 2001 -From: Wei Liu -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 -Reviewed-by: Samuel Thibault ---- - 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 ) - * - * 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 diff --git a/recipes-extended/xen/mini-os_4.11.0.bb b/recipes-extended/xen/mini-os_4.11.0.bb new file mode 100644 index 00000000..85a06a79 --- /dev/null +++ b/recipes-extended/xen/mini-os_4.11.0.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2017 Kurt Bodiker +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Mini-OS is a tiny OS kernel distributed with the Xen Project" +HOMEPAGE = "https://wiki.xenproject.org/wiki/Mini-OS" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8a437231894440a8f7629caa372243d0" + +# 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 \ +" +S="${WORKDIR}/mini-os" +B="${S}" + +require mini-os.inc diff --git a/recipes-extended/xen/mini-os_4.9.0.bb b/recipes-extended/xen/mini-os_4.9.0.bb deleted file mode 100644 index 298bc8df..00000000 --- a/recipes-extended/xen/mini-os_4.9.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2017 Kurt Bodiker -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Mini-OS is a tiny OS kernel distributed with the Xen Project" -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" -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}" - -require mini-os.inc diff --git a/recipes-extended/xen/xen-vtpm_4.11.0.bb b/recipes-extended/xen/xen-vtpm_4.11.0.bb new file mode 100644 index 00000000..088e985b --- /dev/null +++ b/recipes-extended/xen/xen-vtpm_4.11.0.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2017 Kurt Bodiker +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "MiniOS-based vTPMs for Xen" +HOMEPAGE = "https://www.xenproject.org" +LICENSE = "GPLv2 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=b1ceb1b03a49b202ee6f41ffd1ed0155 \ + file://vtpm/COPYING;md5=75a98062ab0322ded060d9026a1bda61 \ +" + +# 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 \ +" + +S="${WORKDIR}/stubdom" +B="${S}" + +require xen-vtpm.inc diff --git a/recipes-extended/xen/xen-vtpm_4.9.0.bb b/recipes-extended/xen/xen-vtpm_4.9.0.bb deleted file mode 100644 index c58a02d8..00000000 --- a/recipes-extended/xen/xen-vtpm_4.9.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2017 Kurt Bodiker -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "MiniOS-based vTPMs for Xen" -HOMEPAGE = "https://www.xenproject.org" -LICENSE = "GPLv2 & BSD-3-Clause" -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" -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 \ -" - -S="${WORKDIR}/stubdom" -B="${S}" - -require xen-vtpm.inc -- cgit v1.2.3-54-g00ecf