diff options
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 6 | ||||
| -rw-r--r-- | meta/conf/documentation.conf | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 433d4b6651..e266d0f312 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -27,8 +27,10 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0" NO32LIBS ??= "1" -# Default to emitting logfiles if a build fails. -BBINCLUDELOGS ??= "yes" +# 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 +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14542 +BBINCLUDELOGS ??= "" + SDK_VERSION ??= "nodistro.0" DISTRO_VERSION ??= "nodistro.0" diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index eee3c43ff2..99426387be 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 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." 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." BBFILES[doc] = "List of recipe files used by BitBake to build software." -BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure." +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." BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file." BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files." |