From acc069eae454e337d999fee6f0aee5afe191d6f4 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Fri, 13 Sep 2019 06:48:36 -0400
Subject: poky: subtree update:3b87508a9a..745e38ff0f

Jacob Kroon (2):
      bitbake: bitbake-user-manual: Correct description for _append/_prepend/_remove
      bitbake: bitbake-user-manual: key-expansion: Don't refer to overrides

Nathan Rossi (2):
      oeqa/selftest/context.py: For -t/-T use append argparse action
      chrpath.bbclass: Add break_hardlinks kwarg to allow breaking hardlinks

Trevor Gamblin (1):
      libevent: don't treat test stats line as pass/fail in ptest

Change-Id: I453a18f9177b070de9a2109a8b2b96694aa6e1c3
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../bitbake-user-manual/bitbake-user-manual-metadata.xml  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'poky/bitbake')

diff --git a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index 88622421d..421364c2c 100644
--- a/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -369,9 +369,8 @@
 
             <para>
                 These operators differ from the ":=", ".=", "=.", "+=", and "=+"
-                operators in that their effects are deferred
-                until after parsing completes rather than being immediately
-                applied.
+                operators in that their effects are applied at variable
+                expansion time rather than being immediately applied.
                 Here are some examples:
                 <literallayout class='monospaced'>
      B = "bval"
@@ -435,7 +434,7 @@
 
             <para>
                 Like "_append" and "_prepend", "_remove"
-                is deferred until after parsing completes.
+                is applied at variable expansion time.
             </para>
         </section>
 
@@ -800,17 +799,15 @@
             <title>Key Expansion</title>
 
             <para>
-                Key expansion happens when the BitBake datastore is finalized
-                just before BitBake expands overrides.
+                Key expansion happens when the BitBake datastore is finalized.
                 To better understand this, consider the following example:
                 <literallayout class='monospaced'>
      A${B} = "X"
      B = "2"
      A2 = "Y"
                 </literallayout>
-                In this case, after all the parsing is complete, and
-                before any overrides are handled, BitBake expands
-                <filename>${B}</filename> into "2".
+                In this case, after all the parsing is complete,
+                BitBake expands <filename>${B}</filename> into "2".
                 This expansion causes <filename>A2</filename>, which was
                 set to "Y" before the expansion, to become "X".
             </para>
-- 
cgit v1.2.3