Patchwork [3/4] kernel-yocto: clarify KMETA branch comments

login
register
mail settings
Submitter Bruce Ashfield
Date Nov. 21, 2012, 9:32 p.m.
Message ID <b667b1f0d7eb0abf19abc9c369ca14e17d6d85f5.1353532567.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/39431/
State Accepted
Commit 5fd5ba6a68f561ee18a3b55ba78e5e2d2edae6f4
Headers show

Comments

Bruce Ashfield - Nov. 21, 2012, 9:32 p.m.
Having a meta branch is not strictly required by the tools (and
recipes like linux-yocto-custom do not have meta branches), but the
comments in the kernel-yocto.bbclass could lead someone to think that
it was required.

This commit clearifies the comment to the following:

  # We can fix up the kernel repository even if it wasn't a bare clone.
  # If KMETA is defined, the branch must exist, but a machine branch
  # can be missing since it may be created later by the tools.

[YOCTO #3422]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f78d63b..0d4ed21 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -130,8 +130,9 @@  do_kernel_checkout() {
 		echo "WARNING. ${WORKDIR}/git is not a bare clone."
 		echo "Ensure that the SRC_URI includes the 'bareclone=1' option."
 		
-		# we can fix up the kernel repository, but at the least the meta
-		# branch must be present. The machine branch may be created later.
+		# We can fix up the kernel repository even if it wasn't a bare clone.
+		# If KMETA is defined, the branch must exist, but a machine branch
+		# can be missing since it may be created later by the tools.
 		mv ${WORKDIR}/git/.git ${S}
 		rm -rf ${WORKDIR}/git/
 		cd ${S}