diff options
-rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 27 | ||||
-rw-r--r-- | documentation/poky-ref-manual/ref-variables.xml | 20 |
2 files changed, 9 insertions, 38 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 8fc0d06830..e32be4ed9f 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml | |||
@@ -1862,36 +1862,9 @@ directory.</para></listitem> | |||
1862 | This command spawns a terminal with a shell prompt within the OpenEmbedded build environment. | 1862 | This command spawns a terminal with a shell prompt within the OpenEmbedded build environment. |
1863 | The <ulink url='&YOCTO_DOCS_REF_URL;#var-OE_TERMINAL'><filename>OE_TERMINAL</filename></ulink> | 1863 | The <ulink url='&YOCTO_DOCS_REF_URL;#var-OE_TERMINAL'><filename>OE_TERMINAL</filename></ulink> |
1864 | controls what type of shell is opened. | 1864 | controls what type of shell is opened. |
1865 | You can define the variable in the <filename>conf/local.conf</filename> | ||
1866 | configuration file in the <link linkend='build-directory'>Build Directory</link>. | ||
1867 | </para> | 1865 | </para> |
1868 | 1866 | ||
1869 | <para> | 1867 | <para> |
1870 | Current available terminals are: | ||
1871 | <literallayout class='monospaced'> | ||
1872 | auto | ||
1873 | gnome | ||
1874 | xfce | ||
1875 | rxvt | ||
1876 | screen | ||
1877 | konsole (KDE 3.x only) | ||
1878 | none | ||
1879 | </literallayout> | ||
1880 | The default terminal type is "auto" and causes | ||
1881 | the OpenEmbedded build system to attempt to spawn terminals in a | ||
1882 | priority order until one is found that is available on the host | ||
1883 | development system. | ||
1884 | For the case of an X terminal, <filename>DISPLAY</filename> must also | ||
1885 | be defined. | ||
1886 | </para> | ||
1887 | |||
1888 | <para> | ||
1889 | If <filename>OE_TERMINAL</filename> is set to "none", the system | ||
1890 | never spawns a terminal under any circumstances. | ||
1891 | Use this setting when you are doing automated builds. | ||
1892 | </para> | ||
1893 | |||
1894 | <para> | ||
1895 | For spawned terminals, the following occurs: | 1868 | For spawned terminals, the following occurs: |
1896 | <itemizedlist> | 1869 | <itemizedlist> |
1897 | <listitem><para>The <filename>PATH</filename> variable includes the | 1870 | <listitem><para>The <filename>PATH</filename> variable includes the |
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml index 289057eaa3..39b74bcba0 100644 --- a/documentation/poky-ref-manual/ref-variables.xml +++ b/documentation/poky-ref-manual/ref-variables.xml | |||
@@ -1948,20 +1948,18 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
1948 | <glossentry id='var-OE_TERMINAL'><glossterm>OE_TERMINAL</glossterm> | 1948 | <glossentry id='var-OE_TERMINAL'><glossterm>OE_TERMINAL</glossterm> |
1949 | <glossdef> | 1949 | <glossdef> |
1950 | <para> | 1950 | <para> |
1951 | Controls how the OpenEmbedded build system spawns terminals | 1951 | Controls how the OpenEmbedded build system spawns |
1952 | on the host development system. | 1952 | interactive terminals on the host development system |
1953 | Because the build system needs to account for parallelism | 1953 | (e.g. using the BitBake command with the |
1954 | during the build, concurrently running processes might require | 1954 | <filename>-c devshell</filename> command-line option). |
1955 | attention (e.g. build cannot resove a patch). | 1955 | For more information, see the |
1956 | For such a case, the host system needs to spawn and launch | 1956 | "<ulink url='&YOCTO_DOCS_DEV_URL;#platdev-appdev-devshell'>Using a Development Shell</ulink>" section |
1957 | an interactive shell. | 1957 | in the Yocto Project Development Manual. |
1958 | </para> | 1958 | </para> |
1959 | 1959 | ||
1960 | <para> | 1960 | <para> |
1961 | You can use the following values for the | 1961 | You can use the following values for the |
1962 | <filename>OE_TERMINAL</filename> variable in the | 1962 | <filename>OE_TERMINAL</filename> variable: |
1963 | <filename>conf/local.conf</filename> configuration file, which is found in | ||
1964 | the <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>: | ||
1965 | <literallayout class='monospaced'> | 1963 | <literallayout class='monospaced'> |
1966 | auto | 1964 | auto |
1967 | gnome | 1965 | gnome |
@@ -1972,7 +1970,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
1972 | none | 1970 | none |
1973 | </literallayout> | 1971 | </literallayout> |
1974 | <note>Konsole support only works for KDE 3.x. | 1972 | <note>Konsole support only works for KDE 3.x. |
1975 | Also, "none" is the default behavior for | 1973 | Also, "auto" is the default behavior for |
1976 | <filename>OE_TERMINAL</filename></note> | 1974 | <filename>OE_TERMINAL</filename></note> |
1977 | </para> | 1975 | </para> |
1978 | </glossdef> | 1976 | </glossdef> |