diff options
author | Quentin Schulz <foss@0leil.net> | 2020-10-05 20:37:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-20 11:12:06 +0100 |
commit | 7db69417c182d3a59699671ee4d059f8d4faf356 (patch) | |
tree | c7fbb74c02be7f1a950e831e8db250b00d872c88 | |
parent | 8dd785f120ab73ec78ebcc4c8dd65141b7472885 (diff) | |
download | poky-7db69417c182d3a59699671ee4d059f8d4faf356.tar.gz |
docs: remove OE_INIT_FILE variable
There's probably no need for such a variable (the name of the script is
unlikely to change any time soon) and not all instances of
oe-init-build-env were actually using this variable.
For consistency sake, let's just remove the OE_INIT_FILE variable.
Suggested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
(From yocto-docs rev: 6fd4421283005b0ecc980e9ef25770d383b93937)
Signed-off-by: Quentin Schulz <foss@0leil.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/adt-manual/adt-prepare.rst | 2 | ||||
-rw-r--r-- | documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst | 2 | ||||
-rw-r--r-- | documentation/bsp-guide/bsp.rst | 2 | ||||
-rw-r--r-- | documentation/poky.yaml | 1 | ||||
-rw-r--r-- | documentation/ref-manual/ref-structure.rst | 5 |
5 files changed, 5 insertions, 7 deletions
diff --git a/documentation/adt-manual/adt-prepare.rst b/documentation/adt-manual/adt-prepare.rst index 5a85cbfe60..3e5c6ae94a 100644 --- a/documentation/adt-manual/adt-prepare.rst +++ b/documentation/adt-manual/adt-prepare.rst | |||
@@ -107,7 +107,7 @@ the tarball using either of these methods: | |||
107 | configuration information. | 107 | configuration information. |
108 | 108 | ||
109 | $ cd ~ $ git clone git://git.yoctoproject.org/poky $ cd poky $ git | 109 | $ cd ~ $ git clone git://git.yoctoproject.org/poky $ cd poky $ git |
110 | checkout -b DISTRO_NAME origin/DISTRO_NAME $ source OE_INIT_FILE $ | 110 | checkout -b DISTRO_NAME origin/DISTRO_NAME $ source oe-init-build-env $ |
111 | bitbake adt-installer | 111 | bitbake adt-installer |
112 | 112 | ||
113 | Configuring and Running the ADT Installer Script | 113 | Configuring and Running the ADT Installer Script |
diff --git a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst index 14a3e17510..c9622d3647 100644 --- a/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst +++ b/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst | |||
@@ -177,7 +177,7 @@ an entire Linux distribution, including the toolchain, from source. | |||
177 | .. code-block:: shell | 177 | .. code-block:: shell |
178 | 178 | ||
179 | $ cd ~/poky | 179 | $ cd ~/poky |
180 | $ source &OE_INIT_FILE; | 180 | $ source oe-init-build-env |
181 | You had no conf/local.conf file. This configuration file has therefore been | 181 | You had no conf/local.conf file. This configuration file has therefore been |
182 | created for you with some default values. You may wish to edit it to, for | 182 | created for you with some default values. You may wish to edit it to, for |
183 | example, select a different MACHINE (target hardware). See conf/local.conf | 183 | example, select a different MACHINE (target hardware). See conf/local.conf |
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst index 61b2958278..34206d1597 100644 --- a/documentation/bsp-guide/bsp.rst +++ b/documentation/bsp-guide/bsp.rst | |||
@@ -233,7 +233,7 @@ section. | |||
233 | setup script to define the OpenEmbedded build environment on your | 233 | setup script to define the OpenEmbedded build environment on your |
234 | build host. :: | 234 | build host. :: |
235 | 235 | ||
236 | $ source &OE_INIT_FILE; | 236 | $ source oe-init-build-env |
237 | 237 | ||
238 | Among other things, the script creates the :term:`Build Directory`, which is | 238 | Among other things, the script creates the :term:`Build Directory`, which is |
239 | ``build`` in this case and is located in the :term:`Source Directory`. After | 239 | ``build`` in this case and is located in the :term:`Source Directory`. After |
diff --git a/documentation/poky.yaml b/documentation/poky.yaml index ec21271a31..14f45055d7 100644 --- a/documentation/poky.yaml +++ b/documentation/poky.yaml | |||
@@ -58,7 +58,6 @@ YOCTO_DOCS_BRIEF_URL : "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/brief-yoctoprojectq | |||
58 | YOCTO_ADTPATH_DIR : "/opt/poky/&DISTRO;" | 58 | YOCTO_ADTPATH_DIR : "/opt/poky/&DISTRO;" |
59 | YOCTO_POKY_TARBALL : "&YOCTO_POKY;.tar.bz2" | 59 | YOCTO_POKY_TARBALL : "&YOCTO_POKY;.tar.bz2" |
60 | OE_INIT_PATH : "&YOCTO_POKY;/oe-init-build-env" | 60 | OE_INIT_PATH : "&YOCTO_POKY;/oe-init-build-env" |
61 | OE_INIT_FILE : "oe-init-build-env" | ||
62 | UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinfo gcc-multilib \ | 61 | UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinfo gcc-multilib \ |
63 | build-essential chrpath socat cpio python3 python3-pip python3-pexpect \ | 62 | build-essential chrpath socat cpio python3 python3-pip python3-pexpect \ |
64 | xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \ | 63 | xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \ |
diff --git a/documentation/ref-manual/ref-structure.rst b/documentation/ref-manual/ref-structure.rst index ff5d863736..db1ea97979 100644 --- a/documentation/ref-manual/ref-structure.rst +++ b/documentation/ref-manual/ref-structure.rst | |||
@@ -188,7 +188,7 @@ your choice. For example, the following command creates a Build | |||
188 | Directory named ``mybuilds/`` that is outside of the :term:`Source Directory`: | 188 | Directory named ``mybuilds/`` that is outside of the :term:`Source Directory`: |
189 | :: | 189 | :: |
190 | 190 | ||
191 | $ source OE_INIT_FILE ~/mybuilds | 191 | $ source oe-init-build-env ~/mybuilds |
192 | 192 | ||
193 | The OpenEmbedded build system uses the template configuration files, which | 193 | The OpenEmbedded build system uses the template configuration files, which |
194 | are found by default in the ``meta-poky/conf/`` directory in the Source | 194 | are found by default in the ``meta-poky/conf/`` directory in the Source |
@@ -200,8 +200,7 @@ information. | |||
200 | .. note:: | 200 | .. note:: |
201 | 201 | ||
202 | The OpenEmbedded build system does not support file or directory | 202 | The OpenEmbedded build system does not support file or directory |
203 | names that contain spaces. If you attempt to run the | 203 | names that contain spaces. If you attempt to run the ``oe-init-build-env`` |
204 | OE_INIT_FILE | ||
205 | script from a Source Directory that contains spaces in either the | 204 | script from a Source Directory that contains spaces in either the |
206 | filenames or directory names, the script returns an error indicating | 205 | filenames or directory names, the script returns an error indicating |
207 | no such file or directory. Be sure to use a Source Directory free of | 206 | no such file or directory. Be sure to use a Source Directory free of |