diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 075f812f2b..d5e923b713 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -745,6 +745,9 @@ COMBINED_FEATURES = "\ | |||
| 745 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" | 745 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" |
| 746 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | 746 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" |
| 747 | 747 | ||
| 748 | SERIAL_CONSOLE ??= "" | ||
| 749 | SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE', True).replace(' ', ';')}" | ||
| 750 | |||
| 748 | # Make sure MACHINE isn't exported | 751 | # Make sure MACHINE isn't exported |
| 749 | # (breaks binutils at least) | 752 | # (breaks binutils at least) |
| 750 | MACHINE[unexport] = "1" | 753 | MACHINE[unexport] = "1" |
