* [PATCH 1/6] bsp-guide: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
2021-08-04 18:34 ` [PATCH 2/6] dev-manual: " Michael Opdenacker
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/bsp-guide/bsp.rst | 52 ++++++++++++++++-----------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst
index 5f62376d69..b80354a05b 100644
--- a/documentation/bsp-guide/bsp.rst
+++ b/documentation/bsp-guide/bsp.rst
@@ -1042,7 +1042,7 @@ also supports several other machines:
#. Edit the ``init-ifupdown_1.0.bbappend`` file so that it contains the
following::
- FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
The append file needs to be in the ``meta-xyz/recipes-core/init-ifupdown``
directory.
@@ -1269,9 +1269,9 @@ located in the layer ``poky/meta-yocto-bsp/conf/machine`` and is named
include conf/machine/include/tune-cortexa8.inc
IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
- EXTRA_IMAGECMD_jffs2 = "-lnp "
+ EXTRA_IMAGECMD:jffs2 = "-lnp "
WKS_FILE ?= "beaglebone-yocto.wks"
- IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
+ IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0"
@@ -1458,29 +1458,29 @@ kernel recipe (i.e. ``linux-yocto_5.0.bb``), which is located in
Following is the contents of the append file::
- KBRANCH_genericx86 = "v5.0/standard/base"
- KBRANCH_genericx86-64 = "v5.0/standard/base"
- KBRANCH_edgerouter = "v5.0/standard/edgerouter"
- KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone"
-
- KMACHINE_genericx86 ?= "common-pc"
- KMACHINE_genericx86-64 ?= "common-pc-64"
- KMACHINE_beaglebone-yocto ?= "beaglebone"
-
- SRCREV_machine_genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
- SRCREV_machine_genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
- SRCREV_machine_edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
- SRCREV_machine_beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-
- COMPATIBLE_MACHINE_genericx86 = "genericx86"
- COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
- COMPATIBLE_MACHINE_edgerouter = "edgerouter"
- COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
-
- LINUX_VERSION_genericx86 = "5.0.3"
- LINUX_VERSION_genericx86-64 = "5.0.3"
- LINUX_VERSION_edgerouter = "5.0.3"
- LINUX_VERSION_beaglebone-yocto = "5.0.3"
+ KBRANCH:genericx86 = "v5.0/standard/base"
+ KBRANCH:genericx86-64 = "v5.0/standard/base"
+ KBRANCH:edgerouter = "v5.0/standard/edgerouter"
+ KBRANCH:beaglebone-yocto = "v5.0/standard/beaglebone"
+
+ KMACHINE:genericx86 ?= "common-pc"
+ KMACHINE:genericx86-64 ?= "common-pc-64"
+ KMACHINE:beaglebone-yocto ?= "beaglebone"
+
+ SRCREV_machine:genericx86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
+ SRCREV_machine:genericx86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
+ SRCREV_machine:edgerouter ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
+ SRCREV_machine:beaglebone-yocto ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
+
+ COMPATIBLE_MACHINE:genericx86 = "genericx86"
+ COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
+ COMPATIBLE_MACHINE:edgerouter = "edgerouter"
+ COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
+
+ LINUX_VERSION:genericx86 = "5.0.3"
+ LINUX_VERSION:genericx86-64 = "5.0.3"
+ LINUX_VERSION:edgerouter = "5.0.3"
+ LINUX_VERSION:beaglebone-yocto = "5.0.3"
This particular append file works for all the machines that are
part of the ``meta-yocto-bsp`` layer. The relevant statements are
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/6] dev-manual: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
2021-08-04 18:34 ` [PATCH 1/6] bsp-guide: " Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
2021-08-04 18:34 ` [PATCH 3/6] kernel-dev manual: " Michael Opdenacker
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/dev-manual/common-tasks.rst | 196 +++++++++++-----------
1 file changed, 98 insertions(+), 98 deletions(-)
diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst
index 7fa0df4d39..2ada8ed5cb 100644
--- a/documentation/dev-manual/common-tasks.rst
+++ b/documentation/dev-manual/common-tasks.rst
@@ -212,27 +212,27 @@ following list:
You should follow the same strategy when using ``_append``
and ``_prepend`` operations::
- DEPENDS_append_one = " foo"
- DEPENDS_prepend_one = "foo "
+ DEPENDS:append_one = " foo"
+ DEPENDS:prepend_one = "foo "
As an actual example, here's a
snippet from the generic kernel include file ``linux-yocto.inc``,
wherein the kernel compile and link options are adjusted in the
case of a subset of the supported architectures::
- DEPENDS_append_aarch64 = " libgcc"
- KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
- KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
+ DEPENDS:append:aarch64 = " libgcc"
+ KERNEL_CC:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
+ KERNEL_LD:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
- DEPENDS_append_nios2 = " libgcc"
- KERNEL_CC_append_nios2 = " ${TOOLCHAIN_OPTIONS}"
- KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}"
+ DEPENDS:append:nios2 = " libgcc"
+ KERNEL_CC:append:nios2 = " ${TOOLCHAIN_OPTIONS}"
+ KERNEL_LD:append:nios2 = " ${TOOLCHAIN_OPTIONS}"
- DEPENDS_append_arc = " libgcc"
- KERNEL_CC_append_arc = " ${TOOLCHAIN_OPTIONS}"
- KERNEL_LD_append_arc = " ${TOOLCHAIN_OPTIONS}"
+ DEPENDS:append:arc = " libgcc"
+ KERNEL_CC:append:arc = " ${TOOLCHAIN_OPTIONS}"
+ KERNEL_LD:append:arc = " ${TOOLCHAIN_OPTIONS}"
- KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc"
+ KERNEL_FEATURES:append:qemuall=" features/debug/printk.scc"
.. note::
@@ -247,7 +247,7 @@ following list:
at ``meta-one/recipes-core/base-files/base-files.bbappend`` could
extend :term:`FILESPATH` using :term:`FILESEXTRAPATHS` as follows::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
The build for machine "one" will pick up your machine-specific file as
long as you have the file in
@@ -512,7 +512,7 @@ Following is the append file, which is named ``formfactor_0.0.bbappend``
and is from the Raspberry Pi BSP Layer named ``meta-raspberrypi``. The
file is in the layer at ``recipes-bsp/formfactor``::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
By default, the build system uses the
:term:`FILESPATH` variable to
@@ -832,7 +832,7 @@ all images, which might not be what you require.
To add a package to your image using the local configuration file, use
the :term:`IMAGE_INSTALL` variable with the ``_append`` operator::
- IMAGE_INSTALL_append = " strace"
+ IMAGE_INSTALL:append = " strace"
Use of the syntax is important -
specifically, the space between the quote and the package name, which is
@@ -850,7 +850,7 @@ As shown in its simplest use, ``IMAGE_INSTALL_append`` affects all
images. It is possible to extend the syntax so that the variable applies
to a specific image only. Here is an example::
- IMAGE_INSTALL_append_pn-core-image-minimal = " strace"
+ IMAGE_INSTALL:append:pn-core-image-minimal = " strace"
This example adds ``strace`` to the ``core-image-minimal`` image only.
@@ -976,17 +976,17 @@ the full packagegroup name ``packagegroup-custom``::
${PN}-tools \
"
- RDEPENDS_${PN}-apps = "\
+ RDEPENDS:${PN}-apps = "\
dropbear \
portmap \
psplash"
- RDEPENDS_${PN}-tools = "\
+ RDEPENDS:${PN}-tools = "\
oprofile \
oprofileui-server \
lttng-tools"
- RRECOMMENDS_${PN}-tools = "\
+ RRECOMMENDS:${PN}-tools = "\
kernel-module-oprofile"
In the previous example, two package group packages are created with
@@ -1013,7 +1013,7 @@ configuration file. Use the following in an append file::
Use the following in a configuration file::
- hostname_pn-base-files = "myhostname"
+ hostname:pn-base-files = "myhostname"
Changing the default value of the variable "hostname" can be useful in
certain situations. For example, suppose you need to do extensive
@@ -1028,7 +1028,7 @@ Another point of interest is that if you unset the variable, the image
will have no default hostname in the filesystem. Here is an example that
unsets the variable in a configuration file::
- hostname_pn-base-files = ""
+ hostname:pn-base-files = ""
Having no default hostname in the filesystem is suitable for
environments that use dynamic hostnames such as virtual machines.
@@ -2300,7 +2300,7 @@ compiler. For example, the application might need an additional header
path. You can accomplish this by adding to the :term:`CFLAGS` variable. The
following example shows this::
- CFLAGS_prepend = "-I ${S}/include "
+ CFLAGS:prepend = "-I ${S}/include "
In the following example, ``mtd-utils`` is a makefile-based package::
@@ -2330,9 +2330,9 @@ In the following example, ``mtd-utils`` is a makefile-based package::
PACKAGES =+ "mtd-utils-jffs2 mtd-utils-ubifs mtd-utils-misc"
- FILES_mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool"
- FILES_mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*"
- FILES_mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image"
+ FILES:mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/jffs2reader ${sbindir}/sumtool"
+ FILES:mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*"
+ FILES:mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image"
PARALLEL_MAKE = ""
@@ -2360,8 +2360,8 @@ into separate packages::
XORG_PN = "libXpm"
PACKAGES =+ "sxpm cxpm"
- FILES_cxpm = "${bindir}/cxpm"
- FILES_sxpm = "${bindir}/sxpm"
+ FILES:cxpm = "${bindir}/cxpm"
+ FILES:sxpm = "${bindir}/sxpm"
In the previous example, we want to ship the ``sxpm`` and ``cxpm``
binaries in separate packages. Since ``bindir`` would be packaged into
@@ -2504,7 +2504,7 @@ chapter of the BitBake User Manual.
S = "${WORKDIR}/postfix-${PV}"
CFLAGS += "-DNO_ASM"
- SRC_URI_append = " file://fixup.patch"
+ SRC_URI:append = " file://fixup.patch"
- *Functions:* Functions provide a series of actions to be performed.
You usually use functions to override the default implementation of a
@@ -2641,13 +2641,13 @@ in the BitBake User Manual.
start to ensure the appended value is not merged with the existing
value::
- SRC_URI_append = " file://fix-makefile.patch"
+ SRC_URI:append = " file://fix-makefile.patch"
You can also use
the ``_append`` operator with overrides, which results in the actions
only being performed for the specified target or machine::
- SRC_URI_append_sh4 = " file://fix-makefile.patch"
+ SRC_URI:append:sh4 = " file://fix-makefile.patch"
- *Prepending (_prepend):* Use the ``_prepend`` operator to prepend
values to existing variables. This operator does not add any
@@ -2659,13 +2659,13 @@ in the BitBake User Manual.
end to ensure the prepended value is not merged with the existing
value::
- CFLAGS_prepend = "-I${S}/myincludes "
+ CFLAGS:prepend = "-I${S}/myincludes "
You can also use the
``_prepend`` operator with overrides, which results in the actions
only being performed for the specified target or machine::
- CFLAGS_prepend_sh4 = "-I${S}/myincludes "
+ CFLAGS:prepend:sh4 = "-I${S}/myincludes "
- *Overrides:* You can use overrides to set a value conditionally,
typically based on how the recipe is being built. For example, to set
@@ -2676,7 +2676,7 @@ in the BitBake User Manual.
you would do the following::
KBRANCH = "standard/base"
- KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
+ KBRANCH:qemuarm = "standard/arm-versatile-926ejs"
Overrides are also used to separate
alternate values of a variable in other situations. For example, when
@@ -2951,7 +2951,7 @@ The following steps describe how to set up the AUH utility:
If your distro does not enable by default ptest, which Poky
does, you need the following in your ``local.conf`` file::
- DISTRO_FEATURES_append = " ptest"
+ DISTRO_FEATURES:append = " ptest"
6. *Optionally Start a vncserver:* If you are running in a server
@@ -4301,7 +4301,7 @@ point to your external source code. Here are the statements to put in
your ``local.conf`` file::
INHERIT += "externalsrc"
- EXTERNALSRC_pn-myrecipe = "path-to-your-source-tree"
+ EXTERNALSRC:pn-myrecipe = "path-to-your-source-tree"
This next example shows how to accomplish the same thing by setting
:term:`EXTERNALSRC` in the recipe itself or in the recipe's append file::
@@ -4323,7 +4323,7 @@ some other nominated directory, you can set
:term:`EXTERNALSRC_BUILD`
to point to that directory::
- EXTERNALSRC_BUILD_pn-myrecipe = "path-to-your-source-tree"
+ EXTERNALSRC_BUILD:pn-myrecipe = "path-to-your-source-tree"
Replicating a Build Offline
---------------------------
@@ -4597,7 +4597,7 @@ how the static library files are defined::
PACKAGES_DYNAMIC = "^${PN}-locale-.*"
FILES = ""
- FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+ FILES:${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
${base_libdir}/*${SOLIBS} \
@@ -4607,24 +4607,24 @@ how the static library files are defined::
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
- FILES_${PN}-bin = "${bindir}/* ${sbindir}/*"
+ FILES:${PN}-bin = "${bindir}/* ${sbindir}/*"
- FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
+ FILES:${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
${datadir}/gnome/help"
- SECTION_${PN}-doc = "doc"
+ SECTION:${PN}-doc = "doc"
FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}"
- FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
+ FILES:${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
${datadir}/aclocal ${base_libdir}/*.o \
${libdir}/${BPN}/*.la ${base_libdir}/*.la"
- SECTION_${PN}-dev = "devel"
- ALLOW_EMPTY_${PN}-dev = "1"
- RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
+ SECTION:${PN}-dev = "devel"
+ ALLOW_EMPTY:${PN}-dev = "1"
+ RDEPENDS:${PN}-dev = "${PN} (= ${EXTENDPKGV})"
- FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a"
- SECTION_${PN}-staticdev = "devel"
- RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
+ FILES:${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a ${libdir}/${BPN}/*.a"
+ SECTION:${PN}-staticdev = "devel"
+ RDEPENDS:${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
Combining Multiple Versions of Library Files into One Image
-----------------------------------------------------------
@@ -4701,8 +4701,8 @@ configuration would be as follows::
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
- DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
- IMAGE_INSTALL_append = "lib32-glib-2.0"
+ DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
+ IMAGE_INSTALL:append = "lib32-glib-2.0"
This example enables an additional library named
``lib32`` alongside the normal target packages. When combining these
@@ -4749,7 +4749,7 @@ Here are the implementation details for the RPM Package Management System:
:term:`Build Directory`. For
example, consider ``lib32`` in a ``qemux86-64`` image. The possible
architectures in the system are "all", "qemux86_64",
- "lib32_qemux86_64", and "lib32_x86".
+ "lib32:qemux86_64", and "lib32:x86".
- The ``${MLPREFIX}`` variable is stripped from ``${PN}`` during RPM
packaging. The naming for a normal RPM package and a Multilib RPM
@@ -4768,7 +4768,7 @@ Here are the implementation details for the IPK Package Management System:
- The ``${MLPREFIX}`` is not stripped from ``${PN}`` during IPK
packaging. The naming for a normal RPM package and a Multilib IPK
package in a ``qemux86-64`` system resolves to something like
- ``bash_4.1-r2.x86_64.ipk`` and ``lib32-bash_4.1-rw_x86.ipk``,
+ ``bash_4.1-r2.x86_64.ipk`` and ``lib32-bash_4.1-rw:x86.ipk``,
respectively.
- The IPK deploy folder is not modified with ``${MLPREFIX}`` because
@@ -4857,7 +4857,7 @@ configuration file as follows::
MACHINE = "qemux86-64"
DEFAULTTUNE = "x86-64-x32"
- baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') \
+ baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') \
or 'INVALID')) or 'lib'}"
Once you have set
@@ -6514,7 +6514,7 @@ setting the appropriate values for ``FILES_packagename``,
``RDEPENDS_packagename``, ``DESCRIPTION_packagename``, and so forth.
Here is an example from the ``lighttpd`` recipe::
- python populate_packages_prepend () {
+ python populate_packages:prepend () {
lighttpd_libdir = d.expand('${libdir}')
do_split_packages(d, lighttpd_libdir, '^mod_(.*).so$',
'lighttpd-module-%s', 'Lighttpd module for %s',
@@ -7101,7 +7101,7 @@ To add package testing to your build, add the
variables to your ``local.conf`` file, which is found in the
:term:`Build Directory`::
- DISTRO_FEATURES_append = " ptest"
+ DISTRO_FEATURES:append = " ptest"
EXTRA_IMAGE_FEATURES += "ptest-pkgs"
Once your build is complete, the ptest files are installed into the
@@ -7145,7 +7145,7 @@ test. Here is what you have to do for each recipe:
your recipe in order for the package to meet the dependencies. Here
is an example where the package has a runtime dependency on "make"::
- RDEPENDS_${PN}-ptest += "make"
+ RDEPENDS:${PN}-ptest += "make"
- *Add a function to build the test suite:* Not many packages support
cross-compilation of their test suites. Consequently, you usually
@@ -7289,11 +7289,11 @@ The ``devtool edit-recipe`` command lets you take a look at the recipe::
"
S = "${WORKDIR}/npm"
inherit npm
- LICENSE_${PN} = "MIT"
- LICENSE_${PN}-accepts = "MIT"
- LICENSE_${PN}-array-flatten = "MIT"
+ LICENSE:${PN} = "MIT"
+ LICENSE:${PN}-accepts = "MIT"
+ LICENSE:${PN}-array-flatten = "MIT"
...
- LICENSE_${PN}-vary = "MIT"
+ LICENSE:${PN}-vary = "MIT"
Here are three key points in the previous example:
@@ -7523,7 +7523,7 @@ Using systemd Exclusively
Set these variables in your distribution configuration file as follows::
- DISTRO_FEATURES_append = " systemd"
+ DISTRO_FEATURES:append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
You can also prevent the SysVinit distribution feature from
@@ -7547,7 +7547,7 @@ Using systemd for the Main Image and Using SysVinit for the Rescue Image
Set these variables in your distribution configuration file as follows::
- DISTRO_FEATURES_append = " systemd"
+ DISTRO_FEATURES:append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
Doing so causes your main image to use the
@@ -7646,7 +7646,7 @@ the recipe needs to reference
Then, you can add the following to your
``local.conf``::
- SRCREV_pn-PN = "${AUTOREV}"
+ SRCREV:pn-PN = "${AUTOREV}"
:term:`PN` is the name of the recipe for
which you want to enable automatic source revision updating.
@@ -7669,17 +7669,17 @@ listed include file that contains numerous lines of exactly that form::
#SRCREV_pn-opkg ?= "${AUTOREV}"
#SRCREV_pn-opkg-utils-native ?= "${AUTOREV}"
#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
- SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
- SRCREV_pn-matchbox-common ?= "${AUTOREV}"
- SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}"
- SRCREV_pn-matchbox-desktop ?= "${AUTOREV}"
- SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
- SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
- SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}"
- SRCREV_pn-matchbox-terminal ?= "${AUTOREV}"
- SRCREV_pn-matchbox-wm ?= "${AUTOREV}"
- SRCREV_pn-settings-daemon ?= "${AUTOREV}"
- SRCREV_pn-screenshot ?= "${AUTOREV}"
+ SRCREV:pn-gconf-dbus ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-common ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-desktop ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-terminal ?= "${AUTOREV}"
+ SRCREV:pn-matchbox-wm ?= "${AUTOREV}"
+ SRCREV:pn-settings-daemon ?= "${AUTOREV}"
+ SRCREV:pn-screenshot ?= "${AUTOREV}"
. . .
These lines allow you to
@@ -7922,25 +7922,25 @@ output from this command::
$ buildhistory-collect-srcrevs -a
# i586-poky-linux
- SRCREV_pn-glibc = "b8079dd0d360648e4e8de48656c5c38972621072"
- SRCREV_pn-glibc-initial = "b8079dd0d360648e4e8de48656c5c38972621072"
- SRCREV_pn-opkg-utils = "53274f087565fd45d8452c5367997ba6a682a37a"
- SRCREV_pn-kmod = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
+ SRCREV:pn-glibc = "b8079dd0d360648e4e8de48656c5c38972621072"
+ SRCREV:pn-glibc-initial = "b8079dd0d360648e4e8de48656c5c38972621072"
+ SRCREV:pn-opkg-utils = "53274f087565fd45d8452c5367997ba6a682a37a"
+ SRCREV:pn-kmod = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
# x86_64-linux
- SRCREV_pn-gtk-doc-stub-native = "1dea266593edb766d6d898c79451ef193eb17cfa"
- SRCREV_pn-dtc-native = "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf"
- SRCREV_pn-update-rc.d-native = "eca680ddf28d024954895f59a241a622dd575c11"
- SRCREV_glibc_pn-cross-localedef-native = "b8079dd0d360648e4e8de48656c5c38972621072"
- SRCREV_localedef_pn-cross-localedef-native = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
- SRCREV_pn-prelink-native = "faa069deec99bf61418d0bab831c83d7c1b797ca"
- SRCREV_pn-opkg-utils-native = "53274f087565fd45d8452c5367997ba6a682a37a"
- SRCREV_pn-kern-tools-native = "23345b8846fe4bd167efdf1bd8a1224b2ba9a5ff"
- SRCREV_pn-kmod-native = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
+ SRCREV:pn-gtk-doc-stub-native = "1dea266593edb766d6d898c79451ef193eb17cfa"
+ SRCREV:pn-dtc-native = "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf"
+ SRCREV:pn-update-rc.d-native = "eca680ddf28d024954895f59a241a622dd575c11"
+ SRCREV_glibc:pn-cross-localedef-native = "b8079dd0d360648e4e8de48656c5c38972621072"
+ SRCREV_localedef:pn-cross-localedef-native = "c833367348d39dad7ba018990bfdaffaec8e9ed3"
+ SRCREV:pn-prelink-native = "faa069deec99bf61418d0bab831c83d7c1b797ca"
+ SRCREV:pn-opkg-utils-native = "53274f087565fd45d8452c5367997ba6a682a37a"
+ SRCREV:pn-kern-tools-native = "23345b8846fe4bd167efdf1bd8a1224b2ba9a5ff"
+ SRCREV:pn-kmod-native = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
# qemux86-poky-linux
- SRCREV_machine_pn-linux-yocto = "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1"
- SRCREV_meta_pn-linux-yocto = "a227f20eff056e511d504b2e490f3774ab260d6f"
+ SRCREV_machine:pn-linux-yocto = "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1"
+ SRCREV_meta:pn-linux-yocto = "a227f20eff056e511d504b2e490f3774ab260d6f"
# all-poky-linux
- SRCREV_pn-update-rc.d = "eca680ddf28d024954895f59a241a622dd575c11"
+ SRCREV:pn-update-rc.d = "eca680ddf28d024954895f59a241a622dd575c11"
.. note::
@@ -8564,11 +8564,11 @@ Here are some things to keep in mind when running tests:
- The default tests for the image are defined as::
- DEFAULT_TEST_SUITES_pn-image = "ping ssh df connman syslog xorg scp vnc date rpm dnf dmesg"
+ DEFAULT_TEST_SUITES:pn-image = "ping ssh df connman syslog xorg scp vnc date rpm dnf dmesg"
- Add your own test to the list of the by using the following::
- TEST_SUITES_append = " mytest"
+ TEST_SUITES:append = " mytest"
- Run a specific list of tests as follows::
@@ -9715,7 +9715,7 @@ To run a ``debuginfod`` server, you need to do the following:
(it already is in ``OpenEmbedded-core`` defaults and ``poky`` reference distribution).
If not, set in your distro config file or in ``local.conf``::
- DISTRO_FEATURES_append = " debuginfod"
+ DISTRO_FEATURES:append = " debuginfod"
This distro feature enables the server and client library in ``elfutils``,
and enables ``debuginfod`` support in clients (at the moment, ``gdb`` and ``binutils``).
@@ -9802,7 +9802,7 @@ debugger.
Make the following addition in either your ``local.conf`` file or in
an image recipe::
- IMAGE_INSTALL_append = " gdbserver"
+ IMAGE_INSTALL:append = " gdbserver"
The change makes
sure the ``gdbserver`` package is included.
@@ -9938,21 +9938,21 @@ To support this kind of debugging, you need do the following:
- Ensure that GDB is on the target. You can do this by adding "gdb" to
:term:`IMAGE_INSTALL`::
- IMAGE_INSTALL_append = " gdb"
+ IMAGE_INSTALL:append = " gdb"
Alternatively, you can add "tools-debug" to :term:`IMAGE_FEATURES`::
- IMAGE_FEATURES_append = " tools-debug"
+ IMAGE_FEATURES:append = " tools-debug"
- Ensure that debug symbols are present. You can make sure these
symbols are present by installing ``-dbg``::
- IMAGE_INSTALL_append = "packagename-dbg"
+ IMAGE_INSTALL:append = "packagename-dbg"
Alternatively, you can do the following to include
all the debug symbols::
- IMAGE_FEATURES_append = " dbg-pkgs"
+ IMAGE_FEATURES:append = " dbg-pkgs"
.. note::
@@ -11274,7 +11274,7 @@ support, include the "wayland" flag in the
:term:`DISTRO_FEATURES`
statement in your ``local.conf`` file::
- DISTRO_FEATURES_append = " wayland"
+ DISTRO_FEATURES:append = " wayland"
.. note::
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/6] kernel-dev manual: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
2021-08-04 18:34 ` [PATCH 1/6] bsp-guide: " Michael Opdenacker
2021-08-04 18:34 ` [PATCH 2/6] dev-manual: " Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
2021-08-04 18:34 ` [PATCH 4/6] ref-manual: " Michael Opdenacker
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/kernel-dev/advanced.rst | 6 +--
documentation/kernel-dev/common.rst | 60 +++++++++++++--------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst
index 871ec8ae7b..9c3a478cb9 100644
--- a/documentation/kernel-dev/advanced.rst
+++ b/documentation/kernel-dev/advanced.rst
@@ -69,7 +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:edgerouter = "standard/edgerouter"
The linux-yocto style recipes can optionally define the following
@@ -113,7 +113,7 @@ To include a
feature called "cfg/sound.scc" just for the ``qemux86`` machine,
specify::
- KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
+ KERNEL_FEATURES:append:qemux86 = " cfg/sound.scc"
The value of
the entries in :term:`KERNEL_FEATURES` are dependent on their location
@@ -724,7 +724,7 @@ If the BSP description is in recipe space, you cannot simply list the
``*.scc`` in the :term:`SRC_URI` statement. You need to use the following
form from your kernel append file::
- SRC_URI_append_myplatform = " \
+ SRC_URI:append_myplatform = " \
file://myplatform;type=kmeta;destsuffix=myplatform \
"
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst
index a97140b0b9..331e982aca 100644
--- a/documentation/kernel-dev/common.rst
+++ b/documentation/kernel-dev/common.rst
@@ -416,11 +416,11 @@ home directory:
kernel. Thus, the name of the append file is
``linux-yocto_4.12.bbappend``::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
- SRC_URI_append = " file://patch-file-one.patch"
- SRC_URI_append = " file://patch-file-two.patch"
- SRC_URI_append = " file://patch-file-three.patch"
+ SRC_URI:append = " file://patch-file-one.patch"
+ SRC_URI:append = " file://patch-file-two.patch"
+ SRC_URI:append = " file://patch-file-three.patch"
The :term:`FILESEXTRAPATHS` and :term:`SRC_URI` statements
enable the OpenEmbedded build system to find patch files. For more
@@ -469,7 +469,7 @@ prepending the directory that contains your files to the
:term:`FILESEXTRAPATHS`
variable as follows::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
The path ``${``\ :term:`THISDIR`\ ``}/${``\ :term:`PN`\ ``}``
expands to "linux-yocto" in the current directory for this example. If
@@ -496,28 +496,28 @@ 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 = "standard/base"
+ KBRANCH:genericx86-64 = "standard/base"
- KMACHINE_genericx86 ?= "common-pc"
- KMACHINE_genericx86-64 ?= "common-pc-64"
- KBRANCH_edgerouter = "standard/edgerouter"
+ 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:genericx86 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19"
+ SRCREV_machine:genericx86-64 ?= "d09f2ce584d60ecb7890550c22a80c48b83c2e19"
+ SRCREV_machine:edgerouter ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
SRCREV_machine_beaglebone ?= "b5c8cfda2dfe296410d51e131289fb09c69e1e7d"
- COMPATIBLE_MACHINE_genericx86 = "genericx86"
- COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
- COMPATIBLE_MACHINE_edgerouter = "edgerouter"
+ COMPATIBLE_MACHINE:genericx86 = "genericx86"
+ COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
+ COMPATIBLE_MACHINE:edgerouter = "edgerouter"
COMPATIBLE_MACHINE_beaglebone = "beaglebone"
- LINUX_VERSION_genericx86 = "4.12.7"
- LINUX_VERSION_genericx86-64 = "4.12.7"
- LINUX_VERSION_edgerouter = "4.12.10"
+ 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"
This append file
@@ -640,7 +640,7 @@ appropriate ``${PN}`` directory in your layer's ``recipes-kernel/linux``
directory, and rename the copied file to "defconfig". Then, add the
following lines to the linux-yocto ``.bbappend`` file in your layer::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://defconfig"
The :term:`SRC_URI` tells the build system how to search
@@ -687,7 +687,7 @@ Next, include this
configuration fragment and extend the :term:`FILESPATH` variable in your
``.bbappend`` file::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://8250.cfg"
The next time you run BitBake to build the
@@ -988,10 +988,10 @@ Section.
Add the following to the ``local.conf``::
- SRC_URI_pn-linux-yocto = "git:///path-to/linux-yocto-4.12;protocol=file;name=machine;branch=standard/base; \
+ SRC_URI:pn-linux-yocto = "git:///path-to/linux-yocto-4.12;protocol=file;name=machine;branch=standard/base; \
git:///path-to/yocto-kernel-cache;protocol=file;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
- SRCREV_meta_qemux86 = "${AUTOREV}"
- SRCREV_machine_qemux86 = "${AUTOREV}"
+ SRCREV_meta:qemux86 = "${AUTOREV}"
+ SRCREV_machine:qemux86 = "${AUTOREV}"
.. note::
@@ -1061,8 +1061,8 @@ Section.
must be named ``linux-yocto_4.12.bbappend`` and have the following
contents::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
- SRC_URI_append = "file://0001-calibrate.c-Added-some-printk-statements.patch"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+ SRC_URI:append = "file://0001-calibrate.c-Added-some-printk-statements.patch"
The :term:`FILESEXTRAPATHS` and :term:`SRC_URI` statements
enable the OpenEmbedded build system to find the patch file.
@@ -1237,7 +1237,7 @@ file to "defconfig" (e.g.
add the following lines to the linux-yocto ``.bbappend`` file in your
layer::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://defconfig"
The :term:`SRC_URI` tells the build system how to search for the file, while the
@@ -1345,7 +1345,7 @@ the kernel's append file within your layer and then add the following
statements to the kernel's append file, those configuration options will
be picked up and applied when the kernel is built::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://myconfig.cfg"
As mentioned earlier, you can group related configurations into multiple
@@ -1939,7 +1939,7 @@ build.
2. *Add the Feature File to SRC_URI:* Add the ``.scc`` file to the
recipe's :term:`SRC_URI` statement::
- SRC_URI_append = " file://test.scc"
+ SRC_URI:append = " file://test.scc"
The leading space before the path is important as the path is
appended to the existing path.
@@ -1948,7 +1948,7 @@ build.
:term:`KERNEL_FEATURES` statement to specify the feature as a kernel
feature::
- KERNEL_FEATURES_append = " test.scc"
+ KERNEL_FEATURES:append = " test.scc"
The OpenEmbedded build
system processes the kernel feature when it builds the kernel.
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/6] ref-manual: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
` (2 preceding siblings ...)
2021-08-04 18:34 ` [PATCH 3/6] kernel-dev manual: " Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
2021-08-04 18:34 ` [PATCH 5/6] sdk-manual: " Michael Opdenacker
2021-08-04 18:34 ` [PATCH 6/6] test-manual: " Michael Opdenacker
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/ref-manual/classes.rst | 14 +--
documentation/ref-manual/faq.rst | 4 +-
documentation/ref-manual/qa-checks.rst | 4 +-
documentation/ref-manual/variables.rst | 134 ++++++++++++-------------
4 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
index 49905f2725..746cc122e9 100644
--- a/documentation/ref-manual/classes.rst
+++ b/documentation/ref-manual/classes.rst
@@ -456,8 +456,8 @@ recipe that fetches from an alternative URI (e.g. Git) instead of a
tarball. Following is an example::
BBCLASSEXTEND = "devupstream:target"
- SRC_URI_class-devupstream = "git://git.example.com/example"
- SRCREV_class-devupstream = "abcd1234"
+ SRC_URI:class-devupstream = "git://git.example.com/example"
+ SRCREV:class-devupstream = "abcd1234"
Adding the above statements to your recipe creates a variant that has
:term:`DEFAULT_PREFERENCE` set to "-1".
@@ -465,8 +465,8 @@ Consequently, you need to select the variant of the recipe to use it.
Any development-specific adjustments can be done by using the
``class-devupstream`` override. Here is an example::
- DEPENDS_append_class-devupstream = " gperf-native"
- do_configure_prepend_class-devupstream() {
+ DEPENDS:append:class-devupstream = " gperf-native"
+ do_configure:prepend:class-devupstream() {
touch ${S}/README
}
@@ -846,7 +846,7 @@ sure that all builders start with the same sstate signatures. After
inheriting the class, you can then disable the feature by setting the
:term:`ICECC_DISABLED` variable to "1" as follows::
- INHERIT_DISTRO_append = " icecc"
+ INHERIT_DISTRO:append = " icecc"
ICECC_DISABLED ??= "1"
This practice
@@ -974,7 +974,7 @@ the check for symbolic link ``.so`` files in the main package of a
recipe, add the following to the recipe. You need to realize that the
package name override, in this example ``${PN}``, must be used::
- INSANE_SKIP_${PN} += "dev-so"
+ INSANE_SKIP:${PN} += "dev-so"
Please keep in mind that the QA checks
are meant to detect real or potential problems in the packaged
@@ -2481,7 +2481,7 @@ indicate the package to which the value applies. If the value applies to
the recipe's main package, use ``${``\ :term:`PN`\ ``}``. Here
is an example from the connman recipe::
- SYSTEMD_SERVICE_${PN} = "connman.service"
+ SYSTEMD_SERVICE:${PN} = "connman.service"
Services are set up to start on boot automatically
unless you have set
diff --git a/documentation/ref-manual/faq.rst b/documentation/ref-manual/faq.rst
index c7322e7623..d3a603d4a4 100644
--- a/documentation/ref-manual/faq.rst
+++ b/documentation/ref-manual/faq.rst
@@ -301,7 +301,7 @@ As an example, you could add a specific server for the build system to
attempt before any others by adding something like the following to the
``local.conf`` configuration file::
- PREMIRRORS_prepend = "\
+ PREMIRRORS:prepend = "\
git://.*/.* http://www.yoctoproject.org/sources/ \n \
ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
http://.*/.* http://www.yoctoproject.org/sources/ \n \
@@ -341,7 +341,7 @@ Finally, consider an example where you are behind an HTTP-only firewall.
You could make the following changes to the ``local.conf`` configuration
file as long as the :term:`PREMIRRORS` server is current::
- PREMIRRORS_prepend = "\
+ PREMIRRORS:prepend = "\
ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
http://.*/.* http://www.yoctoproject.org/sources/ \n \
https://.*/.* http://www.yoctoproject.org/sources/ \n"
diff --git a/documentation/ref-manual/qa-checks.rst b/documentation/ref-manual/qa-checks.rst
index 0ef203c70f..4b5d0abdba 100644
--- a/documentation/ref-manual/qa-checks.rst
+++ b/documentation/ref-manual/qa-checks.rst
@@ -223,7 +223,7 @@ Errors and Warnings
software that reads :term:`CFLAGS` when you build it,
you could add the following to your recipe::
- CFLAGS_append = " -fPIC "
+ CFLAGS:append = " -fPIC "
For more information on text relocations at runtime, see
https://www.akkadia.org/drepper/textrelocs.html.
@@ -620,7 +620,7 @@ Errors and Warnings
.. _qa-check-missing-update-alternatives:
-- ``<recipename>: recipe defines ALTERNATIVE_<packagename> but doesn't inherit update-alternatives. This might fail during do_rootfs later! [missing-update-alternatives]``
+- ``<recipename>: recipe defines ALTERNATIVE:<packagename> but doesn't inherit update-alternatives. This might fail during do_rootfs later! [missing-update-alternatives]``
This check ensures that if a recipe sets the :term:`ALTERNATIVE` variable that the
recipe also inherits :ref:`update-alternatives <ref-classes-update-alternatives>` such
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 1150940133..847df8ee4c 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -38,9 +38,9 @@ system and gives an overview of their function and contents.
Like all package-controlling variables, you must always use them in
conjunction with a package name override, as in::
- ALLOW_EMPTY_${PN} = "1"
- ALLOW_EMPTY_${PN}-dev = "1"
- ALLOW_EMPTY_${PN}-staticdev = "1"
+ ALLOW_EMPTY:${PN} = "1"
+ ALLOW_EMPTY:${PN}-dev = "1"
+ ALLOW_EMPTY:${PN}-staticdev = "1"
:term:`ALTERNATIVE`
Lists commands in a package that need an alternative binary naming
@@ -53,7 +53,7 @@ system and gives an overview of their function and contents.
provided by another package. For example, if the ``busybox`` package
has four such commands, you identify them as follows::
- ALTERNATIVE_busybox = "sh sed test bracket"
+ ALTERNATIVE:busybox = "sh sed test bracket"
For more information on the alternatives system, see the
":ref:`update-alternatives.bbclass <ref-classes-update-alternatives>`"
@@ -297,7 +297,7 @@ system and gives an overview of their function and contents.
can attach it to a specific image recipe by using the recipe name
override::
- BAD_RECOMMENDATIONS_pn-target_image = "package_name"
+ BAD_RECOMMENDATIONS:pn-target_image = "package_name"
It is important to realize that if you choose to not install packages
using this variable and some other packages are dependent on them
@@ -1133,7 +1133,7 @@ system and gives an overview of their function and contents.
As an example, the following override allows you to install extra
files, but only when building for the target::
- do_install_append_class-target() {
+ do_install:append:class-target() {
install my-extra-file ${D}${sysconfdir}
}
@@ -1141,7 +1141,7 @@ system and gives an overview of their function and contents.
"native" when building for the build host, and to "other" when not
building for the build host::
- FOO_class-native = "native"
+ FOO:class-native = "native"
FOO = "other"
The underlying mechanism behind :term:`CLASSOVERRIDE` is simply
@@ -1246,7 +1246,7 @@ system and gives an overview of their function and contents.
that identifies the resulting package. Then, provide a
space-separated list of files. Here is an example::
- CONFFILES_${PN} += "${sysconfdir}/file1 \
+ CONFFILES:${PN} += "${sysconfdir}/file1 \
${sysconfdir}/file2 ${sysconfdir}/file3"
There is a relationship between the :term:`CONFFILES` and :term:`FILES`
@@ -1535,7 +1535,7 @@ system and gives an overview of their function and contents.
package naming. You must use the package name as an override when you
set this variable. Here is an example from the ``fontconfig`` recipe::
- DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+ DEBIAN_NOAUTONAME:fontconfig-utils = "1"
:term:`DEBIANNAME`
When the :ref:`debian <ref-classes-debian>` class is inherited,
@@ -1545,7 +1545,7 @@ system and gives an overview of their function and contents.
override when you set this variable. Here is an example from the
``dbus`` recipe::
- DEBIANNAME_${PN} = "dbus-1"
+ DEBIANNAME:${PN} = "dbus-1"
:term:`DEBUG_BUILD`
Specifies to build packages with debugging information. This
@@ -2104,7 +2104,7 @@ system and gives an overview of their function and contents.
to fix a runtime dependency to the exact same version of another
package in the same recipe::
- RDEPENDS_${PN}-additional-module = "${PN} (= ${EXTENDPKGV})"
+ RDEPENDS:${PN}-additional-module = "${PN} (= ${EXTENDPKGV})"
The dependency relationships are intended to force the package
manager to upgrade these types of packages in lock-step.
@@ -2204,7 +2204,7 @@ system and gives an overview of their function and contents.
this variable, use an override for the associated image type. Here is
an example::
- EXTRA_IMAGECMD_ext3 ?= "-i 4096"
+ EXTRA_IMAGECMD:ext3 ?= "-i 4096"
:term:`EXTRA_IMAGEDEPENDS`
A list of recipes to build that do not provide packages for
@@ -2331,7 +2331,7 @@ system and gives an overview of their function and contents.
list of files or paths that identify the files you want included as
part of the resulting package. Here is an example::
- FILES_${PN} += "${bindir}/mydir1 ${bindir}/mydir2/myfile"
+ FILES:${PN} += "${bindir}/mydir1 ${bindir}/mydir2/myfile"
.. note::
@@ -2380,7 +2380,7 @@ system and gives an overview of their function and contents.
:term:`FILESEXTRAPATHS` from within a ``.bbappend`` file and that you
prepend paths as follows::
- FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
In the above example, the build system first
looks for files in a directory that has the same name as the
@@ -2402,7 +2402,7 @@ system and gives an overview of their function and contents.
Here is another common use::
- FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
In this example, the build system extends the
:term:`FILESPATH` variable to include a directory named ``files`` that is
@@ -2410,13 +2410,13 @@ system and gives an overview of their function and contents.
This next example specifically adds three paths::
- FILESEXTRAPATHS_prepend := "path_1:path_2:path_3:"
+ FILESEXTRAPATHS:prepend := "path_1:path_2:path_3:"
A final example shows how you can extend the search path and include
a :term:`MACHINE`-specific override, which is useful
in a BSP layer::
- FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
+ FILESEXTRAPATHS:prepend_intel-x86-common := "${THISDIR}/${PN}:"
The previous statement appears in the
``linux-yocto-dev.bbappend`` file, which is found in the
@@ -2664,7 +2664,7 @@ system and gives an overview of their function and contents.
Here is an example from the ``dbus`` recipe::
- GROUPADD_PARAM_${PN} = "-r netdev"
+ GROUPADD_PARAM:${PN} = "-r netdev"
For information on the standard Linux shell command
``groupadd``, see https://linux.die.net/man/8/groupadd.
@@ -2977,7 +2977,7 @@ system and gives an overview of their function and contents.
``btrfs``, and so forth). When setting this variable, you should use
an override for the associated type. Here is an example::
- IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+ IMAGE_CMD:jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
--output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 \
${EXTRA_IMAGECMD}"
@@ -3052,7 +3052,7 @@ system and gives an overview of their function and contents.
When you use this variable, it is best to use it as follows::
- IMAGE_INSTALL_append = " package-name"
+ IMAGE_INSTALL:append = " package-name"
Be sure to include the space
between the quotation character and the start of the package name or
@@ -3695,7 +3695,7 @@ system and gives an overview of their function and contents.
recipe. The package name override must be used, which in this example
is ``${PN}``::
- INSANE_SKIP_${PN} += "dev-so"
+ INSANE_SKIP:${PN} += "dev-so"
See the ":ref:`insane.bbclass <ref-classes-insane>`" section for a
list of the valid QA checks you can specify using this variable.
@@ -3749,9 +3749,9 @@ system and gives an overview of their function and contents.
``meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend``.
Here are the related statements from that append file::
- KBRANCH_genericx86 = "standard/base"
- KBRANCH_genericx86-64 = "standard/base"
- KBRANCH_edgerouter = "standard/edgerouter"
+ KBRANCH:genericx86 = "standard/base"
+ KBRANCH:genericx86-64 = "standard/base"
+ KBRANCH:edgerouter = "standard/edgerouter"
KBRANCH_beaglebone = "standard/beaglebone"
The :term:`KBRANCH` statements
@@ -3784,7 +3784,7 @@ system and gives an overview of their function and contents.
As an alternative, you can use the following within your append file::
- KBUILD_DEFCONFIG_pn-linux-yocto ?= defconfig_file
+ KBUILD_DEFCONFIG:pn-linux-yocto ?= defconfig_file
For more
information on how to use the :term:`KBUILD_DEFCONFIG` variable, see the
@@ -3932,10 +3932,10 @@ system and gives an overview of their function and contents.
statements add specific configurations to targeted machine types::
KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
- KERNEL_FEATURES_append = "${KERNEL_EXTRA_FEATURES}"
- KERNEL_FEATURES_append_qemuall = "cfg/virtio.scc"
- KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc cfg/paravirt_kvm.scc"
- KERNEL_FEATURES_append_qemux86-64 = "cfg/sound.scc"
+ KERNEL_FEATURES:append = "${KERNEL_EXTRA_FEATURES}"
+ KERNEL_FEATURES:append:qemuall = "cfg/virtio.scc"
+ KERNEL_FEATURES:append:qemux86 = " cfg/sound.scc cfg/paravirt_kvm.scc"
+ KERNEL_FEATURES:append:qemux86-64 = "cfg/sound.scc"
:term:`KERNEL_FIT_LINK_NAME`
The link name of the kernel flattened image tree (FIT) image. This
@@ -4123,7 +4123,7 @@ system and gives an overview of their function and contents.
SRCREV_machine_core2-32-intel-common = "43b9eced9ba8a57add36af07736344dcc383f711"
KMACHINE_core2-32-intel-common = "intel-core2-32"
KBRANCH_core2-32-intel-common = "standard/base"
- KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+ KERNEL_FEATURES:append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
The :term:`KMACHINE` statement says
that the kernel understands the machine name as "intel-core2-32".
@@ -4303,8 +4303,8 @@ system and gives an overview of their function and contents.
Documentation License 1.2 could be specified as follows::
LICENSE = "GFDL-1.2 & GPLv2"
- LICENSE_${PN} = "GPLv2"
- LICENSE_${PN}-doc = "GFDL-1.2"
+ LICENSE:${PN} = "GPLv2"
+ LICENSE:${PN}-doc = "GFDL-1.2"
:term:`LICENSE_CREATE_PACKAGE`
Setting :term:`LICENSE_CREATE_PACKAGE` to "1" causes the OpenEmbedded
@@ -4615,7 +4615,7 @@ system and gives an overview of their function and contents.
in QEMU, like in the following example from the ``connman-conf``
recipe::
- SRC_URI_append_qemuall = " file://wired.config \
+ SRC_URI:append:qemuall = " file://wired.config \
file://wired-setup \
"
@@ -4818,7 +4818,7 @@ system and gives an overview of their function and contents.
can attach it to a specific image recipe by using the recipe name
override::
- NO_RECOMMENDATIONS_pn-target_image = "1"
+ NO_RECOMMENDATIONS:pn-target_image = "1"
It is important to realize that if you choose to not install packages
using this variable and some other packages are dependent on them
@@ -4846,9 +4846,9 @@ system and gives an overview of their function and contents.
content of the debug package. For example::
NOAUTOPACKAGEDEBUG = "1"
- FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
- FILES_${PN}-dbg = "/usr/src/debug/"
- FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
+ FILES:${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
+ FILES:${PN}-dbg = "/usr/src/debug/"
+ FILES:${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
:term:`NON_MULTILIB_RECIPES`
A list of recipes that should not be built for multilib. OE-Core's
@@ -4959,7 +4959,7 @@ system and gives an overview of their function and contents.
allows variables to be set for a single recipe within configuration
(``.conf``) files. Here is an example::
- FOO_pn-myrecipe = "myrecipe-specific value"
+ FOO:pn-myrecipe = "myrecipe-specific value"
.. note::
@@ -5107,7 +5107,7 @@ system and gives an overview of their function and contents.
can attach it to a specific image recipe by using the recipe name
override::
- PACKAGE_EXCLUDE_pn-target_image = "package_name"
+ PACKAGE_EXCLUDE:pn-target_image = "package_name"
If you choose to not install a package using this variable and some
other package is dependent on it (i.e. listed in a recipe's
@@ -5344,18 +5344,18 @@ system and gives an overview of their function and contents.
Or, you can just append the variable::
- PACKAGECONFIG_append = " f4"
+ PACKAGECONFIG:append = " f4"
- *Configuration file:* This method is identical to changing the
block through an append file except you edit your ``local.conf``
or ``mydistro.conf`` file. As with append files previously
described, you can either completely override the variable::
- PACKAGECONFIG_pn-recipename = "f4 f5"
+ PACKAGECONFIG:pn-recipename = "f4 f5"
Or, you can just amend the variable::
- PACKAGECONFIG_append_pn-recipename = " f4"
+ PACKAGECONFIG:append:pn-recipename = " f4"
:term:`PACKAGECONFIG_CONFARGS`
A space-separated list of configuration options generated from the
@@ -5775,13 +5775,13 @@ system and gives an overview of their function and contents.
:term:`OVERRIDES` to set a machine-specific
override. Here is an example::
- PREFERRED_VERSION_linux-yocto_qemux86 = "5.0%"
+ PREFERRED_VERSION_linux-yocto:qemux86 = "5.0%"
Although not recommended, worst case, you can also use the
"forcevariable" override, which is the strongest override possible.
Here is an example::
- PREFERRED_VERSION_linux-yocto_forcevariable = "5.0%"
+ PREFERRED_VERSION_linux-yocto:forcevariable = "5.0%"
.. note::
@@ -5809,7 +5809,7 @@ system and gives an overview of their function and contents.
the ``local.conf`` configuration file in the
:term:`Build Directory`::
- PREMIRRORS_prepend = "\
+ PREMIRRORS:prepend = "\
git://.*/.* http://www.yoctoproject.org/sources/ \n \
ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
http://.*/.* http://www.yoctoproject.org/sources/ \n \
@@ -5992,7 +5992,7 @@ system and gives an overview of their function and contents.
Like all package-controlling variables, you must always use them in
conjunction with a package name override. Here is an example::
- RCONFLICTS_${PN} = "another_conflicting_package_name"
+ RCONFLICTS:${PN} = "another_conflicting_package_name"
BitBake, which the OpenEmbedded build system uses, supports
specifying versioned dependencies. Although the syntax varies
@@ -6000,7 +6000,7 @@ system and gives an overview of their function and contents.
from you. Here is the general syntax to specify versions with the
:term:`RCONFLICTS` variable::
- RCONFLICTS_${PN} = "package (operator version)"
+ RCONFLICTS:${PN} = "package (operator version)"
For ``operator``, you can specify the following:
@@ -6013,7 +6013,7 @@ system and gives an overview of their function and contents.
For example, the following sets up a dependency on version 1.2 or
greater of the package ``foo``::
- RCONFLICTS_${PN} = "foo (>= 1.2)"
+ RCONFLICTS:${PN} = "foo (>= 1.2)"
:term:`RDEPENDS`
Lists runtime dependencies of a package. These dependencies are other
@@ -6022,7 +6022,7 @@ system and gives an overview of their function and contents.
package ``foo`` needs the packages ``bar`` and ``baz`` to be
installed::
- RDEPENDS_foo = "bar baz"
+ RDEPENDS:foo = "bar baz"
The most common types of package
runtime dependencies are automatically detected and added. Therefore,
@@ -6063,7 +6063,7 @@ system and gives an overview of their function and contents.
on the ``perl`` package. In this case, you would use the following
:term:`RDEPENDS` statement::
- RDEPENDS_${PN}-dev += "perl"
+ RDEPENDS:${PN}-dev += "perl"
In the example,
the development package depends on the ``perl`` package. Thus, the
@@ -6092,7 +6092,7 @@ system and gives an overview of their function and contents.
from you. Here is the general syntax to specify versions with the
:term:`RDEPENDS` variable::
- RDEPENDS_${PN} = "package (operator version)"
+ RDEPENDS:${PN} = "package (operator version)"
For ``operator``, you can specify the following:
@@ -6112,7 +6112,7 @@ system and gives an overview of their function and contents.
For example, the following sets up a dependency on version 1.2 or
greater of the package ``foo``::
- RDEPENDS_${PN} = "foo (>= 1.2)"
+ RDEPENDS:${PN} = "foo (>= 1.2)"
For information on build-time dependencies, see the
:term:`DEPENDS` variable. You can also see the
@@ -6247,7 +6247,7 @@ system and gives an overview of their function and contents.
variable in conjunction with a package name override. Here is an
example::
- RPROVIDES_${PN} = "widget-abi-2"
+ RPROVIDES:${PN} = "widget-abi-2"
:term:`RRECOMMENDS`
A list of packages that extends the usability of a package being
@@ -6278,7 +6278,7 @@ system and gives an overview of their function and contents.
support wireless functionality. In this case, you would use the
following::
- RRECOMMENDS_${PN}-dev += "wireless_package_name"
+ RRECOMMENDS:${PN}-dev += "wireless_package_name"
In the
example, the package name (``${PN}-dev``) must appear as it would in
@@ -6291,7 +6291,7 @@ system and gives an overview of their function and contents.
Here is the general syntax to specify versions with the
:term:`RRECOMMENDS` variable::
- RRECOMMENDS_${PN} = "package (operator version)"
+ RRECOMMENDS:${PN} = "package (operator version)"
For ``operator``, you can specify the following:
@@ -6304,7 +6304,7 @@ system and gives an overview of their function and contents.
For example, the following sets up a recommend on version 1.2 or
greater of the package ``foo``::
- RRECOMMENDS_${PN} = "foo (>= 1.2)"
+ RRECOMMENDS:${PN} = "foo (>= 1.2)"
:term:`RREPLACES`
A list of packages replaced by a package. The package manager uses
@@ -6316,7 +6316,7 @@ system and gives an overview of their function and contents.
As with all package-controlling variables, you must use this variable
in conjunction with a package name override. Here is an example::
- RREPLACES_${PN} = "other_package_being_replaced"
+ RREPLACES:${PN} = "other_package_being_replaced"
BitBake, which the OpenEmbedded build system uses, supports
specifying versioned replacements. Although the syntax varies
@@ -6324,7 +6324,7 @@ system and gives an overview of their function and contents.
from you. Here is the general syntax to specify versions with the
:term:`RREPLACES` variable::
- RREPLACES_${PN} = "package (operator version)"
+ RREPLACES:${PN} = "package (operator version)"
For ``operator``, you can specify the following:
@@ -6337,7 +6337,7 @@ system and gives an overview of their function and contents.
For example, the following sets up a replacement using version 1.2
or greater of the package ``foo``::
- RREPLACES_${PN} = "foo (>= 1.2)"
+ RREPLACES:${PN} = "foo (>= 1.2)"
:term:`RSUGGESTS`
A list of additional packages that you can suggest for installation
@@ -6348,7 +6348,7 @@ system and gives an overview of their function and contents.
variable in conjunction with a package name override. Here is an
example::
- RSUGGESTS_${PN} = "useful_package another_package"
+ RSUGGESTS:${PN} = "useful_package another_package"
:term:`S`
The location in the :term:`Build Directory` where
@@ -7609,7 +7609,7 @@ system and gives an overview of their function and contents.
override to indicate the package to which the value applies. Here is
an example from the connman recipe::
- SYSTEMD_SERVICE_${PN} = "connman.service"
+ SYSTEMD_SERVICE:${PN} = "connman.service"
:term:`SYSVINIT_ENABLED_GETTYS`
When using
@@ -7947,14 +7947,14 @@ system and gives an overview of their function and contents.
your own tests to the list of tests by appending :term:`TEST_SUITES` as
follows::
- TEST_SUITES_append = " mytest"
+ TEST_SUITES:append = " mytest"
Alternatively, you can
provide the "auto" option to have all applicable tests run against
the image.
::
- TEST_SUITES_append = " auto"
+ TEST_SUITES:append = " auto"
Using this option causes the
build system to automatically run tests that are applicable to the
@@ -8215,7 +8215,7 @@ system and gives an overview of their function and contents.
The BitBake configuration file (``meta/conf/bitbake.conf``) defines
:term:`TUNE_FEATURES` as follows::
- TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
+ TUNE_FEATURES ??= "${TUNE_FEATURES:tune-${DEFAULTTUNE}}"
See the :term:`DEFAULTTUNE` variable for more information.
@@ -8241,13 +8241,13 @@ system and gives an overview of their function and contents.
the architecture, ABI, and tuning of output packages. The specific
tune is defined using the "_tune" override as follows::
- TUNE_PKGARCH_tune-tune = "tune"
+ TUNE_PKGARCH:tune-tune = "tune"
These tune-specific package architectures are defined in the machine
include files. Here is an example of the "core2-32" tuning as used in
the ``meta/conf/machine/include/tune-core2.inc`` file::
- TUNE_PKGARCH_tune-core2-32 = "core2-32"
+ TUNE_PKGARCH:tune-core2-32 = "core2-32"
:term:`TUNEABI`
An underlying Application Binary Interface (ABI) used by a particular
@@ -8614,7 +8614,7 @@ system and gives an overview of their function and contents.
Here is an example from the ``dbus`` recipe::
- USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
+ USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/dbus \
--no-create-home --shell /bin/false \
--user-group messagebus"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/6] sdk-manual: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
` (3 preceding siblings ...)
2021-08-04 18:34 ` [PATCH 4/6] ref-manual: " Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
2021-08-04 18:34 ` [PATCH 6/6] test-manual: " Michael Opdenacker
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/sdk-manual/appendix-customizing-standard.rst | 2 +-
documentation/sdk-manual/appendix-obtain.rst | 2 +-
documentation/sdk-manual/extensible.rst | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/documentation/sdk-manual/appendix-customizing-standard.rst b/documentation/sdk-manual/appendix-customizing-standard.rst
index 9bc70cf55c..c619c15e46 100644
--- a/documentation/sdk-manual/appendix-customizing-standard.rst
+++ b/documentation/sdk-manual/appendix-customizing-standard.rst
@@ -29,6 +29,6 @@ You can include API documentation as well as any other documentation
provided by recipes with the standard SDK by adding "api-documentation"
to the
:term:`DISTRO_FEATURES`
-variable: DISTRO_FEATURES_append = " api-documentation" Setting this
+variable: DISTRO_FEATURES:append = " api-documentation" Setting this
variable as shown here causes the OpenEmbedded build system to build the
documentation and then include it in the standard SDK.
diff --git a/documentation/sdk-manual/appendix-obtain.rst b/documentation/sdk-manual/appendix-obtain.rst
index fc6b8b9d5c..841abac5aa 100644
--- a/documentation/sdk-manual/appendix-obtain.rst
+++ b/documentation/sdk-manual/appendix-obtain.rst
@@ -163,7 +163,7 @@ build the SDK installer. Follow these steps:
SDK installer. Doing so ensures that the eventual SDK
installation process installs the appropriate library packages
as part of the SDK. Following is an example using ``libc``
- static development libraries: TOOLCHAIN_TARGET_TASK_append = "
+ static development libraries: TOOLCHAIN_TARGET_TASK:append = "
libc-staticdev"
7. *Run the Installer:* You can now run the SDK installer from
diff --git a/documentation/sdk-manual/extensible.rst b/documentation/sdk-manual/extensible.rst
index 2cdb06d65c..bdce0414e4 100644
--- a/documentation/sdk-manual/extensible.rst
+++ b/documentation/sdk-manual/extensible.rst
@@ -838,7 +838,7 @@ recipe.
If you need to add runtime dependencies, you can do so by adding the
following to your recipe::
- RDEPENDS_${PN} += "dependency1 dependency2 ..."
+ RDEPENDS:${PN} += "dependency1 dependency2 ..."
.. note::
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/6] test-manual: overrides syntax updates
2021-08-04 18:34 [PATCH 0/6] overrides syntax updates Michael Opdenacker
` (4 preceding siblings ...)
2021-08-04 18:34 ` [PATCH 5/6] sdk-manual: " Michael Opdenacker
@ 2021-08-04 18:34 ` Michael Opdenacker
5 siblings, 0 replies; 7+ messages in thread
From: Michael Opdenacker @ 2021-08-04 18:34 UTC (permalink / raw)
To: docs; +Cc: Michael Opdenacker
Updated with openembedded-core/scripts/contrib/convert-overrides.py
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
---
documentation/test-manual/understand-autobuilder.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/documentation/test-manual/understand-autobuilder.rst b/documentation/test-manual/understand-autobuilder.rst
index c158d9ce4d..b6809ce7bd 100644
--- a/documentation/test-manual/understand-autobuilder.rst
+++ b/documentation/test-manual/understand-autobuilder.rst
@@ -27,7 +27,7 @@ which looks like::
"TEMPLATE" : "arch-qemu",
"step1" : {
"extravars" : [
- "IMAGE_FSTYPES_append = ' wic wic.bmap'"
+ "IMAGE_FSTYPES:append = ' wic wic.bmap'"
]
}
},
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread