diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/x86/arch-x86.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e3db5041f3..d4fb5f3571 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -762,7 +762,7 @@ EXTRA_IMAGE_FEATURES ??= "" | |||
762 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" | 762 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" |
763 | 763 | ||
764 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" | 764 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" |
765 | MACHINE_FEATURES_BACKFILL = "rtc gobject-introspection-data" | 765 | MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" |
766 | 766 | ||
767 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" | 767 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" |
768 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | 768 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" |
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc index ba7be8ad65..e51d595f74 100644 --- a/meta/conf/machine/include/x86/arch-x86.inc +++ b/meta/conf/machine/include/x86/arch-x86.inc | |||
@@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" | |||
25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" | 25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" |
26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" | 26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" |
27 | # user mode qemu doesn't support x32 | 27 | # user mode qemu doesn't support x32 |
28 | MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'gobject-introspection-data', '', d)}" | 28 | MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" |
29 | 29 | ||
30 | # ELF64 ABI | 30 | # ELF64 ABI |
31 | TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" | 31 | TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" |