From aaf748b95f62621d1139c62c40e418c272cc6a63 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Mon, 23 Oct 2023 21:26:44 +0200 Subject: manuals: update linux-yocto append examples (From yocto-docs rev: b5d385f20d22566e12a7938a9894b86429f1dcfb) Signed-off-by: Michael Opdenacker Signed-off-by: Steve Sakoman --- documentation/kernel-dev/advanced.rst | 3 +-- documentation/kernel-dev/common.rst | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) (limited to 'documentation/kernel-dev') 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. 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:: - KBRANCH:edgerouter = "standard/edgerouter" - + KBRANCH:beaglebone-yocto = "standard/beaglebone" The linux-yocto style recipes can optionally define the following variables: 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 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 -modifying the ``meta/recipes-kernel/linux/linux-yocto_4.12.bb`` recipe, +modifying the ``meta/recipes-kernel/linux/linux-yocto_5.15.bb`` recipe, the append file will typically be located as follows within your custom layer: .. code-block:: none - your-layer/recipes-kernel/linux/linux-yocto_4.12.bbappend + your-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend The append file should initially extend the :term:`FILESPATH` search path by @@ -489,36 +489,36 @@ As an example, consider the following append file used by the BSPs in .. code-block:: none - meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend + meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.15.bbappend 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 the file from the ``meta-yocto-bsp`` layer upstream. :: - KBRANCH:genericx86 = "standard/base" - KBRANCH:genericx86-64 = "standard/base" + KBRANCH:genericx86 = "v5.15/standard/base" + KBRANCH:genericx86-64 = "v5.15/standard/base" + KBRANCH:edgerouter = "v5.15/standard/edgerouter" + KBRANCH:beaglebone-yocto = "v5.15/standard/beaglebone" KMACHINE:genericx86 ?= "common-pc" KMACHINE:genericx86-64 ?= "common-pc-64" - KBRANCH:edgerouter = "standard/edgerouter" - KBRANCH:beaglebone = "standard/beaglebone" - - SRCREV_machine:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" - SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19" - SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" - SRCREV_machine:beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d" + KMACHINE:beaglebone-yocto ?= "beaglebone" + SRCREV_machine:genericx86 ?= "0b628306d1f9ea28c0e86369ce9bb87a47893c9c" + SRCREV_machine:genericx86-64 ?= "0b628306d1f9ea28c0e86369ce9bb87a47893c9c" + SRCREV_machine:edgerouter ?= "90f1ee6589264545f548d731c2480b08a007230f" + SRCREV_machine:beaglebone-yocto ?= "9aabbaa89fcb21af7028e814c1f5b61171314d5a" COMPATIBLE_MACHINE:genericx86 = "genericx86" COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE:edgerouter = "edgerouter" - COMPATIBLE_MACHINE:beaglebone = "beaglebone" + COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" - 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" + LINUX_VERSION:genericx86 = "5.15.72" + LINUX_VERSION:genericx86-64 = "5.15.72" + LINUX_VERSION:edgerouter = "5.15.54" + LINUX_VERSION:beaglebone-yocto = "5.15.54" This append file contains statements used to support several BSPs that ship with the -- cgit v1.2.3-54-g00ecf