From dd1adb246408962866131294cf8861be0d8c711a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 14 Dec 2017 00:38:42 +0100 Subject: 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 Acked-by: Marcel Ziswiler --- conf/layer.conf | 4 ---- 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. -- cgit v1.2.3