diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 13:50:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | 4512f767eacfc0838de3d74f1de7aa84b2d7a617 (patch) | |
tree | ef4e0f07eb96c3b03e15463bb134273d671d101a /bitbake/doc | |
parent | 2d7cf6c056691b6de81bdbb029225d7e0e16f37b (diff) | |
download | poky-4512f767eacfc0838de3d74f1de7aa84b2d7a617.tar.gz |
bitbake: doc/lib: Add fixes for issues missed by the automated conversion
The examples and tests use non-standard override names, convert these to
the new syntax by hand.
(Bitbake rev: a6c40eca1146c0160da7e4e0bd7ac52fef2029e0)
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.rst | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst index db44e26fbd..372926064a 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst | |||
@@ -551,7 +551,7 @@ variable. | |||
551 | 551 | ||
552 | DEPENDS = "glibc ncurses" | 552 | DEPENDS = "glibc ncurses" |
553 | OVERRIDES = "machine:local" | 553 | OVERRIDES = "machine:local" |
554 | DEPENDS:append_machine = "libmad" | 554 | DEPENDS:append:machine = "libmad" |
555 | 555 | ||
556 | In this example, :term:`DEPENDS` becomes "glibc ncurses libmad". | 556 | In this example, :term:`DEPENDS` becomes "glibc ncurses libmad". |
557 | 557 | ||
@@ -618,27 +618,27 @@ example:: | |||
618 | 618 | ||
619 | OVERRIDES = "foo" | 619 | OVERRIDES = "foo" |
620 | A = "Z" | 620 | A = "Z" |
621 | A_foo:append = "X" | 621 | A:foo:append = "X" |
622 | 622 | ||
623 | For this case, | 623 | For this case, |
624 | ``A`` is unconditionally set to "Z" and "X" is unconditionally and | 624 | ``A`` is unconditionally set to "Z" and "X" is unconditionally and |
625 | immediately appended to the variable ``A_foo``. Because overrides have | 625 | immediately appended to the variable ``A:foo``. Because overrides have |
626 | not been applied yet, ``A_foo`` is set to "X" due to the append and | 626 | not been applied yet, ``A:foo`` is set to "X" due to the append and |
627 | ``A`` simply equals "Z". | 627 | ``A`` simply equals "Z". |
628 | 628 | ||
629 | Applying overrides, however, changes things. Since "foo" is listed in | 629 | Applying overrides, however, changes things. Since "foo" is listed in |
630 | :term:`OVERRIDES`, the conditional variable ``A`` is replaced with the "foo" | 630 | :term:`OVERRIDES`, the conditional variable ``A`` is replaced with the "foo" |
631 | version, which is equal to "X". So effectively, ``A_foo`` replaces | 631 | version, which is equal to "X". So effectively, ``A:foo`` replaces |
632 | ``A``. | 632 | ``A``. |
633 | 633 | ||
634 | This next example changes the order of the override and the append:: | 634 | This next example changes the order of the override and the append:: |
635 | 635 | ||
636 | OVERRIDES = "foo" | 636 | OVERRIDES = "foo" |
637 | A = "Z" | 637 | A = "Z" |
638 | A:append_foo = "X" | 638 | A:append:foo = "X" |
639 | 639 | ||
640 | For this case, before | 640 | For this case, before |
641 | overrides are handled, ``A`` is set to "Z" and ``A_append_foo`` is set | 641 | overrides are handled, ``A`` is set to "Z" and ``A:append:foo`` is set |
642 | to "X". Once the override for "foo" is applied, however, ``A`` gets | 642 | to "X". Once the override for "foo" is applied, however, ``A`` gets |
643 | appended with "X". Consequently, ``A`` becomes "ZX". Notice that spaces | 643 | appended with "X". Consequently, ``A`` becomes "ZX". Notice that spaces |
644 | are not appended. | 644 | are not appended. |
@@ -648,15 +648,15 @@ back as in the first example:: | |||
648 | 648 | ||
649 | OVERRIDES = "foo" | 649 | OVERRIDES = "foo" |
650 | A = "Y" | 650 | A = "Y" |
651 | A_foo:append = "Z" | 651 | A:foo:append = "Z" |
652 | A_foo:append = "X" | 652 | A:foo:append = "X" |
653 | 653 | ||
654 | For this case, before any overrides are resolved, | 654 | For this case, before any overrides are resolved, |
655 | ``A`` is set to "Y" using an immediate assignment. After this immediate | 655 | ``A`` is set to "Y" using an immediate assignment. After this immediate |
656 | assignment, ``A_foo`` is set to "Z", and then further appended with "X" | 656 | assignment, ``A:foo`` is set to "Z", and then further appended with "X" |
657 | leaving the variable set to "ZX". Finally, applying the override for | 657 | leaving the variable set to "ZX". Finally, applying the override for |
658 | "foo" results in the conditional variable ``A`` becoming "ZX" (i.e. | 658 | "foo" results in the conditional variable ``A`` becoming "ZX" (i.e. |
659 | ``A`` is replaced with ``A_foo``). | 659 | ``A`` is replaced with ``A:foo``). |
660 | 660 | ||
661 | This final example mixes in some varying operators:: | 661 | This final example mixes in some varying operators:: |
662 | 662 | ||
@@ -752,7 +752,7 @@ parsed. One way to achieve a conditional inherit in this case is to use | |||
752 | overrides:: | 752 | overrides:: |
753 | 753 | ||
754 | VARIABLE = "" | 754 | VARIABLE = "" |
755 | VARIABLE_someoverride = "myclass" | 755 | VARIABLE:someoverride = "myclass" |
756 | 756 | ||
757 | Another method is by using anonymous Python. Here is an example:: | 757 | Another method is by using anonymous Python. Here is an example:: |
758 | 758 | ||