summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-10 10:03:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-11 21:39:19 (GMT)
commit92d1ba8dbbbf14e78843246e412fcf7963cb27cf (patch)
tree078bd3298ed966bd114d2be14035ac08f1714cd5 /meta/conf
parentd584f9c6bd4cb074e0e5d3e263543294f47f84f0 (diff)
downloadpoky-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/conf')
-rw-r--r--meta/conf/distro/include/default-distrovars.inc6
-rw-r--r--meta/conf/documentation.conf2
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 5035508..f91df63 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
34NO32LIBS ??= "1" 34NO32LIBS ??= "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 37BBINCLUDELOGS ??= "yes"
38BBINCLUDELOGS ??= ""
39
40SDK_VERSION ??= "nodistro.0" 38SDK_VERSION ??= "nodistro.0"
41DISTRO_VERSION ??= "nodistro.0" 39DISTRO_VERSION ??= "nodistro.0"
42 40
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index f4697e2..c5a38b0 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
88BBFILE_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." 88BBFILE_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."
89BBFILE_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." 89BBFILE_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."
90BBFILES[doc] = "List of recipe files used by BitBake to build software." 90BBFILES[doc] = "List of recipe files used by BitBake to build software."
91BBINCLUDELOGS[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." 91BBINCLUDELOGS[doc] = "Variable that controls how BitBake displays logs on build failure."
92BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." 92BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
93BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file." 93BBLAYERS[doc] = "Lists the layers to enable during the build. This variable is defined in the bblayers.conf configuration file."
94BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files." 94BBMASK[doc] = "Prevents BitBake from processing specific recipes or recipe append files."