diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-07-08 13:09:57 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-07-09 09:32:55 +0000 |
commit | 0cbf31a2335287a817fd06eb4410c1c883aacfcb (patch) | |
tree | 360eeb487faf6eef327c1cf67146c51c47ce0d19 /conf | |
parent | cbd12fb404169e9b755b87ac1d1280cbd90a4729 (diff) |
meta-agl-kvm-demo: update for YP scarthgap and clean upricefish_18.0.0ricefish/18.0.018.0.0
Note that while these changes do get the KVM demo images building
and bootable, some further investigation is required into getting
the guest displays rendering to the outputs.
Changes:
- Move some of the feature template and multiconfig files that were
accidentally left in meta-agl-demo to meta-agl-kvm-demo.
- Rework how MACHINE is defined for the guest multiconfig to make it
a bit more obvious how other machines could be supported. Sadly,
experimentaion has shown that trying to do a generic
virtio-${TUNE_ARCH} or similar scheme does not work with BitBake's
parser, so document that a bit.
- Update agl-qemu-runner.sh for change to IMAGE_NAME_SUFFIX default
value, and qemu now warning about using "-vga" with the "virt"
machine which does not support it.
- Add new "agl-virtio-guest" feature to AGL_FEATURES in guest to get
virtio kernel configuration.
Bug-AGL: SPEC-5201
Change-Id: I194a5c49adf6242cd91d205e19a8eecde698ad7e
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30117
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'conf')
-rw-r--r-- | conf/include/agl-kvm.inc | 15 | ||||
-rw-r--r-- | conf/include/mc-conf-agl-kvm-guest.inc | 3 | ||||
-rw-r--r-- | conf/include/mc-conf-default.inc | 3 | ||||
-rw-r--r-- | conf/multiconfig/agl-kvm-guest.conf | 24 |
4 files changed, 0 insertions, 45 deletions
diff --git a/conf/include/agl-kvm.inc b/conf/include/agl-kvm.inc deleted file mode 100644 index fadb345df..000000000 --- a/conf/include/agl-kvm.inc +++ /dev/null @@ -1,15 +0,0 @@ -DISTRO_FEATURES:append = " virtualization" - -BBMULTICONFIG = "agl-kvm-guest" - -AGL_FEATURES:append = " agl-kvm" - -# Override remote display network configuration to use KVM demo's -# network configuration -REMOTING_OUTPUT_HOST = "172.16.10.3" - -# Override cluster dashboard VIS server host for KVM demo's network -# configuration -CLUSTER_DEMO_VSS_HOSTNAME = "172.16.10.1" - -include mc-conf-${BB_CURRENT_MC}.inc diff --git a/conf/include/mc-conf-agl-kvm-guest.inc b/conf/include/mc-conf-agl-kvm-guest.inc deleted file mode 100644 index 6777b2c68..000000000 --- a/conf/include/mc-conf-agl-kvm-guest.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Override the default virtio-can configuration, as we do not have -# a backend to be able to use it. -CANBUS_NETWORK_CONFIG:virtio-all = "canbus-can.network" diff --git a/conf/include/mc-conf-default.inc b/conf/include/mc-conf-default.inc deleted file mode 100644 index c60c999b3..000000000 --- a/conf/include/mc-conf-default.inc +++ /dev/null @@ -1,3 +0,0 @@ -# We don't want the app framework bits (specifically the user session) in -# the KVM host image. -AGL_FEATURES:remove = "agl-app-fw" diff --git a/conf/multiconfig/agl-kvm-guest.conf b/conf/multiconfig/agl-kvm-guest.conf deleted file mode 100644 index 478bc5ff0..000000000 --- a/conf/multiconfig/agl-kvm-guest.conf +++ /dev/null @@ -1,24 +0,0 @@ -TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}" - -MACHINE = "virtio-aarch64" - -# Avoid parse errors caused by linux-renesas, and all the other -# random bbappends in meta-rcar-gen3. -BBMASK += "meta-rcar-gen3/ meta-rcar-gen3-adas/ meta-agl-refhw-gen3/" - -DISTRO_FEATURES:append = " kvm virtualization" - -# Use our own wks file -WKS_FILE = "directdisk.wks.in" - -# We only need ext4 images for guests for now -AGL_DEFAULT_IMAGE_FSTYPES = "ext4" -AGL_EXTRA_IMAGE_FSTYPES = "" - -# Need to run QEMU with virtio-gpu device -#PACKAGECONFIG:append:pn-qemu-system-native = " virglrenderer glx gtk+" -PACKAGECONFIG:append:pn-qemu-system-target = " virglrenderer glx" - -# Until aglsetup.sh potentially changes to split features per multiconfig, -# remove problematic ones from the host build here -AGL_FEATURES:remove = "agl-refhw-h3" |