diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-11-21 15:59:01 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-02 15:19:45 +0000 |
| commit | ae7b3c518020715dde8b9eabdf30c71430e31712 (patch) | |
| tree | f1232a28bfb03ddaf7951b9ae631b1bb1eec8af8 | |
| parent | bdeedc55ad2cf3c26828bc51d8ad06b64469a500 (diff) | |
| download | openembedded-core-ae7b3c518020715dde8b9eabdf30c71430e31712.tar.gz openembedded-core-ae7b3c518020715dde8b9eabdf30c71430e31712.tar.bz2 openembedded-core-ae7b3c518020715dde8b9eabdf30c71430e31712.zip | |
linux-yocto: prefer in-tree tools to external ones
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 04a2f883b9..ad14aacd7e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -6,6 +6,15 @@ do_patch() { defconfig=${WORKDIR}/defconfig fi + # if kernel tools are available in-tree, they are preferred + # and are placed on the path before any external tools. Unless + # the external tools flag is set, in that case we do nothing. + if [ -f "${S}/scripts/util/configme" ]; then + if [ -z "${EXTERNAL_KERNEL_TOOLS}" ]; then + PATH=${S}/scripts/util:${PATH} + fi + fi + kbranch=${KBRANCH} if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then # switch from a generic to a specific branch @@ -100,6 +109,7 @@ do_kernel_configme() { fi cd ${S} + PATH=${PATH}:${S}/scripts/util configme ${configmeflags} --reconfig --output ${B} ${KBRANCH} ${KMACHINE} if [ $? -ne 0 ]; then echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" @@ -116,7 +126,7 @@ python do_kernel_configcheck() { bb.plain("NOTE: validating kernel configuration") pathprefix = "export PATH=%s; " % d.getVar('PATH', True) - cmd = bb.data.expand("cd ${B}/..; kconf_check -config- ${B} ${S} ${B} ${KBRANCH}",d ) + cmd = bb.data.expand("cd ${B}/..; ${S}/scripts/util/kconf_check -config- ${B} ${S} ${B} ${KBRANCH}",d ) ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd)) bb.plain( "%s" % result ) |