summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-11-21 20:59:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-02 15:19:58 (GMT)
commit1752107cb1add575a7f73b095ca83690983d5d21 (patch)
tree2d2891ba1098bfa0abcb873031a922d0d367745d
parentbb93ece01d2e2f0ef47f9266c50f5d366e4f5f60 (diff)
downloadpoky-1752107cb1add575a7f73b095ca83690983d5d21.tar.gz
linux-yocto: prefer in-tree tools to external ones
(From OE-Core rev: ae7b3c518020715dde8b9eabdf30c71430e31712) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 04a2f88..ad14aac 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -6,6 +6,15 @@ do_patch() {
6 defconfig=${WORKDIR}/defconfig 6 defconfig=${WORKDIR}/defconfig
7 fi 7 fi
8 8
9 # if kernel tools are available in-tree, they are preferred
10 # and are placed on the path before any external tools. Unless
11 # the external tools flag is set, in that case we do nothing.
12 if [ -f "${S}/scripts/util/configme" ]; then
13 if [ -z "${EXTERNAL_KERNEL_TOOLS}" ]; then
14 PATH=${S}/scripts/util:${PATH}
15 fi
16 fi
17
9 kbranch=${KBRANCH} 18 kbranch=${KBRANCH}
10 if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then 19 if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
11 # switch from a generic to a specific branch 20 # switch from a generic to a specific branch
@@ -100,6 +109,7 @@ do_kernel_configme() {
100 fi 109 fi
101 110
102 cd ${S} 111 cd ${S}
112 PATH=${PATH}:${S}/scripts/util
103 configme ${configmeflags} --reconfig --output ${B} ${KBRANCH} ${KMACHINE} 113 configme ${configmeflags} --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
104 if [ $? -ne 0 ]; then 114 if [ $? -ne 0 ]; then
105 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 115 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
@@ -116,7 +126,7 @@ python do_kernel_configcheck() {
116 bb.plain("NOTE: validating kernel configuration") 126 bb.plain("NOTE: validating kernel configuration")
117 127
118 pathprefix = "export PATH=%s; " % d.getVar('PATH', True) 128 pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
119 cmd = bb.data.expand("cd ${B}/..; kconf_check -config- ${B} ${S} ${B} ${KBRANCH}",d ) 129 cmd = bb.data.expand("cd ${B}/..; ${S}/scripts/util/kconf_check -config- ${B} ${S} ${B} ${KBRANCH}",d )
120 ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd)) 130 ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd))
121 131
122 bb.plain( "%s" % result ) 132 bb.plain( "%s" % result )