summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-30 15:30:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-02 17:41:54 +0100
commitc09809f0609beb27e5670d69cbdcf713fb884f7b (patch)
tree115d4eb19f7fe243dae63fb9e5ea60a2e526921e /meta
parentb4aa6d3886977e660e5391b0f2e0484928d5baaf (diff)
downloadpoky-c09809f0609beb27e5670d69cbdcf713fb884f7b.tar.gz
bitbake.conf: set SERIAL_CONSOLES from SERIAL_CONSOLE by default
This is the first step in deprecating SERIAL_CONSOLE without affecting machine configurations that still use it. (From OE-Core rev: 3f0d665384e6d1b7aa2854a9cc4f13e0961bacb7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf3
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)}"
746COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" 746COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
747 747
748SERIAL_CONSOLE ??= ""
749SERIAL_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)
750MACHINE[unexport] = "1" 753MACHINE[unexport] = "1"