summaryrefslogtreecommitdiffstats
path: root/documentation/kernel-dev
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2023-10-23 21:26:44 +0200
committerSteve Sakoman <steve@sakoman.com>2023-10-25 04:45:51 -1000
commitaaf748b95f62621d1139c62c40e418c272cc6a63 (patch)
treef858b74d30a565002e5ecf36c5dacf56b5f864e0 /documentation/kernel-dev
parent811cf0320c251f3667109ab99695d6694a30ecd3 (diff)
downloadpoky-aaf748b95f62621d1139c62c40e418c272cc6a63.tar.gz
manuals: update linux-yocto append examples
(From yocto-docs rev: b5d385f20d22566e12a7938a9894b86429f1dcfb) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'documentation/kernel-dev')
-rw-r--r--documentation/kernel-dev/advanced.rst3
-rw-r--r--documentation/kernel-dev/common.rst34
2 files changed, 18 insertions, 19 deletions
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst
index b5290b61b3..e38a8da25c 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 4279cbb707..3406fcfe75 100644
--- a/documentation/kernel-dev/common.rst
+++ b/documentation/kernel-dev/common.rst
@@ -455,13 +455,13 @@ Creating the Append File
455 455
456You create this file in your custom layer. You also name it accordingly 456You create this file in your custom layer. You also name it accordingly
457based on the linux-yocto recipe you are using. For example, if you are 457based on the linux-yocto recipe you are using. For example, if you are
458modifying the ``meta/recipes-kernel/linux/linux-yocto_4.12.bb`` recipe, 458modifying the ``meta/recipes-kernel/linux/linux-yocto_5.15.bb`` recipe,
459the append file will typically be located as follows within your custom 459the append file will typically be located as follows within your custom
460layer: 460layer:
461 461
462.. code-block:: none 462.. code-block:: none
463 463
464 your-layer/recipes-kernel/linux/linux-yocto_4.12.bbappend 464 your-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend
465 465
466The append file should initially extend the 466The append file should initially extend the
467:term:`FILESPATH` search path by 467:term:`FILESPATH` search path by
@@ -489,36 +489,36 @@ As an example, consider the following append file used by the BSPs in
489 489
490.. code-block:: none 490.. code-block:: none
491 491
492 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend 492 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend
493 493
494Here are the contents of this file. Be aware that the actual commit ID 494Here are the contents of this file. Be aware that the actual commit ID
495strings in this example listing might be different than the actual 495strings in this example listing might be different than the actual
496strings in the file from the ``meta-yocto-bsp`` layer upstream. 496strings in the file from the ``meta-yocto-bsp`` layer upstream.
497:: 497::
498 498
499 KBRANCH:genericx86 = "standard/base" 499 KBRANCH:genericx86 = "v5.15/standard/base"
500 KBRANCH:genericx86-64 = "standard/base" 500 KBRANCH:genericx86-64 = "v5.15/standard/base"
501 KBRANCH:edgerouter = "v5.15/standard/edgerouter"
502 KBRANCH:beaglebone-yocto = "v5.15/standard/beaglebone"
501 503
502 KMACHINE:genericx86 ?= "common-pc" 504 KMACHINE:genericx86 ?= "common-pc"
503 KMACHINE:genericx86-64 ?= "common-pc-64" 505 KMACHINE:genericx86-64 ?= "common-pc-64"
504 KBRANCH:edgerouter = "standard/edgerouter" 506 KMACHINE:beaglebone-yocto ?= "beaglebone"
505 KBRANCH:beaglebone = "standard/beaglebone"
506
507 SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19"
508 SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19"
509 SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
510 SRCREV_machine:beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
511 507
508 SRCREV_machine:genericx86 ?= "0b628306d1f9ea28c0e86369ce9bb87a47893c9c"
509 SRCREV_machine:genericx86-64 ?= "0b628306d1f9ea28c0e86369ce9bb87a47893c9c"
510 SRCREV_machine:edgerouter ?= "90f1ee6589264545f548d731c2480b08a007230f"
511 SRCREV_machine:beaglebone-yocto ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a"
512 512
513 COMPATIBLE_MACHINE:genericx86 = "genericx86" 513 COMPATIBLE_MACHINE:genericx86 = "genericx86"
514 COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" 514 COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
515 COMPATIBLE_MACHINE:edgerouter = "edgerouter" 515 COMPATIBLE_MACHINE:edgerouter = "edgerouter"
516 COMPATIBLE_MACHINE:beaglebone = "beaglebone" 516 COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
517 517
518 LINUX_VERSION:genericx86 = "4.12.7" 518 LINUX_VERSION:genericx86 = "5.15.72"
519 LINUX_VERSION:genericx86-64 = "4.12.7" 519 LINUX_VERSION:genericx86-64 = "5.15.72"
520 LINUX_VERSION:edgerouter = "4.12.10" 520 LINUX_VERSION:edgerouter = "5.15.54"
521 LINUX_VERSION:beaglebone = "4.12.10" 521 LINUX_VERSION:beaglebone-yocto = "5.15.54"
522 522
523This append file 523This append file
524contains statements used to support several BSPs that ship with the 524contains statements used to support several BSPs that ship with the