summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2014-04-09 09:11:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-11 18:22:50 +0100
commit7ad025367262dbdc2017522149f907a3dbcb608d (patch)
treeac2fe9f0f02722448bf206a160567d59c65ef777 /documentation
parentbebc72a6ed2a1a6595517e71cbf7ac11fba38aca (diff)
downloadpoky-7ad025367262dbdc2017522149f907a3dbcb608d.tar.gz
ref-manual: Updated KBRANCH variable description.
I replaced the v3.4 version example with the v3.10 version. It is more up-to-date. (From yocto-docs rev: 2e7f5d4fbe24a8248686c9ca7cf870204966beec) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/ref-manual/ref-variables.xml60
1 files changed, 35 insertions, 25 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index f39d91c0dc..6de054d6e7 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3733,50 +3733,60 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
3733 <glossentry id='var-KBRANCH'><glossterm>KBRANCH</glossterm> 3733 <glossentry id='var-KBRANCH'><glossterm>KBRANCH</glossterm>
3734 <glossdef> 3734 <glossdef>
3735 <para> 3735 <para>
3736 A regular expression used by the build process to explicitly identify the kernel 3736 A regular expression used by the build process to explicitly
3737 branch that is validated, patched and configured during a build. 3737 identify the kernel branch that is validated, patched
3738 and configured during a build.
3738 The <filename>KBRANCH</filename> variable is optional. 3739 The <filename>KBRANCH</filename> variable is optional.
3739 You can use it to trigger checks to ensure the exact kernel branch you want is 3740 You can use it to trigger checks to ensure the exact kernel
3740 being used by the build process. 3741 branch you want is being used by the build process.
3741 </para> 3742 </para>
3742 3743
3743 <para> 3744 <para>
3744 Values for this variable are set in the kernel's recipe file and the kernel's 3745 Values for this variable are set in the kernel's recipe
3745 append file. 3746 file and the kernel's append file.
3746 For example, if you are using the Yocto Project kernel that is based on the 3747 For example, if you are using the Yocto Project kernel that
3747 Linux 3.4 kernel, the kernel recipe file is the 3748 is based on the Linux 3.10 kernel, the kernel recipe file
3748 <filename>meta/recipes-kernel/linux/linux-yocto_3.4.bb</filename> file. 3749 is the
3749 Following is the default value for <filename>KBRANCH</filename> and the default 3750 <filename>meta/recipes-kernel/linux/linux-yocto_3.10.bb</filename>
3750 override for the architectures the Yocto Project supports: 3751 file.
3752 Following is the default value for <filename>KBRANCH</filename>
3753 and the default override for the architectures the Yocto
3754 Project supports:
3751 <literallayout class='monospaced'> 3755 <literallayout class='monospaced'>
3752 KBRANCH_DEFAULT = "standard/base" 3756 KBRANCH_DEFAULT = "standard/base"
3753 KBRANCH = "${KBRANCH_DEFAULT}" 3757 KBRANCH = "${KBRANCH_DEFAULT}"
3754 </literallayout> 3758 </literallayout>
3755 This branch exists in the <filename>linux-yocto-3.4</filename> kernel Git 3759 This branch exists in the <filename>linux-yocto-3.10</filename>
3756 repository <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.4/refs/heads'></ulink>. 3760 kernel Git repository
3761 <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.10/refs/heads'></ulink>.
3757 </para> 3762 </para>
3758 3763
3759 <para> 3764 <para>
3760 This variable is also used from the kernel's append file to identify the kernel 3765 This variable is also used from the kernel's append file
3761 branch specific to a particular machine or target hardware. 3766 to identify the kernel branch specific to a particular
3762 The kernel's append file is located in the BSP layer for a given machine. 3767 machine or target hardware.
3768 The kernel's append file is located in the BSP layer for
3769 a given machine.
3763 For example, the kernel append file for the Crown Bay BSP is in the 3770 For example, the kernel append file for the Crown Bay BSP is in the
3764 <filename>meta-intel</filename> Git repository and is named 3771 <filename>meta-intel</filename> Git repository and is named
3765 <filename>meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend</filename>. 3772 <filename>meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend</filename>.
3766 Here are the related statements from the append file: 3773 Here are the related statements from the append file:
3767 <literallayout class='monospaced'> 3774 <literallayout class='monospaced'>
3768 COMPATIBLE_MACHINE_crownbay = "crownbay" 3775 COMPATIBLE_MACHINE_crownbay = "crownbay"
3769 KMACHINE_crownbay = "crownbay" 3776 KMACHINE_crownbay = "crownbay"
3770 KBRANCH_crownbay = "standard/crownbay" 3777 KBRANCH_crownbay = "standard/crownbay"
3778 KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
3771 3779
3772 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 3780 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
3773 KMACHINE_crownbay-noemgd = "crownbay" 3781 KMACHINE_crownbay-noemgd = "crownbay"
3774 KBRANCH_crownbay-noemgd = "standard/crownbay" 3782 KBRANCH_crownbay-noemgd = "standard/crownbay"
3775 </literallayout> 3783 KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
3776 The <filename>KBRANCH_*</filename> statements identify the kernel branch to 3784 </literallayout>
3777 use when building for the Crown Bay BSP. 3785 The <filename>KBRANCH_*</filename> statements identify
3778 In this case there are two identical statements: one for each type of 3786 the kernel branch to use when building for the Crown
3779 Crown Bay machine. 3787 Bay BSP.
3788 In this case there are two identical statements: one
3789 for each type of Crown Bay machine.
3780 </para> 3790 </para>
3781 </glossdef> 3791 </glossdef>
3782 </glossentry> 3792 </glossentry>