can not add meta-intel layer version rocko

can not add meta-intel layer version rocko

[Stéphane Ancelot]

Hi,

I added meta-layer intel , specifying rocko git version. I had some 
incompatibilities with kernel version...

Unfortunately, it looks like toaster  added meta-intel master branch. 
(it is displayed in the build configuration) .

The toaster-bblayers.conf file indicates

BBLAYERS = 
"/var/www/toaster/poky/_toaster_clones/_git___git.yoctoproject.org_meta-intel_rocko 
..."

but in this folder, git branch tells me '* master'....

where is the mistake ?

Regards,

S.Ancelot

Re: can not add meta-intel layer version rocko

[Reyna, David]

> where is the mistake ?

Hmm. It appears that Toaster found the right layer and branch for the BBLAYERS value, but I when I tested this I also observe that the "*meta-intel-rocko" directory is on the "master" branch.

The code is in "toaster/bldcontrol/localhostbecontroller.py", and it does not appear to be doing the right actions:

            # branch magic name "HEAD" will inhibit checkout
            if commit != "HEAD":
                logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname))
                ref = commit if re.match('^[a-fA-F0-9]+$', commit) else 'origin/%s' % commit
                self._shellcmd('git fetch --all && git reset --hard "%s"' % ref, localdirname)

I will examine this closer and file a defect for YP-2.4.1.

- David



-----Original Message-----
From: toaster-bounces@yoctoproject.org [mailto:toaster-bounces@yoctoproject.org] On Behalf Of Stéphane Ancelot
Sent: Monday, November 13, 2017 8:11 AM
To: toaster@yoctoproject.org
Subject: [Toaster] can not add meta-intel layer version rocko

Hi,

I added meta-layer intel , specifying rocko git version. I had some incompatibilities with kernel version...

Unfortunately, it looks like toaster  added meta-intel master branch. 
(it is displayed in the build configuration) .

The toaster-bblayers.conf file indicates

BBLAYERS =
"/var/www/toaster/poky/_toaster_clones/_git___git.yoctoproject.org_meta-intel_rocko
..."

but in this folder, git branch tells me '* master'....

where is the mistake ?

Regards,

S.Ancelot

--
_______________________________________________
toaster mailing list
toaster@yoctoproject.org
https://lists.yoctoproject.org/listinfo/toaster

Re: can not add meta-intel layer version rocko

[Reyna, David]

Hi Stéphane,

1) I finally used gitk to look at the meta-intel git repo, and I discovered in this manner that not seeing "rocko" as the branch name is a 'feature' of git. Rocko has not yet diverged from master, and "git branch" only shows the first matching branch name.

Specifically, after Toaster loads "meta-intel", HEAD is equal to:

   HEAD=[8.0-rocko-2.4][master][remotes/origin/master][remotes/origin/rocko]

This means that even though "git branch" shows "master", this is the same commit for "remotes/origin/rocko".

I have the proof below.


2) "I can see there is available debug output. how to enable the full debug log?"

The log output from "localhostbecontroller.py" is found in " toaster_runbuilds.log" in the directory where you started Toaster. Note that if you make any changes to this file, for example adding more log statements, you need to restart Toaster to get the new version running.

I have this documented at "https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster#Debugging_Toaster".

FYI: I looked in my log and I see that the relevant checkout command is "git reset --hard "origin/rocko".


3) Here is the proof that 'master' === 'rocko'

* I first see that after the "git reset --hard "origin/rocko", the top most commit is " d68dda959b5bf6f90aa8e5c2f027be324bb68e14".

* If I explicitly checkout rocko, the top most commit is the same, even though "git branch" shows "master".

* If I for example checkout pyro, then the top most commit changes to a much earlier commit.

* There are probably a git commands that shows all branches that match HEAD, but gitk was the only one I found so far.

* Here is my log:

vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
$ cd _toaster_clones/_git___git.yoctoproject.org_meta-intel_rocko
$ git reset --hard "origin/rocko"
HEAD is now at d68dda9 layer.conf: Bump Layer due to removal of meta-tlk
$ git log
commit d68dda959b5bf6f90aa8e5c2f027be324bb68e14
Author: Saul Wold <sgw@linux.intel.com>
Date:   Wed Nov 1 10:38:28 2017 -0700

    layer.conf: Bump Layer due to removal of meta-tlk
    
    Signed-off-by: Saul Wold <sgw@linux.intel.com>
...
$ git branch
* master
$
$ git checkout rocko
Branch rocko set up to track remote branch rocko from origin.
Switched to a new branch 'rocko'
$
$ git log
commit d68dda959b5bf6f90aa8e5c2f027be324bb68e14
Author: Saul Wold <sgw@linux.intel.com>
Date:   Wed Nov 1 10:38:28 2017 -0700

    layer.conf: Bump Layer due to removal of meta-tlk
    
    Signed-off-by: Saul Wold <sgw@linux.intel.com
***
$
$ git reset --hard "origin/pyro"
HEAD is now at 4cd63f5 linux-intel: Update SRCREV -> 4.9.56
$ git log
commit 4cd63f57820ce0e4ebd598251d3a13b5a4b9b791
Author: Saul Wold <sgw@linux.intel.com>
Date:   Thu Oct 26 13:22:43 2017 -0700

    linux-intel: Update SRCREV -> 4.9.56
    
    Signed-off-by: Saul Wold <sgw@linux.intel.com>
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


- David

-----Original Message-----
From: Stéphane Ancelot [mailto:sancelot@numalliance.com] 
Sent: Tuesday, November 14, 2017 12:07 AM
To: Reyna, David
Subject: Re: [Toaster] can not add meta-intel layer version rocko

I can sea there is available debug output. how to enable the full debug log ?

Le 14/11/2017 à 04:45, Reyna, David a écrit :
>> where is the mistake ?
> Hmm. It appears that Toaster found the right layer and branch for the BBLAYERS value, but I when I tested this I also observe that the "*meta-intel-rocko" directory is on the "master" branch.
>
> The code is in "toaster/bldcontrol/localhostbecontroller.py", and it does not appear to be doing the right actions:
>
>              # branch magic name "HEAD" will inhibit checkout
>              if commit != "HEAD":
>                  logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname))
>                  ref = commit if re.match('^[a-fA-F0-9]+$', commit) else 'origin/%s' % commit
>                  self._shellcmd('git fetch --all && git reset --hard 
> "%s"' % ref, localdirname)
>
> I will examine this closer and file a defect for YP-2.4.1.
>
> - David
>
>
>
> -----Original Message-----
> From: toaster-bounces@yoctoproject.org 
> [mailto:toaster-bounces@yoctoproject.org] On Behalf Of Stéphane 
> Ancelot
> Sent: Monday, November 13, 2017 8:11 AM
> To: toaster@yoctoproject.org
> Subject: [Toaster] can not add meta-intel layer version rocko
>
> Hi,
>
> I added meta-layer intel , specifying rocko git version. I had some incompatibilities with kernel version...
>
> Unfortunately, it looks like toaster  added meta-intel master branch.
> (it is displayed in the build configuration) .
>
> The toaster-bblayers.conf file indicates
>
> BBLAYERS =
> "/var/www/toaster/poky/_toaster_clones/_git___git.yoctoproject.org_met
> a-intel_rocko
> ..."
>
> but in this folder, git branch tells me '* master'....
>
> where is the mistake ?
>
> Regards,
>
> S.Ancelot
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster