From 755ff8dcaaa5dfa9e512c977c969693fc38a44be Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 5 Oct 2020 20:37:24 +0200 Subject: 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 (From yocto-docs rev: 322b9a676b8897d93fe046b4c37a745d472cd4c6) Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie (cherry picked from commit 6fd4421283005b0ecc980e9ef25770d383b93937) Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie --- documentation/adt-manual/adt-prepare.rst | 2 +- documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.rst | 2 +- documentation/bsp-guide/bsp.rst | 2 +- documentation/poky.yaml | 1 - documentation/ref-manual/ref-structure.rst | 5 ++--- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'documentation') 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: configuration information. $ cd ~ $ git clone git://git.yoctoproject.org/poky $ cd poky $ git - checkout -b DISTRO_NAME origin/DISTRO_NAME $ source OE_INIT_FILE $ + checkout -b DISTRO_NAME origin/DISTRO_NAME $ source oe-init-build-env $ bitbake adt-installer 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. .. code-block:: shell $ cd ~/poky - $ source &OE_INIT_FILE; + $ source oe-init-build-env You had no conf/local.conf file. This configuration file has therefore been created for you with some default values. You may wish to edit it to, for 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. setup script to define the OpenEmbedded build environment on your build host. :: - $ source &OE_INIT_FILE; + $ source oe-init-build-env Among other things, the script creates the :term:`Build Directory`, which is ``build`` in this case and is located in the :term:`Source Directory`. After diff --git a/documentation/poky.yaml b/documentation/poky.yaml index e489101e75..6c8727e450 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 YOCTO_ADTPATH_DIR : "/opt/poky/&DISTRO;" YOCTO_POKY_TARBALL : "&YOCTO_POKY;.tar.bz2" OE_INIT_PATH : "&YOCTO_POKY;/oe-init-build-env" -OE_INIT_FILE : "oe-init-build-env" UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git-core diffstat unzip texinfo gcc-multilib \ build-essential chrpath socat cpio python3 python3-pip python3-pexpect \ 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 Directory named ``mybuilds/`` that is outside of the :term:`Source Directory`: :: - $ source OE_INIT_FILE ~/mybuilds + $ source oe-init-build-env ~/mybuilds The OpenEmbedded build system uses the template configuration files, which are found by default in the ``meta-poky/conf/`` directory in the Source @@ -200,8 +200,7 @@ information. .. note:: The OpenEmbedded build system does not support file or directory - names that contain spaces. If you attempt to run the - OE_INIT_FILE + names that contain spaces. If you attempt to run the ``oe-init-build-env`` script from a Source Directory that contains spaces in either the filenames or directory names, the script returns an error indicating no such file or directory. Be sure to use a Source Directory free of -- cgit v1.2.3-54-g00ecf