diff options
author | Matthias Pritschet <matthias@pritschet.eu> | 2024-07-15 18:23:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-08-22 13:48:58 +0100 |
commit | 48c6bc25720e8b88e48edca10c927ea307a74bec (patch) | |
tree | c02d1abaee7eac66fb65fe21b711afd003dbcca2 /documentation | |
parent | 94993b0ef4d670cbfee517b703e356de461078a9 (diff) | |
download | poky-48c6bc25720e8b88e48edca10c927ea307a74bec.tar.gz |
ref-manual: fix typo and move SYSROOT_DIRS example
1. Changed one letter (s/B/A), so the sentence is correct again.
2. Moved example from SYSROOT_DIRS_IGNORE into SYSROOT_DIRS section.
(From yocto-docs rev: 7d762fbad07bf16a0a657169c09a3e402dabbe90)
Signed-off-by: Matthias Pritschet <matthias@pritschet.eu>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/ref-manual/variables.rst | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 848cea787f..f0c8e4f848 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -8584,29 +8584,6 @@ system and gives an overview of their function and contents. | |||
8584 | /sysroot-only \ | 8584 | /sysroot-only \ |
8585 | " | 8585 | " |
8586 | 8586 | ||
8587 | :term:`SYSROOT_DIRS_IGNORE` | ||
8588 | Directories that are not staged into the sysroot by the | ||
8589 | :ref:`ref-tasks-populate_sysroot` task. You | ||
8590 | can use this variable to exclude certain subdirectories of | ||
8591 | directories listed in :term:`SYSROOT_DIRS` from | ||
8592 | staging. By default, the following directories are not staged:: | ||
8593 | |||
8594 | SYSROOT_DIRS_IGNORE = " \ | ||
8595 | ${mandir} \ | ||
8596 | ${docdir} \ | ||
8597 | ${infodir} \ | ||
8598 | ${datadir}/X11/locale \ | ||
8599 | ${datadir}/applications \ | ||
8600 | ${datadir}/bash-completion \ | ||
8601 | ${datadir}/fonts \ | ||
8602 | ${datadir}/gtk-doc/html \ | ||
8603 | ${datadir}/installed-tests \ | ||
8604 | ${datadir}/locale \ | ||
8605 | ${datadir}/pixmaps \ | ||
8606 | ${datadir}/terminfo \ | ||
8607 | ${libdir}/${BPN}/ptest \ | ||
8608 | " | ||
8609 | |||
8610 | Consider the following example in which you need to manipulate this variable. | 8587 | Consider the following example in which you need to manipulate this variable. |
8611 | Assume you have a recipe ``A`` that provides a shared library ``.so.*`` that is | 8588 | Assume you have a recipe ``A`` that provides a shared library ``.so.*`` that is |
8612 | installed into a custom folder other than "``${libdir}``" | 8589 | installed into a custom folder other than "``${libdir}``" |
@@ -8618,7 +8595,7 @@ system and gives an overview of their function and contents. | |||
8618 | is just to show the usefulness of setting :term:`SYSROOT_DIRS`. | 8595 | is just to show the usefulness of setting :term:`SYSROOT_DIRS`. |
8619 | 8596 | ||
8620 | When a recipe ``B`` :term:`DEPENDS` on ``A``, it means what is in | 8597 | When a recipe ``B`` :term:`DEPENDS` on ``A``, it means what is in |
8621 | :term:`SYSROOT_DIRS` will be copied from :term:`D` of the recipe ``B`` | 8598 | :term:`SYSROOT_DIRS` will be copied from :term:`D` of the recipe ``A`` |
8622 | into ``B``'s :term:`SYSROOT_DESTDIR` that is "``${WORKDIR}/sysroot-destdir``". | 8599 | into ``B``'s :term:`SYSROOT_DESTDIR` that is "``${WORKDIR}/sysroot-destdir``". |
8623 | 8600 | ||
8624 | Now, since ``/opt/lib`` is not in :term:`SYSROOT_DIRS`, it will never be copied to | 8601 | Now, since ``/opt/lib`` is not in :term:`SYSROOT_DIRS`, it will never be copied to |
@@ -8636,6 +8613,29 @@ system and gives an overview of their function and contents. | |||
8636 | 8613 | ||
8637 | TARGET_LDFLAGS:append = " -L${RECIPE_SYSROOT}/opt/lib" | 8614 | TARGET_LDFLAGS:append = " -L${RECIPE_SYSROOT}/opt/lib" |
8638 | 8615 | ||
8616 | :term:`SYSROOT_DIRS_IGNORE` | ||
8617 | Directories that are not staged into the sysroot by the | ||
8618 | :ref:`ref-tasks-populate_sysroot` task. You | ||
8619 | can use this variable to exclude certain subdirectories of | ||
8620 | directories listed in :term:`SYSROOT_DIRS` from | ||
8621 | staging. By default, the following directories are not staged:: | ||
8622 | |||
8623 | SYSROOT_DIRS_IGNORE = " \ | ||
8624 | ${mandir} \ | ||
8625 | ${docdir} \ | ||
8626 | ${infodir} \ | ||
8627 | ${datadir}/X11/locale \ | ||
8628 | ${datadir}/applications \ | ||
8629 | ${datadir}/bash-completion \ | ||
8630 | ${datadir}/fonts \ | ||
8631 | ${datadir}/gtk-doc/html \ | ||
8632 | ${datadir}/installed-tests \ | ||
8633 | ${datadir}/locale \ | ||
8634 | ${datadir}/pixmaps \ | ||
8635 | ${datadir}/terminfo \ | ||
8636 | ${libdir}/${BPN}/ptest \ | ||
8637 | " | ||
8638 | |||
8639 | :term:`SYSROOT_DIRS_NATIVE` | 8639 | :term:`SYSROOT_DIRS_NATIVE` |
8640 | Extra directories staged into the sysroot by the | 8640 | Extra directories staged into the sysroot by the |
8641 | :ref:`ref-tasks-populate_sysroot` task for | 8641 | :ref:`ref-tasks-populate_sysroot` task for |