diff options
author | Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com> | 2019-10-08 17:37:33 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-09 14:01:59 +0100 |
commit | 5c9b16df70c3f3f0c92edb5adc124c51d9001593 (patch) | |
tree | 13be5993d1034413115cfa5e7909ebb4e2a8fcf9 /bitbake | |
parent | 677bfa6a697d1807a689105dcfe4c6def6f08d30 (diff) | |
download | poky-5c9b16df70c3f3f0c92edb5adc124c51d9001593.tar.gz |
bitbake: bitbake-user-manual: Update multiconfig syntax and explanation of BBMULTICONFIG
The syntax to use multiconfig builds changed from multiconfig:foo:target
to mc:foo:target, change the syntax on bitbakes documentation.
Clarify that BBMULTICONFIG defines additional configurations along with
the one coming from local.conf.
(Bitbake rev: 648ec12d776d801a6839f759975c91a93aa3a36e)
Signed-off-by: Alejandro Enedino Hernandez Samaniego <aehs29@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml index 02058a6f62..8f2a960cac 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml | |||
@@ -791,7 +791,7 @@ | |||
791 | The following statement in the | 791 | The following statement in the |
792 | <filename>local.conf</filename> file both enables | 792 | <filename>local.conf</filename> file both enables |
793 | BitBake to perform multiple configuration builds and | 793 | BitBake to perform multiple configuration builds and |
794 | specifies the two multiconfigs: | 794 | specifies the two extra multiconfigs: |
795 | <literallayout class='monospaced'> | 795 | <literallayout class='monospaced'> |
796 | BBMULTICONFIG = "target1 target2" | 796 | BBMULTICONFIG = "target1 target2" |
797 | </literallayout> | 797 | </literallayout> |
@@ -803,13 +803,13 @@ | |||
803 | builds, use the following command form to start the | 803 | builds, use the following command form to start the |
804 | builds: | 804 | builds: |
805 | <literallayout class='monospaced'> | 805 | <literallayout class='monospaced'> |
806 | $ bitbake [multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[multiconfig:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] | 806 | $ bitbake [mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable> [[[mc:<replaceable>multiconfigname</replaceable>:]<replaceable>target</replaceable>] ... ] |
807 | </literallayout> | 807 | </literallayout> |
808 | Here is an example for two multiconfigs: | 808 | Here is an example for two extra multiconfigs: |
809 | <filename>target1</filename> and | 809 | <filename>target1</filename> and |
810 | <filename>target2</filename>: | 810 | <filename>target2</filename>: |
811 | <literallayout class='monospaced'> | 811 | <literallayout class='monospaced'> |
812 | $ bitbake multiconfig:target1:<replaceable>target</replaceable> multiconfig:target2:<replaceable>target</replaceable> | 812 | $ bitbake mc::<replaceable>target</replaceable> mc:target1:<replaceable>target</replaceable> mc:target2:<replaceable>target</replaceable> |
813 | </literallayout> | 813 | </literallayout> |
814 | </para> | 814 | </para> |
815 | </section> | 815 | </section> |
@@ -837,13 +837,13 @@ | |||
837 | build, you must declare the dependencies in the recipe | 837 | build, you must declare the dependencies in the recipe |
838 | using the following statement form: | 838 | using the following statement form: |
839 | <literallayout class='monospaced'> | 839 | <literallayout class='monospaced'> |
840 | <replaceable>task_or_package</replaceable>[mcdepends] = "multiconfig:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" | 840 | <replaceable>task_or_package</replaceable>[mcdepends] = "mc:<replaceable>from_multiconfig</replaceable>:<replaceable>to_multiconfig</replaceable>:<replaceable>recipe_name</replaceable>:<replaceable>task_on_which_to_depend</replaceable>" |
841 | </literallayout> | 841 | </literallayout> |
842 | To better show how to use this statement, consider an | 842 | To better show how to use this statement, consider an |
843 | example with two multiconfigs: <filename>target1</filename> | 843 | example with two multiconfigs: <filename>target1</filename> |
844 | and <filename>target2</filename>: | 844 | and <filename>target2</filename>: |
845 | <literallayout class='monospaced'> | 845 | <literallayout class='monospaced'> |
846 | <replaceable>image_task</replaceable>[mcdepends] = "multiconfig:target1:target2:<replaceable>image2</replaceable>:<replaceable>rootfs_task</replaceable>" | 846 | <replaceable>image_task</replaceable>[mcdepends] = "mc:target1:target2:<replaceable>image2</replaceable>:<replaceable>rootfs_task</replaceable>" |
847 | </literallayout> | 847 | </literallayout> |
848 | In this example, the | 848 | In this example, the |
849 | <replaceable>from_multiconfig</replaceable> is "target1" and | 849 | <replaceable>from_multiconfig</replaceable> is "target1" and |
@@ -859,7 +859,7 @@ | |||
859 | Once you set up this dependency, you can build the | 859 | Once you set up this dependency, you can build the |
860 | "target1" multiconfig using a BitBake command as follows: | 860 | "target1" multiconfig using a BitBake command as follows: |
861 | <literallayout class='monospaced'> | 861 | <literallayout class='monospaced'> |
862 | $ bitbake multiconfig:target1:<replaceable>image1</replaceable> | 862 | $ bitbake mc:target1:<replaceable>image1</replaceable> |
863 | </literallayout> | 863 | </literallayout> |
864 | This command executes all the tasks needed to create | 864 | This command executes all the tasks needed to create |
865 | <replaceable>image1</replaceable> for the "target1" | 865 | <replaceable>image1</replaceable> for the "target1" |
@@ -875,7 +875,7 @@ | |||
875 | Consider this change to the statement in the | 875 | Consider this change to the statement in the |
876 | <replaceable>image1</replaceable> recipe: | 876 | <replaceable>image1</replaceable> recipe: |
877 | <literallayout class='monospaced'> | 877 | <literallayout class='monospaced'> |
878 | <replaceable>image_task</replaceable>[mcdepends] = "multiconfig:target1:target2:<replaceable>image2</replaceable>:<replaceable>image_task</replaceable>" | 878 | <replaceable>image_task</replaceable>[mcdepends] = "mc:target1:target2:<replaceable>image2</replaceable>:<replaceable>image_task</replaceable>" |
879 | </literallayout> | 879 | </literallayout> |
880 | In this case, BitBake must create | 880 | In this case, BitBake must create |
881 | <replaceable>image2</replaceable> for the "target2" | 881 | <replaceable>image2</replaceable> for the "target2" |