[linux-yocto] linux-yocto-3.10 emgd-1.18 checking out as standard/base

[Hart, Darren]

Trying to build minnow/dora with the latest linux-yocto 3.10-ltsi
including the recent emgd fixes results in a build source tree that has no
emgd patches applied.

The recipe has good SRCREVs:

Minnow linux-yocto_3.10.bbappend:

SRC_URI_minnow = 
"git://git.yoctoproject.org/linux-yocto-3.10;protocol=git;nocheckout=1;bran
ch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"

SRCREV_machine_pn-linux-yocto_minnow ?=
"78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
SRCREV_meta_pn-linux-yocto_minnow ?=
"6e0e756d51372c8b176c5d1e6f786545bceed351"
SRCREV_emgd_pn-linux-yocto_minnow ?=
"42d5e4548e8e79e094fa8697949eed4cf6af00a3"


I verified with bitbake -e that is indeed using the correct SRC_URI and
SRCREVs.

After a clean all and fresh linux-yocto build:

$ cd 
tmp/work/minnow-poky-linux/linux-yocto/3.10.32+gitAUTOINC+6e0e756d51_78afd3
095c-r0/linux
$ git rev-parse HEAD
78afd3095c9b37efbbfbfdc25eb3833ef3c6a718

This is the tip of standard/base. Appears as though the ddm-emgd feature
was not applied. But...

$ grep emgd .meta/meta-series
   # _mark drm-emgd-1.18.scc start
# _kconf hardware 
/build/yocto/dora/minnow_20131203165453/build/tmp/work/minnow-poky-linux/li
nux-yocto/3.10.32+gitAUTOINC+6e0e756d51_78afd3095c-r0/linux/.meta/cfg/kerne
l-cache/features/drm-emgd/drm-emgd.cfg
# _git merge emgd-1.18
   # _mark drm-emgd-1.18.scc en


So it did attempt to merge in the branch...

$ git rev-parse emgd-1.18
78afd3095c9b37efbbfbfdc25eb3833ef3c6a718


Well... That's not good, emgd-1.18 is the same as standard/base in this
checkout (although clearly not in the upstream repository). Any ideas what
is going on here? I would guess one of my SRCREVs was wrong (or possibly
the name of the variable in the recipe), but they all seem correct to me,
and no warnings are issued that I have seen.

-- 
Darren Hart
Yocto Project - Linux Kernel
Intel Open Source Technology Center