From: Bruce Ashfield Date: Wed, 22 Aug 2012 04:42:05 +0000 (-0400) Subject: kernel-yocto: don't require meta branch for custom repos X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af7cd07faed50b94f4cf3bffd40c08abdb5dfaae;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 43280937784..3dcc8b52dda 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