diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-16 14:16:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-18 10:59:26 +0100 |
commit | a9aa1d24c7c4518173f622a1fab55a98a16150f9 (patch) | |
tree | 688a3602fce0b04eab7119930ad41d730029244a /bitbake/doc | |
parent | 58530c6e481a2d237291af9e75d4417ecac7636b (diff) | |
download | poky-a9aa1d24c7c4518173f622a1fab55a98a16150f9.tar.gz |
bitbake: data: Fix whitespace on _remove operations
We have some slightly odd behaviours with the current implementation of
_remove operations. For example:
TEST = " A B"
TEST_remove = "C"
would trigger TEST to become "A B" even thought it doesn't contain "C".
In particular, this means that an inactive remove operator added in a
bbappend could change the task checksum which is not desireable.
Fix the operation to preserve whitespace, adding new tests to make this
explict and test further corner cases. Also update the manual to match.
(Bitbake rev: c0a23dd9155c50a6b7df796980bc7b612cac7994)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/doc')
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index bc08c814d1..fc55ef6483 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | |||
@@ -342,7 +342,7 @@ | |||
342 | 342 | ||
343 | <para> | 343 | <para> |
344 | When you use this syntax, BitBake expects one or more strings. | 344 | When you use this syntax, BitBake expects one or more strings. |
345 | Surrounding spaces are removed as well. | 345 | Surrounding spaces and spacing are preserved. |
346 | Here is an example: | 346 | Here is an example: |
347 | <literallayout class='monospaced'> | 347 | <literallayout class='monospaced'> |
348 | FOO = "123 456 789 123456 123 456 123 456" | 348 | FOO = "123 456 789 123456 123 456 123 456" |
@@ -352,8 +352,8 @@ | |||
352 | FOO2_remove = "abc def" | 352 | FOO2_remove = "abc def" |
353 | </literallayout> | 353 | </literallayout> |
354 | The variable <filename>FOO</filename> becomes | 354 | The variable <filename>FOO</filename> becomes |
355 | "789 123456" and <filename>FOO2</filename> becomes | 355 | " 789 123456 " and <filename>FOO2</filename> becomes |
356 | "ghi abcdef". | 356 | " ghi abcdef ". |
357 | </para> | 357 | </para> |
358 | 358 | ||
359 | <para> | 359 | <para> |