summaryrefslogtreecommitdiffstats
path: root/documentation/kernel-dev
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2023-10-13 15:08:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-20 14:40:29 +0100
commit203c78b7196b277e03e9dbc6e878721bee3dc604 (patch)
treeaed3ebf81b3ba66440e77a5302dba37e5b359db4 /documentation/kernel-dev
parent1c90ad84f3cf7932dd9c26b7d2e36a6ee6093804 (diff)
downloadpoky-203c78b7196b277e03e9dbc6e878721bee3dc604.tar.gz
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>
Diffstat (limited to 'documentation/kernel-dev')
-rw-r--r--documentation/kernel-dev/advanced.rst3
-rw-r--r--documentation/kernel-dev/common.rst40
2 files changed, 19 insertions, 24 deletions
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst
index 355326de6e..bcaaaeed14 100644
--- a/documentation/kernel-dev/advanced.rst
+++ b/documentation/kernel-dev/advanced.rst
@@ -69,8 +69,7 @@ to indicate the branch.
69 You can use the :term:`KBRANCH` value to define an alternate branch typically 69 You can use the :term:`KBRANCH` value to define an alternate branch typically
70 with a machine override as shown here from the ``meta-yocto-bsp`` layer:: 70 with a machine override as shown here from the ``meta-yocto-bsp`` layer::
71 71
72 KBRANCH:edgerouter = "standard/edgerouter" 72 KBRANCH:beaglebone-yocto = "standard/beaglebone"
73
74 73
75The linux-yocto style recipes can optionally define the following 74The linux-yocto style recipes can optionally define the following
76variables: 75variables:
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst
index 1d85202df4..c781a0682c 100644
--- a/documentation/kernel-dev/common.rst
+++ b/documentation/kernel-dev/common.rst
@@ -387,13 +387,13 @@ Creating the Append File
387 387
388You create this file in your custom layer. You also name it accordingly 388You create this file in your custom layer. You also name it accordingly
389based on the linux-yocto recipe you are using. For example, if you are 389based on the linux-yocto recipe you are using. For example, if you are
390modifying the ``meta/recipes-kernel/linux/linux-yocto_4.12.bb`` recipe, 390modifying the ``meta/recipes-kernel/linux/linux-yocto_6.1.bb`` recipe,
391the append file will typically be located as follows within your custom 391the append file will typically be located as follows within your custom
392layer: 392layer:
393 393
394.. code-block:: none 394.. code-block:: none
395 395
396 your-layer/recipes-kernel/linux/linux-yocto_4.12.bbappend 396 your-layer/recipes-kernel/linux/linux-yocto_6.1.bbappend
397 397
398The append file should initially extend the 398The append file should initially extend the
399:term:`FILESPATH` search path by 399:term:`FILESPATH` search path by
@@ -421,35 +421,31 @@ As an example, consider the following append file used by the BSPs in
421 421
422.. code-block:: none 422.. code-block:: none
423 423
424 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend 424 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend
425 425
426Here are the contents of this file. Be aware that the actual commit ID 426Here are the contents of this file. Be aware that the actual commit ID
427strings in this example listing might be different than the actual 427strings in this example listing might be different than the actual
428strings in the file from the ``meta-yocto-bsp`` layer upstream:: 428strings in the file from the ``meta-yocto-bsp`` layer upstream::
429 429
430 KBRANCH:genericx86 = "standard/base" 430 KBRANCH:genericx86 = "v6.1/standard/base"
431 KBRANCH:genericx86-64 = "standard/base" 431 KBRANCH:genericx86-64 = "v6.1/standard/base"
432 KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone"
432 433
433 KMACHINE:genericx86 ?= "common-pc" 434 KMACHINE:genericx86 ?= "common-pc"
434 KMACHINE:genericx86-64 ?= "common-pc-64" 435 KMACHINE:genericx86-64 ?= "common-pc-64"
435 KBRANCH:edgerouter = "standard/edgerouter" 436 KMACHINE:beaglebone-yocto ?= "beaglebone"
436 KBRANCH:beaglebone = "standard/beaglebone"
437 437
438 SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" 438 SRCREV_machine:genericx86 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
439 SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" 439 SRCREV_machine:genericx86-64 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86"
440 SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" 440 SRCREV_machine:beaglebone-yocto ?= "423e1996694b61fbfc8ec3bf062fc6461d64fde1"
441 SRCREV_machine:beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
442 441
442 COMPATIBLE_MACHINE:genericx86 = "genericx86"
443 COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
444 COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
443 445
444 COMPATIBLE_MACHINE:genericx86 = "genericx86" 446 LINUX_VERSION:genericx86 = "6.1.30"
445 COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" 447 LINUX_VERSION:genericx86-64 = "6.1.30"
446 COMPATIBLE_MACHINE:edgerouter = "edgerouter" 448 LINUX_VERSION:beaglebone-yocto = "6.1.20"
447 COMPATIBLE_MACHINE:beaglebone = "beaglebone"
448
449 LINUX_VERSION:genericx86 = "4.12.7"
450 LINUX_VERSION:genericx86-64 = "4.12.7"
451 LINUX_VERSION:edgerouter = "4.12.10"
452 LINUX_VERSION:beaglebone = "4.12.10"
453 449
454This append file 450This append file
455contains statements used to support several BSPs that ship with the 451contains statements used to support several BSPs that ship with the