diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-12-14 00:38:42 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-23 22:15:42 +0100 |
| commit | dd1adb246408962866131294cf8861be0d8c711a (patch) | |
| tree | e48c70374cf958df0b3333706f0fcc8ea51215a8 | |
| parent | 4e9dadb4c9447a6e0837409fd3055bf3e4c36dfc (diff) | |
layer.conf: remove machine include
If the user defines the machine to build in local.conf the
environment variable ${MACHINE} is not available when
conf/layer.conf gets parsed. Remove the include in favor of
including from local.conf.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | conf/layer.conf | 4 | ||||
| -rw-r--r-- | conf/machine/include/README | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index a78de00..eec2324 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -22,7 +22,3 @@ LAYERDEPENDS_toradex-nxp-layer = " \ fsl-arm-extra \ toradex-bsp-common-layer \ " - -# This file need not exist, if it does it can be used to change the machine -# configuration -include conf/machine/include/${MACHINE}.inc diff --git a/conf/machine/include/README b/conf/machine/include/README index 0453a9f..52ea339 100644 --- a/conf/machine/include/README +++ b/conf/machine/include/README @@ -1 +1,2 @@ -The ${MACHINE}.inc files get included from this layers layer.conf +The ${MACHINE}.inc files net to get included from machine config or +local.conf. |