summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-08-22 00:42:05 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:01 +0100
commitaf7cd07faed50b94f4cf3bffd40c08abdb5dfaae (patch)
treefdc3eeb6a79fbcf056a38dfee41e81c543e18701 /meta/classes/kernel-yocto.bbclass
parent01ce721684566e5c8a668b73ba73d4837c4649a2 (diff)
downloadpoky-af7cd07faed50b94f4cf3bffd40c08abdb5dfaae.tar.gz
kernel-yocto: don't require meta branch for custom repos
The commit a9f11849 [linux-yocto: explicitly export KMETA to scripts] allows the meta branch name to be changed by exporting it to all phases of the build. But if a custom kernel without a meta branch is built, we end up passing an empty string to the creation scripts, which breaks the build since input is expected. Inhibiting the export of KMETA to the creation scripts when empty fixes the problem. (From OE-Core rev: 61162fbe01993659301fe2e821bf9c3e801206d8) 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/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4328093778..3dcc8b52dd 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -61,9 +61,10 @@ do_patch() {
61 # if we have a defined/set meta branch we should not be generating 61 # if we have a defined/set meta branch we should not be generating
62 # any meta data. The passed branch has what we need. 62 # any meta data. The passed branch has what we need.
63 if [ -n "${KMETA}" ]; then 63 if [ -n "${KMETA}" ]; then
64 createme_flags="--disable-meta-gen" 64 createme_flags="--disable-meta-gen --meta ${KMETA}"
65 fi 65 fi
66 createme ${createme_flags} --meta ${KMETA} ${ARCH} ${kbranch} 66
67 createme ${createme_flags} ${ARCH} ${kbranch}
67 if [ $? -ne 0 ]; then 68 if [ $? -ne 0 ]; then
68 echo "ERROR. Could not create ${kbranch}" 69 echo "ERROR. Could not create ${kbranch}"
69 exit 1 70 exit 1