manuals: update linux-yocto append examples

(From yocto-docs rev: 0d195d66e434ddedd33bf8db89643fa5ab192e29)

Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Opdenacker 2023-10-13 15:08:43 +02:00 committed by Richard Purdie
parent 1c90ad84f3
commit 203c78b719
4 changed files with 36 additions and 46 deletions

View File

@ -1449,39 +1449,35 @@ The kernel recipe used to build the kernel image for the BeagleBone
device was established in the machine configuration:: device was established in the machine configuration::
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_VERSION_linux-yocto ?= "5.0%" PREFERRED_VERSION_linux-yocto ?= "6.1%"
The ``meta-yocto-bsp/recipes-kernel/linux`` directory in the layer contains The ``meta-yocto-bsp/recipes-kernel/linux`` directory in the layer contains
metadata used to build the kernel. In this case, a kernel append file metadata used to build the kernel. In this case, a kernel append file
(i.e. ``linux-yocto_5.0.bbappend``) is used to override an established (i.e. ``linux-yocto_6.1.bbappend``) is used to override an established
kernel recipe (i.e. ``linux-yocto_5.0.bb``), which is located in kernel recipe (i.e. ``linux-yocto_6.1.bb``), which is located in
:yocto_git:`/poky/tree/meta/recipes-kernel/linux`. :yocto_git:`/poky/tree/meta/recipes-kernel/linux`.
Following is the contents of the append file:: Following is the contents of the append file::
KBRANCH:genericx86 = "v5.0/standard/base" KBRANCH:genericx86 = "v6.1/standard/base"
KBRANCH:genericx86-64 = "v5.0/standard/base" KBRANCH:genericx86-64 = "v6.1/standard/base"
KBRANCH:edgerouter = "v5.0/standard/edgerouter" KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone"
KBRANCH:beaglebone-yocto = "v5.0/standard/beaglebone"
KMACHINE:genericx86 ?= "common-pc" KMACHINE:genericx86 ?= "common-pc"
KMACHINE:genericx86-64 ?= "common-pc-64" KMACHINE:genericx86-64 ?= "common-pc-64"
KMACHINE:beaglebone-yocto ?= "beaglebone" KMACHINE:beaglebone-yocto ?= "beaglebone"
SRCREV_machine:genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine:genericx86 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
SRCREV_machine:genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine:genericx86-64 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
SRCREV_machine:edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine:beaglebone-yocto ?= "423e1996694b61fbfc8ec3bf062fc6461d64fde1"
SRCREV_machine:beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
COMPATIBLE_MACHINE:genericx86 = "genericx86" COMPATIBLE_MACHINE:genericx86 = "genericx86"
COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
COMPATIBLE_MACHINE:edgerouter = "edgerouter"
COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
LINUX_VERSION:genericx86 = "5.0.3" LINUX_VERSION:genericx86 = "6.1.30"
LINUX_VERSION:genericx86-64 = "5.0.3" LINUX_VERSION:genericx86-64 = "6.1.30"
LINUX_VERSION:edgerouter = "5.0.3" LINUX_VERSION:beaglebone-yocto = "6.1.20"
LINUX_VERSION:beaglebone-yocto = "5.0.3"
This particular append file works for all the machines that are This particular append file works for all the machines that are
part of the ``meta-yocto-bsp`` layer. The relevant statements are part of the ``meta-yocto-bsp`` layer. The relevant statements are

View File

@ -69,8 +69,7 @@ to indicate the branch.
You can use the :term:`KBRANCH` value to define an alternate branch typically You can use the :term:`KBRANCH` value to define an alternate branch typically
with a machine override as shown here from the ``meta-yocto-bsp`` layer:: with a machine override as shown here from the ``meta-yocto-bsp`` layer::
KBRANCH:edgerouter = "standard/edgerouter" KBRANCH:beaglebone-yocto = "standard/beaglebone"
The linux-yocto style recipes can optionally define the following The linux-yocto style recipes can optionally define the following
variables: variables:

View File

