arm-autonomy: Move to dunfell

- make xenguest-manage rdepend on xen-tools to adapt to recipe modifications in meta-virtualization - add xen to IMAGE_EXTRADEPENDS to build xen binary when build autonomy-host-image - switch arm64-autonomy-machine to use Linux 5.4 - remove trace patch for xen as meta-virtualization is now using a xen release which has this fixed - rework xen bbappends to adapt to changes done in xen recipes Change-Id: I439bde0df2c0a16f529436b65f1a96af5a2981af Issue-Id: SCM-833 Signed-off-by: Vineeth Raveendran <vineeth.raveendran@arm.com> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
2026-06-05 14:30:10 +00:00 · 2020-05-07 11:00:54 +01:00
parent 4338e38b8a
commit 6ebe1db92c
8 changed files with 10 additions and 70 deletions
@@ -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
@@ -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"

@@ -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"

@@ -1,56 +0,0 @@
-From 0dcd945a675cd12d283121e9b7f1626104b60bcc Mon Sep 17 00:00:00 2001
-From: Jan Beulich <jbeulich@suse.com>
-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 <anonymous>' 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 <martin.liska@suse.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: George Dunlap <george.dunlap@citrix.com>
-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
-
@@ -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"
@@ -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"
@@ -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"