bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf
PATCH 1/1 bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf
TARGET_SYS is defined in terms of TARGET_ARCH, so it's not valid until after TUNE_ARCH has been set by the machine config. The original order of includes resulted in an attempt to include non-existent files such as:
conf/target/INVALID-oe-linux.conf
--- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
@@ -705,9 +705,9 @@ include conf/auto.conf include conf/local.conf require conf/multiconfig/${BB_CURRENT_MC}.conf include conf/build/${BUILD_SYS}.conf -include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/machine-sdk/${SDKMACHINE}.conf +include conf/target/${TARGET_SYS}.conf include conf/distro/${DISTRO}.conf include conf/distro/defaultsetup.conf include conf/documentation.conf
Signature · 1 line
1.9.1
Quoted 17 lines · Andre McCurdy
TARGET_SYSis defined in terms ofTARGET_ARCH, so it's not valid until afterTUNE_ARCHhas been set by the machine config. The original order of includes resulted in an attempt to include non-existent files such as:
conf/target/INVALID-oe-linux.confSigned-off-by Andre McCurdy <[email protected]>---
meta/conf/bitbake.conf | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/conf/bitbake.conf +0
-0@@ -705,9 +705,9 @@ include conf/auto.conf
Quoted 8 lines
include
conf/local.conf
requireconf/multiconfig/${BB_CURRENT_MC}.conf
includeconf/build/${BUILD_SYS}.conf
-includeconf/target/${TARGET_SYS}.conf
includeconf/machine/${MACHINE}.conf
includeconf/machine-sdk/${SDKMACHINE}.conf
+includeconf/target/${TARGET_SYS}.conf
includeconf/distro/${DISTRO}.conf
I think conf/target/${TARGET_SYS}.conf must be included after ${DISTRO}.conf, because TARGET_SYS contains ${TARGET_ARCH}${TARGET_VENDOR} and TARGET_VENDOR gets changed by a ${DISTRO}.conf like poky.conf.
I also found this issue when writing an automated test that detects when include file names change while parsing, and I agree that it should be either fixed or removed.
See the "Yocto Compatible 2.0 support code" mail thread for details. At that time I had missed that there was already a pending patch for it.
Signature · 6 lines
Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter.
Quoted 32 lines · Patrick Ohly
Quoted 18 lines · Andre McCurdy
TARGET_SYSis defined in terms ofTARGET_ARCH, so it's not valid until afterTUNE_ARCHhas been set by the machine config. The original order of includes resulted in an attempt to include non-existent files such as:
conf/target/INVALID-oe-linux.confSigned-off-by Andre McCurdy <[email protected]>---
meta/conf/bitbake.conf | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/conf/bitbake.conf +0
-0@@ -705,9 +705,9 @@ include conf/auto.confQuoted 8 lines
include
conf/local.conf
requireconf/multiconfig/${BB_CURRENT_MC}.conf
includeconf/build/${BUILD_SYS}.conf
-includeconf/target/${TARGET_SYS}.conf
includeconf/machine/${MACHINE}.conf
includeconf/machine-sdk/${SDKMACHINE}.conf
+includeconf/target/${TARGET_SYS}.conf
includeconf/distro/${DISTRO}.confI think
conf/target/${TARGET_SYS}.confmust be included after ${DISTRO}.conf, becauseTARGET_SYScontains ${TARGET_ARCH}${TARGET_VENDOR} andTARGET_VENDORgets changed by a ${DISTRO}.conf like poky.conf.
Quoted 7 lines
I also found this issue when writing an automated test that detects when include file names change while parsing, and I agree that it should be either fixed or removed.
See the "Yocto Compatible 2.0 support code" mail thread for details. At
that time I had missed that there was already a pending patch for it.
I think I'd prefer just to delete the use of TARGET_SYS.conf and possibly BUILD_SYS.conf too, I'm not aware of any users in practice as it can't really work at least in one case...
Cheers,
Richard