summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-07-06 22:47:27 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:45:56 +0100
commita9f11849d856643b8c987d28594fa1ca4c6001db (patch)
tree2ad4c7d3aae24c648dce77b464a40a63d061b930 /meta/classes
parentd78662e6d4c6e21bc86cb9e70af1f0a55ade6852 (diff)
downloadpoky-a9f11849d856643b8c987d28594fa1ca4c6001db.tar.gz
linux-yocto: explicitly export KMETA to scripts
The kern-tools scripts can support a meta branch and directory of a name that isn't "meta", but they need the name passed through the environment variable KMETA. ensuring that KMETA is exported in the shell environment sets the stage to support flexible meta branch name. (From OE-Core rev: 9b90c8ace04c88ac6105f0bf686f9abc70fe8074) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 10a8d40d9c..1b37dc781a 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -45,6 +45,7 @@ def find_urls(d):
45 45
46do_patch() { 46do_patch() {
47 cd ${S} 47 cd ${S}
48 export KMETA=${KMETA}
48 49
49 # if kernel tools are available in-tree, they are preferred 50 # if kernel tools are available in-tree, they are preferred
50 # and are placed on the path before any external tools. Unless 51 # and are placed on the path before any external tools. Unless
@@ -62,7 +63,7 @@ do_patch() {
62 if [ -n "${KMETA}" ]; then 63 if [ -n "${KMETA}" ]; then
63 createme_flags="--disable-meta-gen" 64 createme_flags="--disable-meta-gen"
64 fi 65 fi
65 createme ${createme_flags} ${ARCH} ${kbranch} 66 createme ${createme_flags} --meta ${KMETA} ${ARCH} ${kbranch}
66 if [ $? -ne 0 ]; then 67 if [ $? -ne 0 ]; then
67 echo "ERROR. Could not create ${kbranch}" 68 echo "ERROR. Could not create ${kbranch}"
68 exit 1 69 exit 1
@@ -180,6 +181,7 @@ addtask kernel_checkout before do_patch after do_unpack
180do_kernel_configme[dirs] = "${S} ${B}" 181do_kernel_configme[dirs] = "${S} ${B}"
181do_kernel_configme() { 182do_kernel_configme() {
182 echo "[INFO] doing kernel configme" 183 echo "[INFO] doing kernel configme"
184 export KMETA=${KMETA}
183 185
184 if [ -n ${KCONFIG_MODE} ]; then 186 if [ -n ${KCONFIG_MODE} ]; then
185 configmeflags=${KCONFIG_MODE} 187 configmeflags=${KCONFIG_MODE}
@@ -220,6 +222,7 @@ python do_kernel_configcheck() {
220# are corrected to the proper commit. 222# are corrected to the proper commit.
221do_validate_branches() { 223do_validate_branches() {
222 cd ${S} 224 cd ${S}
225 export KMETA=${KMETA}
223 226
224 set +e 227 set +e
225 # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to 228 # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to