diff options
author | Quentin Schulz <foss@0leil.net> | 2021-08-11 22:06:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-14 12:04:23 +0100 |
commit | 3d93ddf9e8867ca3f331fc9d3f4eb658a2b7810f (patch) | |
tree | 58769f99fa5ac2af2bbff9fe2fc829ee7132023d /documentation/kernel-dev | |
parent | ed6482821c1cc04d3cd35f6b30631a4d09b594d1 (diff) | |
download | poky-3d93ddf9e8867ca3f331fc9d3f4eb658a2b7810f.tar.gz |
docs: fix new override syntax migration
Fix bits missed by the migration script.
(From yocto-docs rev: 452e0c5067476fd2ce81f09e6c73da84ced4bbd0)
Signed-off-by: Quentin Schulz <foss@0leil.net>
Reviewed-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.rst | 2 | ||||
-rw-r--r-- | documentation/kernel-dev/common.rst | 10 | ||||
-rw-r--r-- | documentation/kernel-dev/faq.rst | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst index 9c3a478cb9..2dbcca60c1 100644 --- a/documentation/kernel-dev/advanced.rst +++ b/documentation/kernel-dev/advanced.rst | |||
@@ -724,7 +724,7 @@ If the BSP description is in recipe space, you cannot simply list the | |||
724 | ``*.scc`` in the :term:`SRC_URI` statement. You need to use the following | 724 | ``*.scc`` in the :term:`SRC_URI` statement. You need to use the following |
725 | form from your kernel append file:: | 725 | form from your kernel append file:: |
726 | 726 | ||
727 | SRC_URI:append_myplatform = " \ | 727 | SRC_URI:append:myplatform = " \ |
728 | file://myplatform;type=kmeta;destsuffix=myplatform \ | 728 | file://myplatform;type=kmeta;destsuffix=myplatform \ |
729 | " | 729 | " |
730 | 730 | ||
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst index 331e982aca..7bfa468dec 100644 --- a/documentation/kernel-dev/common.rst +++ b/documentation/kernel-dev/common.rst | |||
@@ -502,23 +502,23 @@ strings in the file from the ``meta-yocto-bsp`` layer upstream. | |||
502 | KMACHINE:genericx86 ?= "common-pc" | 502 | KMACHINE:genericx86 ?= "common-pc" |
503 | KMACHINE:genericx86-64 ?= "common-pc-64" | 503 | KMACHINE:genericx86-64 ?= "common-pc-64" |
504 | KBRANCH:edgerouter = "standard/edgerouter" | 504 | KBRANCH:edgerouter = "standard/edgerouter" |
505 | KBRANCH_beaglebone = "standard/beaglebone" | 505 | KBRANCH:beaglebone = "standard/beaglebone" |
506 | 506 | ||
507 | SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 507 | SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" |
508 | SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" | 508 | SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" |
509 | SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" | 509 | SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" |
510 | SRCREV_machine_beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" | 510 | SRCREV_machine:beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" |
511 | 511 | ||
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 = "beaglebone" |
517 | 517 | ||
518 | LINUX_VERSION:genericx86 = "4.12.7" | 518 | LINUX_VERSION:genericx86 = "4.12.7" |
519 | LINUX_VERSION:genericx86-64 = "4.12.7" | 519 | LINUX_VERSION:genericx86-64 = "4.12.7" |
520 | LINUX_VERSION:edgerouter = "4.12.10" | 520 | LINUX_VERSION:edgerouter = "4.12.10" |
521 | LINUX_VERSION_beaglebone = "4.12.10" | 521 | LINUX_VERSION:beaglebone = "4.12.10" |
522 | 522 | ||
523 | This append file | 523 | This append file |
524 | contains statements used to support several BSPs that ship with the | 524 | contains statements used to support several BSPs that ship with the |
@@ -726,7 +726,7 @@ that assigns the :term:`KBUILD_DEFCONFIG` variable based on "raspberrypi2" | |||
726 | and provides the path to the "in-tree" ``defconfig`` file to be used for | 726 | and provides the path to the "in-tree" ``defconfig`` file to be used for |
727 | a Raspberry Pi 2, which is based on the Broadcom 2708/2709 chipset:: | 727 | a Raspberry Pi 2, which is based on the Broadcom 2708/2709 chipset:: |
728 | 728 | ||
729 | KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" | 729 | KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig" |
730 | 730 | ||
731 | Aside from modifying your kernel recipe and providing your own | 731 | Aside from modifying your kernel recipe and providing your own |
732 | ``defconfig`` file, you need to be sure no files or statements set | 732 | ``defconfig`` file, you need to be sure no files or statements set |
diff --git a/documentation/kernel-dev/faq.rst b/documentation/kernel-dev/faq.rst index f0a7af37bb..47be334860 100644 --- a/documentation/kernel-dev/faq.rst +++ b/documentation/kernel-dev/faq.rst | |||
@@ -36,7 +36,7 @@ How do I install/not-install the kernel image on the rootfs? | |||
36 | The kernel image (e.g. ``vmlinuz``) is provided by the | 36 | The kernel image (e.g. ``vmlinuz``) is provided by the |
37 | ``kernel-image`` package. Image recipes depend on ``kernel-base``. To | 37 | ``kernel-image`` package. Image recipes depend on ``kernel-base``. To |
38 | specify whether or not the kernel image is installed in the generated | 38 | specify whether or not the kernel image is installed in the generated |
39 | root filesystem, override ``RDEPENDS_${KERNEL_PACKAGE_NAME}-base`` to include or not | 39 | root filesystem, override ``RDEPENDS:${KERNEL_PACKAGE_NAME}-base`` to include or not |
40 | include "kernel-image". See the | 40 | include "kernel-image". See the |
41 | ":ref:`dev-manual/common-tasks:using .bbappend files in your layer`" | 41 | ":ref:`dev-manual/common-tasks:using .bbappend files in your layer`" |
42 | section in the | 42 | section in the |