path: root/meta
diff options
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 11:03:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 11:04:52 +0100
commitb7f9980a5b2d29ac289b8cfde67779c11fda41d3 (patch)
tree4c408f01427c173461b55fadb042a5728887ddb6 /meta
parent71b549924a7fa7973a8e03e11f3db45fdc29889d (diff)
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
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"
NO32LIBS ??= "1"
-# 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
+# Default to emitting logfiles if a build fails.
SDK_VERSION ??= "nodistro.0"
DISTRO_VERSION ??= "nodistro.0"
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
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. Set to empty if you don't want to have 2nd copy of failed task output (prefixed with '|') in the cooker log."
+BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure."
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."