Patchwork [02/10] linux-yocto: process the existing branch for configuration

login
register
mail settings
Submitter Nitin A Kamble
Date Aug. 4, 2011, 3:01 p.m.
Message ID <80e4be5ce59752125ef341926ab869acc496dc86.1312469789.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/9323/
State New, archived
Headers show

Comments

Nitin A Kamble - Aug. 4, 2011, 3:01 p.m.
From: Bruce Ashfield <bruce.ashfield@windriver.com>

When building an external tree or bootstrapping a BSP the
external branch may not have been checked out. The tools now ensure
that the tree is ready for configuration, so we no longer need to
force the checkout of the external branch.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
Bruce Ashfield - Aug. 5, 2011, 4:11 a.m.
On Thu, Aug 4, 2011 at 11:01 AM,  <nitin.a.kamble@intel.com> wrote:
> From: Bruce Ashfield <bruce.ashfield@windriver.com>
>
> When building an external tree or bootstrapping a BSP the
> external branch may not have been checked out. The tools now ensure
> that the tree is ready for configuration, so we no longer need to
> force the checkout of the external branch.

This broke one use case, which may be fine, but I'll include this in my
pull request once all testing is complete.

Bruce

>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/classes/kernel-yocto.bbclass |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)
>
> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index a374df1..8df5f31 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -87,14 +87,7 @@ do_kernel_configme() {
>        echo "[INFO] doing kernel configme"
>
>        kbranch=${KBRANCH}
> -       if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
> -           # switch from a generic to a specific branch
> -           kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
> -           cd ${S}
> -           git checkout ${kbranch}
> -       else
> -          cd ${S}
> -       fi
> +       cd ${S}
>
>        configme --reconfig --output ${B} ${kbranch} ${MACHINE}
>        if [ $? -ne 0 ]; then
> --
> 1.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index a374df1..8df5f31 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -87,14 +87,7 @@  do_kernel_configme() {
 	echo "[INFO] doing kernel configme"
 
 	kbranch=${KBRANCH}
-	if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
-           # switch from a generic to a specific branch
-           kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
-           cd ${S}
-           git checkout ${kbranch}
-	else
-	   cd ${S}
-	fi
+	cd ${S}
 
 	configme --reconfig --output ${B} ${kbranch} ${MACHINE}
 	if [ $? -ne 0 ]; then