diff options
author | Christopher Clark <christopher.w.clark@gmail.com> | 2020-06-29 18:54:44 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-07-06 16:25:55 -0400 |
commit | 7f6f115d7d8467390d9bf7258cc8a5e7771528c2 (patch) | |
tree | 10f7227fa6ab9c23db03785b2f498e7c338a1a37 /conf | |
parent | 87b9e054ff1b4812194af9f0b4f3083400d42095 (diff) | |
download | meta-virtualization-7f6f115d7d8467390d9bf7258cc8a5e7771528c2.tar.gz |
xen: apply layer settings when xen DISTRO_FEATURE is enabled
These settings are necessary for Xen and enabling them here, using the
same mechanism that is used by k8s in this layer, simplifies building
images for Xen.
- Ensure that Xen mode is enabled in QEMU.
- On ARM platforms: enable Flattened Device Tree (FDT) support.
Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/meta-virt-xen.inc | 6 | ||||
-rw-r--r-- | conf/layer.conf | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc new file mode 100644 index 00000000..a92b08b4 --- /dev/null +++ b/conf/distro/include/meta-virt-xen.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | # Make sure Xen mode is enabled in qemu | ||
2 | PACKAGECONFIG_append_pn-qemu = " xen" | ||
3 | |||
4 | # For builds for ARM platforms, enable fdt | ||
5 | PACKAGECONFIG_append_pn-qemu_arm = " fdt" | ||
6 | PACKAGECONFIG_append_pn-qemu_aarch64 = " fdt" | ||
diff --git a/conf/layer.conf b/conf/layer.conf index 697fb622..142621c3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -43,8 +43,10 @@ INHERIT += "sanity-meta-virt" | |||
43 | # We need to load the meta-virt config components, only if "virtualization" | 43 | # We need to load the meta-virt config components, only if "virtualization" |
44 | # is in the distro features. Since we don't know the distro flags during | 44 | # is in the distro features. Since we don't know the distro flags during |
45 | # layer.conf load time, we delay using a special bbclass that simply includes | 45 | # layer.conf load time, we delay using a special bbclass that simply includes |
46 | # the META_VIRT_CONFIG_PATH file, and likewise for the k8s configs | 46 | # the META_VIRT_CONFIG_PATH file, and likewise for the Xen and k8s configs |
47 | META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" | 47 | META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" |
48 | META_VIRT_XEN_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-xen.inc" | ||
48 | K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" | 49 | K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" |
49 | USER_CLASSES_append = " meta-virt-cfg" | 50 | USER_CLASSES_append = " meta-virt-cfg" |
50 | USER_CLASSES_append = " meta-virt-k8s-cfg" | 51 | USER_CLASSES_append = " meta-virt-k8s-cfg" |
52 | USER_CLASSES_append = " meta-virt-xen-cfg" | ||