diff --git a/meta-arm-autonomy/conf/layer.conf b/meta-arm-autonomy/conf/layer.conf index 8ee9ce60..739dc811 100644 --- a/meta-arm-autonomy/conf/layer.conf +++ b/meta-arm-autonomy/conf/layer.conf @@ -16,7 +16,7 @@ LAYERDEPENDS_meta-arm-autonomy = " \ openembedded-layer \ virtualization-layer \ " -LAYERSERIES_COMPAT_meta-arm-autonomy = "zeus" +LAYERSERIES_COMPAT_meta-arm-autonomy = "dunfell" # We don't activate virtualization feature from meta-virtualization as it # brings in lots of stuff we don't need. We need to disable the sanity check diff --git a/meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf b/meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf index cb72c601..8b32fa7a 100644 --- a/meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf +++ b/meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf @@ -11,7 +11,7 @@ KERNEL_IMAGETYPE = "Image" IMAGE_FSTYPES += "tar.bz2" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" DISTRO_FEATURES += "arm-autonomy-guest" diff --git a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb index 978b58ff..d586110d 100644 --- a/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +++ b/meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb @@ -39,12 +39,14 @@ IMAGE_INSTALL += " \ packagegroup-core-boot \ packagegroup-core-ssh-openssh \ kernel-modules \ - xen-base \ qemu \ xenguest-manager \ xenguest-network-bridge \ " +# Build xen binary +EXTRA_IMAGEDEPENDS += "xen" + # Build xen-devicetree to produce a xen ready devicetree EXTRA_IMAGEDEPENDS += "xen-devicetree" diff --git a/meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch b/meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch deleted file mode 100644 index 8ecc904e..00000000 --- a/meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0dcd945a675cd12d283121e9b7f1626104b60bcc Mon Sep 17 00:00:00 2001 -From: Jan Beulich -Date: Tue, 4 Jun 2019 15:32:55 +0200 -Subject: [PATCH] trace: fix build with gcc9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -While I've not observed this myself, gcc 9 (imo validly) reportedly may -complain - -trace.c: In function '__trace_hypercall': -trace.c:826:19: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] - 826 | uint32_t *a = d.args; - -and the fix is rather simple - remove the __packed attribute. Introduce -a BUILD_BUG_ON() as replacement, for the unlikely case that Xen might -get ported to an architecture where array alignment higher that that of -its elements. - -Reported-by: Martin Liška -Signed-off-by: Jan Beulich -Acked-by: George Dunlap -master commit: 3fd3b266d4198c06e8e421ca515d9ba09ccd5155 -master date: 2019-05-13 09:51:23 +0200 ---- - xen/common/trace.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xen/common/trace.c b/xen/common/trace.c -index cc294fc384..d1ef81407b 100644 ---- a/xen/common/trace.c -+++ b/xen/common/trace.c -@@ -819,12 +819,18 @@ unlock: - void __trace_hypercall(uint32_t event, unsigned long op, - const xen_ulong_t *args) - { -- struct __packed { -+ struct { - uint32_t op; - uint32_t args[6]; - } d; - uint32_t *a = d.args; - -+ /* -+ * In lieu of using __packed above, which gcc9 legitimately doesn't -+ * like in combination with the address of d.args[] taken. -+ */ -+ BUILD_BUG_ON(offsetof(typeof(d), args) != sizeof(d.op)); -+ - #define APPEND_ARG32(i) \ - do { \ - unsigned i_ = (i); \ --- -2.17.1 - diff --git a/meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch b/meta-arm-autonomy/recipes-extended/xen/files/4.12/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch similarity index 100% rename from meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch rename to meta-arm-autonomy/recipes-extended/xen/files/4.12/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch diff --git a/meta-arm-autonomy/recipes-extended/xen/xen_4.%.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend similarity index 83% rename from meta-arm-autonomy/recipes-extended/xen/xen_4.%.bbappend rename to meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend index e7ddce99..fb5962a7 100644 --- a/meta-arm-autonomy/recipes-extended/xen/xen_4.%.bbappend +++ b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend @@ -31,3 +31,7 @@ SRC_URI_append_fvp-base = " file://fvp/defconfig" COMPATIBLE_MACHINE_juno = "juno" SRC_URI_append_juno = " file://juno/defconfig" + +# Gem5 support +# Fix problem with number of interrupts on gem5 +SRC_URI_append_gem5-arm64 = " file://${XEN_REL}/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch" diff --git a/meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend deleted file mode 100644 index 87b1f63b..00000000 --- a/meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -# xen version specific patch information - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -# Solve trace.c compilation error on 4.12.0 -# This should only be applied for 4.12.0 (solved in greater versions) -SRC_URI += "file://4.12.0/0001-trace-fix-build-with-gcc9.patch" - -# Fix problem with number of interrupts on gem5 -SRC_URI_append_gem5-arm64 = " file://4.12.0/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch" diff --git a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb index 9affae9a..65925d2a 100644 --- a/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb +++ b/meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb @@ -46,7 +46,7 @@ do_install() { } # Things that we need on the target -RDEPENDS_${PN} += "bash tar xenguest-mkimage lvm2 xen-xl parted e2fsprogs" +RDEPENDS_${PN} += "bash tar xenguest-mkimage lvm2 xen-tools parted e2fsprogs" FILES_${PN} += "${bindir}/xenguest-manager \ ${sysconfdir}/xenguest"