diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-10 11:03:55 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-11 22:39:19 +0100 |
| commit | 92d1ba8dbbbf14e78843246e412fcf7963cb27cf (patch) | |
| tree | 078bd3298ed966bd114d2be14035ac08f1714cd5 /meta | |
| parent | d584f9c6bd4cb074e0e5d3e263543294f47f84f0 (diff) | |
| download | poky-92d1ba8dbbbf14e78843246e412fcf7963cb27cf.tar.gz | |
Revert "default-distrovars.inc: Set BBINCLUDELOGS to empty to disable printing failed task output multiple times"
There are fixes in bitbake which should now allow this to operate as expected.
(From OE-Core rev: b7f9980a5b2d29ac289b8cfde67779c11fda41d3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 6 | ||||
| -rw-r--r-- | meta/conf/documentation.conf | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 5035508b98..f91df632d5 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
| @@ -33,10 +33,8 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0" | |||
| 33 | 33 | ||
| 34 | NO32LIBS ??= "1" | 34 | NO32LIBS ??= "1" |
| 35 | 35 | ||
| 36 | # Default logger already emits logfiles if a build fails, setting this to any non-empty value would just include more copies (prefixed with "|") in the output | 36 | # Default to emitting logfiles if a build fails. |
| 37 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14542 | 37 | BBINCLUDELOGS ??= "yes" |
| 38 | BBINCLUDELOGS ??= "" | ||
| 39 | |||
| 40 | SDK_VERSION ??= "nodistro.0" | 38 | SDK_VERSION ??= "nodistro.0" |
| 41 | DISTRO_VERSION ??= "nodistro.0" | 39 | DISTRO_VERSION ??= "nodistro.0" |
| 42 | 40 | ||
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index f4697e28d0..c5a38b0764 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
| @@ -88,7 +88,7 @@ BBFILE_COLLECTIONS[doc] = "Lists the names of configured layers. These names are | |||
| 88 | BBFILE_PATTERN[doc] = "Variable that expands to match files from BBFILES in a particular layer. This variable is used in the layer.conf file and must be suffixed with the name of a layer." | 88 | BBFILE_PATTERN[doc] = "Variable that expands to match files from BBFILES in a particular layer. This variable is used in the layer.conf file and must be suffixed with the name of a layer." |
| 89 | BBFILE_PRIORITY[doc] = "Assigns the priority for recipe files in each layer. Setting this variable allows you to prioritize a layer against other layers that contain the same recipe." | 89 | BBFILE_PRIORITY[doc] = "Assigns the priority for recipe files in each layer. Setting this variable allows you to prioritize a layer against other layers that contain the same recipe." |
| 90 | BBFILES[doc] = "List of recipe files used by BitBake to build software." | 90 | BBFILES[doc] = "List of recipe files used by BitBake to build software." |
| 91 | BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure. Set to empty if you don't want to have 2nd copy of failed task output (prefixed with '|') in the cooker log." | 91 | BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure." |
| 92 | BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." | 92 | BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." |
| 93 | BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file." | 93 | BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file." |
| 94 | BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files." | 94 | BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files." |