@ -387,13 +387,13 @@ Creating the Append File
You create this file in your custom layer. You also name it accordingly You create this file in your custom layer. You also name it accordingly
based on the linux-yocto recipe you are using. For example, if you are based on the linux-yocto recipe you are using. For example, if you are
modifying the ``meta/recipes-kernel/linux/linux-yocto_4.12.bb`` recipe, modifying the ``meta/recipes-kernel/linux/linux-yocto_6.1.bb`` recipe,
the append file will typically be located as follows within your custom the append file will typically be located as follows within your custom
layer: layer:
.. code-block:: none .. code-block:: none
your-layer/recipes-kernel/linux/linux-yocto_4.12.bbappend your-layer/recipes-kernel/linux/linux-yocto_6.1.bbappend
The append file should initially extend the The append file should initially extend the
:term:`FILESPATH` search path by :term:`FILESPATH` search path by
@ -421,35 +421,31 @@ As an example, consider the following append file used by the BSPs in
.. code-block:: none .. code-block:: none
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend
Here are the contents of this file. Be aware that the actual commit ID Here are the contents of this file. Be aware that the actual commit ID
strings in this example listing might be different than the actual strings in this example listing might be different than the actual
strings in the file from the ``meta-yocto-bsp`` layer upstream:: strings in the file from the ``meta-yocto-bsp`` layer upstream::
KBRANCH:genericx86 = "standard/base" KBRANCH:genericx86 = "v6.1/standard/base"
KBRANCH:genericx86-64 = "standard/base" KBRANCH:genericx86-64 = "v6.1/standard/base"
KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone"
KMACHINE:genericx86 ?= "common-pc" KMACHINE:genericx86 ?= "common-pc"
KMACHINE:genericx86-64 ?= "common-pc-64" KMACHINE:genericx86-64 ?= "common-pc-64"
KBRANCH:edgerouter = "standard/edgerouter" KMACHINE:beaglebone-yocto ?= "beaglebone"
KBRANCH:beaglebone = "standard/beaglebone"
SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" SRCREV_machine:genericx86 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" SRCREV_machine:genericx86-64 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" SRCREV_machine:beaglebone-yocto ?= "423e1996694b61fbfc8ec3bf062fc6461d64fde1"
SRCREV_machine:beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
COMPATIBLE_MACHINE:genericx86 = "genericx86"
COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
COMPATIBLE_MACHINE:genericx86 = "genericx86" LINUX_VERSION:genericx86 = "6.1.30"
COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" LINUX_VERSION:genericx86-64 = "6.1.30"
COMPATIBLE_MACHINE:edgerouter = "edgerouter" LINUX_VERSION:beaglebone-yocto = "6.1.20"
COMPATIBLE_MACHINE:beaglebone = "beaglebone"
LINUX_VERSION:genericx86 = "4.12.7"
LINUX_VERSION:genericx86-64 = "4.12.7"
LINUX_VERSION:edgerouter = "4.12.10"
LINUX_VERSION:beaglebone = "4.12.10"
This append file This append file
contains statements used to support several BSPs that ship with the contains statements used to support several BSPs that ship with the

View File

@ -4340,17 +4340,16 @@ system and gives an overview of their function and contents.
This variable is also used from the kernel's append file to identify This variable is also used from the kernel's append file to identify
the kernel branch specific to a particular machine or target the kernel branch specific to a particular machine or target
hardware. Continuing with the previous kernel example, the kernel's hardware. Continuing with the previous kernel example, the kernel's
append file (i.e. ``linux-yocto_4.12.bbappend``) is located in the append file is located in the
BSP layer for a given machine. For example, the append file for the BSP layer for a given machine. For example, the append file for the
Beaglebone, EdgeRouter, and generic versions of both 32 and 64-bit IA Beaglebone, EdgeRouter, and generic versions of both 32 and 64-bit IA
machines (``meta-yocto-bsp``) is named machines (``meta-yocto-bsp``) is named
``meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend``. ``meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend``.
Here are the related statements from that append file:: Here are the related statements from that append file::
KBRANCH:genericx86 = "standard/base" KBRANCH:genericx86 = "v6.1/standard/base"
KBRANCH:genericx86-64 = "standard/base" KBRANCH:genericx86-64 = "v6.1/standard/base"
KBRANCH:edgerouter = "standard/edgerouter" KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone"
KBRANCH:beaglebone = "standard/beaglebone"
The :term:`KBRANCH` statements The :term:`KBRANCH` statements
identify the kernel branch to use when building for each supported identify the kernel branch to use when building for each supported