From a306baf850a826c89c83e4cfcd4629421c56f73f Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Mon, 22 Mar 2021 17:10:57 +0100 Subject: Do not assume working from $HOME In the "Yocto Project Quick Build" instructions (https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html#) there is an inconsistency that impacts several documents... People are first instructed to clone the poky git repository, but not mentioning from which directory. Then, it's consistent to instruct people to run "cd poky/". However, later in the instructions, readers are instructed to run "cd ~/poky", which assumes that cloning poky was done from the home directory. Many other places in the documentation make such an assumption. This change fixes this, and makes no assumption on where people have chosen to store their data, in particular where they cloned the "poky" repository. This also fixes a few whitespace issues. (From yocto-docs rev: fd4e365c85df212d7ed70fc1abb3657a4a88b294) Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie --- documentation/toaster-manual/reference.rst | 2 +- documentation/toaster-manual/setup-and-use.rst | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'documentation/toaster-manual') diff --git a/documentation/toaster-manual/reference.rst b/documentation/toaster-manual/reference.rst index d2ab14c8e6..8ef58182e7 100644 --- a/documentation/toaster-manual/reference.rst +++ b/documentation/toaster-manual/reference.rst @@ -554,7 +554,7 @@ example that assumes default repository and build directory names: .. code-block:: shell - $ cd ~/poky/build + $ cd poky/build $ python ../bitbake/lib/toaster/manage.py buildslist If your Toaster database had only one build, the above diff --git a/documentation/toaster-manual/setup-and-use.rst b/documentation/toaster-manual/setup-and-use.rst index ded771e796..cabf0250c4 100644 --- a/documentation/toaster-manual/setup-and-use.rst +++ b/documentation/toaster-manual/setup-and-use.rst @@ -155,7 +155,7 @@ superuser by following these steps: is the :term:`Build Directory`, invoke the ``createsuperuser`` command from ``manage.py``:: - $ cd ~/poky/build + $ cd poky/build $ ../bitbake/lib/toaster/manage.py createsuperuser #. Django prompts you for the username, which you need to provide. @@ -417,13 +417,13 @@ Perform the following steps to install Toaster: [Unit] Description=Toaster runbuilds - + [Service] Type=forking User=toaster ExecStart=/usr/bin/screen -d -m -S runbuilds /var/www/toaster/poky/bitbake/lib/toaster/runbuilds-service.sh start ExecStop=/usr/bin/screen -S runbuilds -X quit WorkingDirectory=/var/www/toaster/poky - + [Install] WantedBy=multi-user.target @@ -433,11 +433,11 @@ Perform the following steps to install Toaster: up executable permissions:: #!/bin/bash - + #export http_proxy=http://proxy.host.com:8080 #export https_proxy=http://proxy.host.com:8080 #export GIT_PROXY_COMMAND=$HOME/bin/gitproxy - cd ~/poky/ + cd poky/ source ./oe-init-build-env build source ../bitbake/bin/toaster $1 noweb [ "$1" == 'start' ] && /bin/bash -- cgit v1.2.3-54-g00ecf