diff options
author | Michael Opdenacker <michael.opdenacker@bootlin.com> | 2023-10-13 15:08:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-20 14:40:29 +0100 |
commit | 203c78b7196b277e03e9dbc6e878721bee3dc604 (patch) | |
tree | aed3ebf81b3ba66440e77a5302dba37e5b359db4 | |
parent | 1c90ad84f3cf7932dd9c26b7d2e36a6ee6093804 (diff) | |
download | poky-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>
-rw-r--r-- | documentation/bsp-guide/bsp.rst | 28 | ||||
-rw-r--r-- | documentation/kernel-dev/advanced.rst | 3 | ||||
-rw-r--r-- | documentation/kernel-dev/common.rst | 40 | ||||
-rw-r--r-- | documentation/ref-manual/variables.rst | 11 |
4 files changed, 36 insertions, 46 deletions
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst index c78fbeb68f..c1160397be 100644 --- a/documentation/bsp-guide/bsp.rst +++ b/documentation/bsp-guide/bsp.rst | |||
@@ -1449,39 +1449,35 @@ The kernel recipe used to build the kernel image for the BeagleBone | |||
1449 | device was established in the machine configuration:: | 1449 | device was established in the machine configuration:: |
1450 | 1450 | ||
1451 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 1451 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
1452 | PREFERRED_VERSION_linux-yocto ?= "5.0%" | 1452 | PREFERRED_VERSION_linux-yocto ?= "6.1%" |
1453 | 1453 | ||
1454 | The ``meta-yocto-bsp/recipes-kernel/linux`` directory in the layer contains | 1454 | The ``meta-yocto-bsp/recipes-kernel/linux`` directory in the layer contains |
1455 | metadata used to build the kernel. In this case, a kernel append file | 1455 | metadata used to build the kernel. In this case, a kernel append file |
1456 | (i.e. ``linux-yocto_5.0.bbappend``) is used to override an established | 1456 | (i.e. ``linux-yocto_6.1.bbappend``) is used to override an established |
1457 | kernel recipe (i.e. ``linux-yocto_5.0.bb``), which is located in | 1457 | kernel recipe (i.e. ``linux-yocto_6.1.bb``), which is located in |
1458 | :yocto_git:`/poky/tree/meta/recipes-kernel/linux`. | 1458 | :yocto_git:`/poky/tree/meta/recipes-kernel/linux`. |
1459 | 1459 | ||
1460 | Following is the contents of the append file:: | 1460 | Following is the contents of the append file:: |
1461 | 1461 | ||
1462 | KBRANCH:genericx86 = "v5.0/standard/base" | 1462 | KBRANCH:genericx86 = "v6.1/standard/base" |
1463 | KBRANCH:genericx86-64 = "v5.0/standard/base" | 1463 | KBRANCH:genericx86-64 = "v6.1/standard/base" |
1464 | KBRANCH:edgerouter = "v5.0/standard/edgerouter" | 1464 | KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone" |
1465 | KBRANCH:beaglebone-yocto = "v5.0/standard/beaglebone" | ||
1466 | 1465 | ||
1467 | KMACHINE:genericx86 ?= "common-pc" | 1466 | KMACHINE:genericx86 ?= "common-pc" |
1468 | KMACHINE:genericx86-64 ?= "common-pc-64" | 1467 | KMACHINE:genericx86-64 ?= "common-pc-64" |
1469 | KMACHINE:beaglebone-yocto ?= "beaglebone" | 1468 | KMACHINE:beaglebone-yocto ?= "beaglebone" |
1470 | 1469 | ||
1471 | SRCREV_machine:genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" | 1470 | SRCREV_machine:genericx86 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86" |
1472 | SRCREV_machine:genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" | 1471 | SRCREV_machine:genericx86-64 ?= "6ec439b4b456ce929c4c07fe457b5d6a4b468e86" |
1473 | SRCREV_machine:edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" | 1472 | SRCREV_machine:beaglebone-yocto ?= "423e1996694b61fbfc8ec3bf062fc6461d64fde1" |
1474 | SRCREV_machine:beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" | ||
1475 | 1473 | ||
1476 | COMPATIBLE_MACHINE:genericx86 = "genericx86" | 1474 | COMPATIBLE_MACHINE:genericx86 = "genericx86" |
1477 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" | 1475 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" |
1478 | COMPATIBLE_MACHINE:edgerouter = "edgerouter" | ||
1479 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" | 1476 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" |
1480 | 1477 | ||
1481 | LINUX_VERSION:genericx86 = "5.0.3" | 1478 | LINUX_VERSION:genericx86 = "6.1.30" |
1482 | LINUX_VERSION:genericx86-64 = "5.0.3" | 1479 | LINUX_VERSION:genericx86-64 = "6.1.30" |
1483 | LINUX_VERSION:edgerouter = "5.0.3" | 1480 | LINUX_VERSION:beaglebone-yocto = "6.1.20" |
1484 | LINUX_VERSION:beaglebone-yocto = "5.0.3" | ||
1485 | 1481 | ||
1486 | This particular append file works for all the machines that are | 1482 | This particular append file works for all the machines that are |
1487 | part of the ``meta-yocto-bsp`` layer. The relevant statements are | 1483 | part of the ``meta-yocto-bsp`` layer. The relevant statements are |
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 | ||
75 | The linux-yocto style recipes can optionally define the following | 74 | The linux-yocto style recipes can optionally define the following |
76 | variables: | 75 | variables: |
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 | ||
388 | You create this file in your custom layer. You also name it accordingly | 388 | You create this file in your custom layer. You also name it accordingly |
389 | based on the linux-yocto recipe you are using. For example, if you are | 389 | based on the linux-yocto recipe you are using. For example, if you are |
390 | modifying the ``meta/recipes-kernel/linux/linux-yocto_4.12.bb`` recipe, | 390 | modifying the ``meta/recipes-kernel/linux/linux-yocto_6.1.bb`` recipe, |
391 | the append file will typically be located as follows within your custom | 391 | the append file will typically be located as follows within your custom |
392 | layer: | 392 | layer: |
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 | ||
398 | The append file should initially extend the | 398 | The 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 | ||
426 | Here are the contents of this file. Be aware that the actual commit ID | 426 | Here are the contents of this file. Be aware that the actual commit ID |
427 | strings in this example listing might be different than the actual | 427 | strings in this example listing might be different than the actual |
428 | strings in the file from the ``meta-yocto-bsp`` layer upstream:: | 428 | strings 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 | ||
454 | This append file | 450 | This append file |
455 | contains statements used to support several BSPs that ship with the | 451 | contains statements used to support several BSPs that ship with the |
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index a3b774b540..fd64088512 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -4340,17 +4340,16 @@ system and gives an overview of their function and contents. | |||
4340 | This variable is also used from the kernel's append file to identify | 4340 | This variable is also used from the kernel's append file to identify |
4341 | the kernel branch specific to a particular machine or target | 4341 | the kernel branch specific to a particular machine or target |
4342 | hardware. Continuing with the previous kernel example, the kernel's | 4342 | hardware. Continuing with the previous kernel example, the kernel's |
4343 | append file (i.e. ``linux-yocto_4.12.bbappend``) is located in the | 4343 | append file is located in the |
4344 | BSP layer for a given machine. For example, the append file for the | 4344 | BSP layer for a given machine. For example, the append file for the |
4345 | Beaglebone, EdgeRouter, and generic versions of both 32 and 64-bit IA | 4345 | Beaglebone, EdgeRouter, and generic versions of both 32 and 64-bit IA |
4346 | machines (``meta-yocto-bsp``) is named | 4346 | machines (``meta-yocto-bsp``) is named |
4347 | ``meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend``. | 4347 | ``meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.1.bbappend``. |
4348 | Here are the related statements from that append file:: | 4348 | Here are the related statements from that append file:: |
4349 | 4349 | ||
4350 | KBRANCH:genericx86 = "standard/base" | 4350 | KBRANCH:genericx86 = "v6.1/standard/base" |
4351 | KBRANCH:genericx86-64 = "standard/base" | 4351 | KBRANCH:genericx86-64 = "v6.1/standard/base" |
4352 | KBRANCH:edgerouter = "standard/edgerouter" | 4352 | KBRANCH:beaglebone-yocto = "v6.1/standard/beaglebone" |
4353 | KBRANCH:beaglebone = "standard/beaglebone" | ||
4354 | 4353 | ||
4355 | The :term:`KBRANCH` statements | 4354 | The :term:`KBRANCH` statements |
4356 | identify the kernel branch to use when building for each supported | 4355 | identify the kernel branch to use when building for each supported |