summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst12
-rw-r--r--bitbake/lib/bb/cooker.py8
2 files changed, 1 insertions, 19 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
index f23fb7f2a7..6c5bab4d4d 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
@@ -127,18 +127,6 @@ overview of their function and contents.
127 Contains the name of the currently running task. The name does not 127 Contains the name of the currently running task. The name does not
128 include the ``do_`` prefix. 128 include the ``do_`` prefix.
129 129
130 :term:`BB_DANGLINGAPPENDS_WARNONLY`
131 Defines how BitBake handles situations where an append file
132 (``.bbappend``) has no corresponding recipe file (``.bb``). This
133 condition often occurs when layers get out of sync (e.g. ``oe-core``
134 bumps a recipe version and the old recipe no longer exists and the
135 other layer has not been updated to the new version of the recipe
136 yet).
137
138 The default fatal behavior is safest because it is the sane reaction
139 given something is out of sync. It is important to realize when your
140 changes are no longer being applied.
141
142 :term:`BB_DEFAULT_TASK` 130 :term:`BB_DEFAULT_TASK`
143 The default task to use when none is specified (e.g. with the ``-c`` 131 The default task to use when none is specified (e.g. with the ``-c``
144 command line option). The task name specified should not include the 132 command line option). The task name specified should not include the
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index d58c0f575c..a8e0a81dc9 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -957,13 +957,7 @@ class BBCooker:
957 '\n '.join(appends_without_recipes[mc]))) 957 '\n '.join(appends_without_recipes[mc])))
958 958
959 if msgs: 959 if msgs:
960 msg = "\n".join(msgs) 960 bb.fatal("\n".join(msgs))
961 warn_only = self.databuilder.mcdata[mc].getVar("BB_DANGLINGAPPENDS_WARNONLY", \
962 False) or "no"
963 if warn_only.lower() in ("1", "yes", "true"):
964 bb.warn(msg)
965 else:
966 bb.fatal(msg)
967 961
968 def handlePrefProviders(self): 962 def handlePrefProviders(self):
969 963