summaryrefslogtreecommitdiffstats
path: root/documentation/toaster-manual
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2021-03-22 17:10:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-23 22:54:55 +0000
commita306baf850a826c89c83e4cfcd4629421c56f73f (patch)
treee7163f3899e27b005a7a510c80450f38d13e4d7b /documentation/toaster-manual
parent5de939f61c3d753fa7170e6e71ed31e1fe328d9a (diff)
downloadpoky-a306baf850a826c89c83e4cfcd4629421c56f73f.tar.gz
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 <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/toaster-manual')
-rw-r--r--documentation/toaster-manual/reference.rst2
-rw-r--r--documentation/toaster-manual/setup-and-use.rst10
2 files changed, 6 insertions, 6 deletions
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:
554 554
555.. code-block:: shell 555.. code-block:: shell
556 556
557 $ cd ~/poky/build 557 $ cd poky/build
558 $ python ../bitbake/lib/toaster/manage.py buildslist 558 $ python ../bitbake/lib/toaster/manage.py buildslist
559 559
560If your Toaster database had only one build, the above 560If 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:
155 is the :term:`Build Directory`, 155 is the :term:`Build Directory`,
156 invoke the ``createsuperuser`` command from ``manage.py``:: 156 invoke the ``createsuperuser`` command from ``manage.py``::
157 157
158 $ cd ~/poky/build 158 $ cd poky/build
159 $ ../bitbake/lib/toaster/manage.py createsuperuser 159 $ ../bitbake/lib/toaster/manage.py createsuperuser
160 160
161#. Django prompts you for the username, which you need to provide. 161#. Django prompts you for the username, which you need to provide.
@@ -417,13 +417,13 @@ Perform the following steps to install Toaster:
417 417
418 [Unit] 418 [Unit]
419 Description=Toaster runbuilds 419 Description=Toaster runbuilds
420 420
421 [Service] 421 [Service]
422 Type=forking User=toaster 422 Type=forking User=toaster
423 ExecStart=/usr/bin/screen -d -m -S runbuilds /var/www/toaster/poky/bitbake/lib/toaster/runbuilds-service.sh start 423 ExecStart=/usr/bin/screen -d -m -S runbuilds /var/www/toaster/poky/bitbake/lib/toaster/runbuilds-service.sh start
424 ExecStop=/usr/bin/screen -S runbuilds -X quit 424 ExecStop=/usr/bin/screen -S runbuilds -X quit
425 WorkingDirectory=/var/www/toaster/poky 425 WorkingDirectory=/var/www/toaster/poky
426 426
427 [Install] 427 [Install]
428 WantedBy=multi-user.target 428 WantedBy=multi-user.target
429 429
@@ -433,11 +433,11 @@ Perform the following steps to install Toaster:
433 up executable permissions:: 433 up executable permissions::
434 434
435 #!/bin/bash 435 #!/bin/bash
436 436
437 #export http_proxy=http://proxy.host.com:8080 437 #export http_proxy=http://proxy.host.com:8080
438 #export https_proxy=http://proxy.host.com:8080 438 #export https_proxy=http://proxy.host.com:8080
439 #export GIT_PROXY_COMMAND=$HOME/bin/gitproxy 439 #export GIT_PROXY_COMMAND=$HOME/bin/gitproxy
440 cd ~/poky/ 440 cd poky/
441 source ./oe-init-build-env build 441 source ./oe-init-build-env build
442 source ../bitbake/bin/toaster $1 noweb 442 source ../bitbake/bin/toaster $1 noweb
443 [ "$1" == 'start' ] && /bin/bash 443 [ "$1" == 'start' ] && /bin/bash