diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-08-22 00:42:05 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:44:01 +0100 |
| commit | 61162fbe01993659301fe2e821bf9c3e801206d8 (patch) | |
| tree | f031efea160da16d2200e1742dc23ba6e4c1ea96 /meta | |
| parent | de5bb5879fa3282c46dc1ede36af34eaab8f647f (diff) | |
| download | openembedded-core-61162fbe01993659301fe2e821bf9c3e801206d8.tar.gz openembedded-core-61162fbe01993659301fe2e821bf9c3e801206d8.tar.bz2 openembedded-core-61162fbe01993659301fe2e821bf9c3e801206d8.zip | |
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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 5 |
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() { # if we have a defined/set meta branch we should not be generating # any meta data. The passed branch has what we need. if [ -n "${KMETA}" ]; then - createme_flags="--disable-meta-gen" + createme_flags="--disable-meta-gen --meta ${KMETA}" fi - createme ${createme_flags} --meta ${KMETA} ${ARCH} ${kbranch} + + createme ${createme_flags} ${ARCH} ${kbranch} if [ $? -ne 0 ]; then echo "ERROR. Could not create ${kbranch}" exit 1 |