[poky] [PATCH 1/2] documentation: BSP Developer's Guide fixes

[Darren Hart]

On 03/13/2011 10:50 PM, Tom Zanussi wrote:
> From: Tom Zanussi<tom.zanussi at intel.com>
>
> - use linux-yocto instead of linux-yocto-stable in examples
> - change branch names to match linux-yocto usage
> - remove outdated 'wrs' where it appears
>
> Signed-off-by: Tom Zanussi<tom.zanussi at intel.com>

Acked-by: Darren Hart <dvhart at linux.intel.com>

> ---
>   documentation/bsp-guide/bsp.xml |   22 +++++++++++-----------
>   1 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
> index ea9b001..ba6ad74 100644
> --- a/documentation/bsp-guide/bsp.xml
> +++ b/documentation/bsp-guide/bsp.xml
> @@ -83,7 +83,7 @@ meta-<bsp_name>/conf/layer.conf
>   meta-<bsp_name>/conf/machine/*.conf
>   meta-<bsp_name>/recipes-bsp/*
>   meta-<bsp_name>/recipes-graphics/*
> -meta-<bsp_name>/recipes-kernel/linux/linux-yocto-stable.bbappend
> +meta-<bsp_name>/recipes-kernel/linux/linux-yocto_git.bbappend
>                   </programlisting>
>               </para>
>
> @@ -107,7 +107,7 @@ meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd/fix_open_max_prepr
>   meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd/macro_tweak.patch
>   meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd/nodolt.patch
>   meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb
> -meta-crownbay/recipes-kernel/linux/linux-wrs_git.bbappend
> +meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
>                   </programlisting>
>               </para>
>
> @@ -315,7 +315,7 @@ meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-emgd_1.7.99.2.bb
>               <section id='bsp-filelayout-kernel'>
>               <title>Linux Kernel Configuration</title>
>               <programlisting>
> -meta-<bsp_name>/recipes-kernel/linux/linux-yocto-stable.bbappend
> +meta-<bsp_name>/recipes-kernel/linux/linux-yocto_git.bbappend
>               </programlisting>
>
>               <para>
> @@ -330,27 +330,27 @@ meta-<bsp_name>/recipes-kernel/linux/linux-yocto-stable.bbappend
>                   directory.
>               </para>
>               <para>
> -                Suppose you use a BSP that uses the<filename>linux-yocto-stable_git.bb</filename>  kernel,
> +                Suppose you use a BSP that uses the<filename>linux-yocto_git.bb</filename>  kernel,
>                   which is the preferred kernel to use for developing a new BSP using the Yocto Project.
>                   In other words, you have selected the kernel in your
>                   <filename><bsp_name>.conf</filename>  file by adding the following statement:
>                   <programlisting>
> -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable"
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
>                   </programlisting>
> -                You would use the<filename>linux-yocto-stable_git.bbappend</filename>  file to append
> +                You would use the<filename>linux-yocto_git.bbappend</filename>  file to append
>                   specific BSP settings to the kernel, thus configuring the kernel for your particular BSP.
>               </para>
>               <para>
>                   Now take a look at the existing "crownbay" BSP.
>                   The append file used is:
>                   <programlisting>
> -meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend
> +meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend
>                   </programlisting>
>                   The file contains the following:
>                   <programlisting>
>   FILESEXTRAPATHS := "${THISDIR}/${PN}"
>   COMPATIBLE_MACHINE_crownbay = "crownbay"
> -KMACHINE_crownbay = "crownbay"
> +KMACHINE_crownbay = "yocto/standard/crownbay"
>                   </programlisting>
>                   This append file adds "crownbay" as a compatible machine,
>                   and additionally sets a Yocto Kernel-specific variable that identifies the name of the
> @@ -371,7 +371,7 @@ KMACHINE_crownbay = "crownbay"
>                   For example, suppose you had a set of configuration options in a file called
>                   <filename>defconfig</filename>.
>                   If you put that file inside a directory named
> -<filename class='directory'>/linux-yocto-stable</filename>  and then added
> +<filename class='directory'>/linux-yocto</filename>  and then added
>                   a SRC_URI statement such as the following to the append file, those configuration
>                   options will be picked up and applied when the kernel is built.
>                   <programlisting>
> @@ -397,7 +397,7 @@ SRC_URI += "file://defconfig \
>               <note><para>
>                   Other methods exist to accomplish grouping and defining configuration options.
>                   For example, you could directly add configuration options to the Yocto kernel
> -<filename class='directory'>wrs_meta</filename>  branch for your BSP.
> +<filename class='directory'>meta</filename>  branch for your BSP.
>                   The configuration options will likely end up in that location anyway if the BSP gets
>                   added to the Yocto Project.
>                   For information on how to add these configurations directly, see the
> @@ -407,7 +407,7 @@ SRC_URI += "file://defconfig \
>               </para>
>               <para>
>                   In general, however, the Yocto Project maintainers take care of moving the SRC_URI-specified
> -                configuration options to the<filename class='directory'>wrs_meta</filename>  branch.
> +                configuration options to the<filename class='directory'>meta</filename>  branch.
>                   Not only is it easier for BSP developers to not have to worry about putting those
>                   configurations in the branch, but having the maintainers do it allows them to apply
>                   'global' knowledge about the kinds of common configuration options multiple BSPs in

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