From 73ecebe8a65159b32017789f5d676577bce2031e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 23 Jun 2025 14:42:56 +0200 Subject: [PATCH] ref-manual: correct references to WORKDIR to account for recent do_unpack changes (From yocto-docs rev: 2e83260484c102fe7b788585cbdd7ca91ba91d85) Signed-off-by: Alexander Kanavin Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie --- documentation/ref-manual/structure.rst | 2 +- documentation/ref-manual/variables.rst | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/documentation/ref-manual/structure.rst b/documentation/ref-manual/structure.rst index 2190f5b90e..d6dbb29401 100644 --- a/documentation/ref-manual/structure.rst +++ b/documentation/ref-manual/structure.rst @@ -611,7 +611,7 @@ example, consider ``linux-yocto-kernel-3.0`` on the machine ``qemux86`` built within the Yocto Project. For this package, a work directory of ``tmp/work/qemux86-poky-linux/linux-yocto/3.0+git1+<.....>``, referred to as the :term:`WORKDIR`, is created. Within this directory, the source is -unpacked to ``linux-qemux86-standard-build`` and then patched by Quilt. +unpacked to ``sources/linux-qemux86-standard-build`` and then patched by Quilt. (See the ":ref:`dev-manual/quilt:using quilt in your workflow`" section in the Yocto Project Development Tasks Manual for more information.) Within the ``linux-qemux86-standard-build`` directory, standard Quilt diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 10d363a389..0a748c9187 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst @@ -265,7 +265,7 @@ system and gives an overview of their function and contents. build process. By default, this directory is the same as the :term:`S` directory, which is defined as:: - S = "${WORKDIR}/${BP}" + S = "${UNPACKDIR}/${BP}" You can separate the (:term:`S`) directory and the directory pointed to by the :term:`B` variable. Most Autotools-based recipes support @@ -8060,7 +8060,7 @@ system and gives an overview of their function and contents. :term:`S` The location in the :term:`Build Directory` where unpacked recipe source code resides. By default, this directory is - ``${``\ :term:`WORKDIR`\ ``}/${``\ :term:`BPN`\ ``}-${``\ :term:`PV`\ ``}``, + ``${``\ :term:`UNPACKDIR`\ ``}/${``\ :term:`BPN`\ ``}-${``\ :term:`PV`\ ``}``, where ``${BPN}`` is the base recipe name and ``${PV}`` is the recipe version. If the source tarball extracts the code to a directory named anything other than ``${BPN}-${PV}``, or if the source code is @@ -8073,19 +8073,10 @@ system and gives an overview of their function and contents. ``poky/build``. In this case, the work directory the build system uses to keep the unpacked recipe for ``db`` is the following:: - poky/build/tmp/work/qemux86-poky-linux/db/5.1.19-r3/db-5.1.19 + poky/build/tmp/work/qemux86-poky-linux/db/5.1.19-r3/sources/db-5.1.19 The unpacked source code resides in the ``db-5.1.19`` folder. - This next example assumes a Git repository. By default, Git - repositories are cloned to ``${WORKDIR}/git`` during - :ref:`ref-tasks-fetch`. Since this path is different - from the default value of :term:`S`, you must set it specifically so the - source can be located:: - - SRC_URI = "git://path/to/repo.git;branch=main" - S = "${WORKDIR}/git" - :term:`SANITY_REQUIRED_UTILITIES` Specifies a list of command-line utilities that should be checked for during the initial sanity checking process when running BitBake. If @@ -8460,7 +8451,6 @@ system and gives an overview of their function and contents. sources are fetched from a Git repository and ``setup.py`` is in a ``python/pythonmodule`` subdirectory, you would have this:: - S = "${WORKDIR}/git" SETUPTOOLS_SETUP_PATH = "${S}/python/pythonmodule" :term:`SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS`