[poky] [PATCH 1/2] linux-wrs: implement BSP bootstrapping via fallback branches

Bruce Ashfield bruce.ashfield at gmail.com
Fri Nov 12 11:01:27 PST 2010


On Fri, Nov 12, 2010 at 1:55 PM, Darren Hart <dvhart at linux.intel.com> wrote:
> Hey Bruce,
>
> Dropping yocto list as this is a development discussion (and the webpage
> says those take place on poky at yoctoproject.org). Someone correct me if I've
> got this wrong.
>
> On 11/12/2010 10:40 AM, Bruce Ashfield wrote:
>>
>> When creating a new BSP there isn't always an upstream branch
>> to validate SRCREVs against. Therefore, creating a new BSP
>> required extra manipulations of the git repository, even though
>> the branch for the build would be dynamically created.
>>
>> To fix this, provide a fallback to the 'standard' branch if
>> WRMACHINE is not assigned a specific value for the given MACHINE.
>> The fallback saved in KBRANCH, and represents the branch that
>
> It seems that KBRANCH_FALLBACK might be a bit more self-descriptive. Unless
> I'm misunderstanding it's purpose...
>
> OK reading the patch, KBRANCH is basically the new variable we store the
> kernel branch in, and it is set to standard if WRMACHINE is not set -
> KBRANCH itself is not the fallback. Code looks good, commit message was
> ambiguous (to me).

Right. The fallback is actually only in the phython chunk. KBRANCH
will be used shortly to separate what you checkout and build from
what it validated by the fetchers. I needed this for the branch renaming
and minimization changes that will follow this shortly.

>
>> we should build, even if no fallback is required. Some substeps
>> of the recipe have been updated to use KBRANCH rather than
>> enforcing MACHINE-KERNELTYPE.
>>
>> Signed-off-by: Bruce Ashfield<bruce.ashfield at windriver.com>
>> ---
>>  meta/recipes-kernel/linux/linux-wrs_git.bb |   40
>> ++++++++++++++++++++++-----
>>  1 files changed, 32 insertions(+), 8 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb
>> b/meta/recipes-kernel/linux/linux-wrs_git.bb
>> index 1f2b11e..209648b 100644
>> --- a/meta/recipes-kernel/linux/linux-wrs_git.bb
>> +++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
>> @@ -10,10 +10,10 @@ PV = "2.6.34+git${SRCPV}"
>>  # To use a staged, on-disk bare clone of a Wind River Kernel, use a
>>  # variant of the below
>>  # SRC_URI = "git://///path/to/kernel/default_kernel.git;fullclone=1"
>> -SRC_URI =
>> "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine
>> \
>> +SRC_URI =
>> "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine
>> \
>>
>> git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
>>
>> -WRMACHINE = "${MACHINE}"
>> +WRMACHINE = "UNDEFINED"
>
> Not a critique, just a question - why "UNDEFINED" instead of just not set?

It was easier for me to test :) and let me make it more explicit in the
python chunk if someone was grepping around .. but outside of that,
nothing particularly deep.

Cheers,

Bruce

>
> --
> Darren Hart
> Yocto Linux Kernel
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"



More information about the poky mailing list