On Wed, 2011-02-09 at 01:22 -0500, Bruce Ashfield wrote:
> In order to build BSPs that were not already integrated into
> the upstream linux yocto kernel AND keep the git fetcher happy,
> some fairly complex anonymous python sections were required.
> 
> These sections cause problems with variable expansion and SRCREV
> processing.
> 
> With the updated git fetcher code, we can streamline the BSP
> boostrapping process and drop 99% of the anonymous python code.
> 
> This commit has the following changes to support BSP boot strapping
> and simplication for existing BSPs.
> 
>    - KMETA is set per-recipe rather than in python code
>    - undefined machines are no longer used, but instead common
>      branch names are set per-recipe
>    - fallback machine SRCREVs are present in the default revisions
>      file
>    - A new variable YOCTO_KERNEL_EXTERNAL_BRANCH should be set in
>      the local.conf for new BSPs instead of being programatically
>      determined in the anonymous python.
>    - No more explicity KMACHINE variable expansion and manipulation,
>      since the tools and build phases no longer require it due
>      to the per-recipe fallbacks.
> 
> Integrated/merged BSPs are unaffected by the changes and have been
> regression tested.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfi...@windriver.com>
> 
> diff --git a/meta/conf/distro/include/poky-default-revisions.inc 
> b/meta/conf/distro/include/poky-default-revisions.inc
> index 9abc4a5..a04fa9e 100644
> --- a/meta/conf/distro/include/poky-default-revisions.inc
> +++ b/meta/conf/distro/include/poky-default-revisions.inc
> @@ -59,7 +59,7 @@ SRCREV_pn-gypsy ??= "147"
>  SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
>  SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
>  SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee"
> -SRCREV_pn-kern-tools-native ??= "fde7ef8fa8043607752563b9b7908f487eb2f7dd"
> +SRCREV_pn-kern-tools-native ??= "4f13a46499261ea181fdc13db5459067df08aca7"
>  SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
>  SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc"
>  SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f"
> @@ -110,6 +110,7 @@ SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= 
> "68fb0b8d73bbb336ffa4a47bc70ec1eab
>  SRCREV_machine_pn-linux-yocto_beagleboard ?= 
> "343c06b25b221aa7f7019aee83b2d976041fddce"
>  SRCREV_machine_pn-linux-yocto ?= "cb4faf3af527e25feee584f39c3956ca0c9448c8"
>  SRCREV_meta_pn-linux-yocto ?= "5a32d7fe3b817868ebb697d2d883d743903685ae"
> +SRCREV_machine_pn-linux-yocto ?= "cb4faf3af527e25feee584f39c3956ca0c9448c8"
>  SRCREV_pn-linux-libc-headers-yocto ??= 
> "343c06b25b221aa7f7019aee83b2d976041fddce"
>  SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
>  SRCREV_pn-matchbox-desktop-sato ??= "76"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb 
> b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
> index d4bee77..3c1e669 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb

I merged this with the exception of the second hunk above since it just
adds a duplicate line.

Cheers,

Richard

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

Reply via email to