diff options
-rw-r--r-- | documentation/README | 2 | ||||
-rw-r--r-- | documentation/brief-yoctoprojectqs/index.rst | 8 | ||||
-rw-r--r-- | documentation/dev-manual/common-tasks.rst | 20 | ||||
-rw-r--r-- | documentation/dev-manual/qemu.rst | 4 | ||||
-rw-r--r-- | documentation/dev-manual/start.rst | 2 | ||||
-rw-r--r-- | documentation/kernel-dev/common.rst | 47 | ||||
-rw-r--r-- | documentation/ref-manual/terms.rst | 11 | ||||
-rw-r--r-- | documentation/sdk-manual/appendix-obtain.rst | 4 | ||||
-rw-r--r-- | documentation/sdk-manual/extensible.rst | 2 | ||||
-rw-r--r-- | documentation/toaster-manual/reference.rst | 2 | ||||
-rw-r--r-- | documentation/toaster-manual/setup-and-use.rst | 10 |
11 files changed, 54 insertions, 58 deletions
diff --git a/documentation/README b/documentation/README index be03bb119a..15623ce6c1 100644 --- a/documentation/README +++ b/documentation/README | |||
@@ -222,7 +222,7 @@ For example, the following .rst content will produce the 'expected' | |||
222 | content: | 222 | content: |
223 | 223 | ||
224 | .. code-block:: | 224 | .. code-block:: |
225 | $ mkdir ~/poky-&DISTRO; | 225 | $ mkdir poky-&DISTRO; |
226 | or | 226 | or |
227 | $ git clone &YOCTO_GIT_URL;/git/poky -b &DISTRO_NAME_NO_CAP; | 227 | $ git clone &YOCTO_GIT_URL;/git/poky -b &DISTRO_NAME_NO_CAP; |
228 | 228 | ||
diff --git a/documentation/brief-yoctoprojectqs/index.rst b/documentation/brief-yoctoprojectqs/index.rst index 63083cb13d..11c67bc351 100644 --- a/documentation/brief-yoctoprojectqs/index.rst +++ b/documentation/brief-yoctoprojectqs/index.rst | |||
@@ -176,7 +176,7 @@ an entire Linux distribution, including the toolchain, from source. | |||
176 | 176 | ||
177 | .. code-block:: shell | 177 | .. code-block:: shell |
178 | 178 | ||
179 | $ cd ~/poky | 179 | $ cd poky |
180 | $ source oe-init-build-env | 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 |
@@ -293,7 +293,7 @@ Follow these steps to add a hardware layer: | |||
293 | 293 | ||
294 | .. code-block:: shell | 294 | .. code-block:: shell |
295 | 295 | ||
296 | $ cd ~/poky | 296 | $ cd poky |
297 | $ git clone https://github.com/kraj/meta-altera.git | 297 | $ git clone https://github.com/kraj/meta-altera.git |
298 | Cloning into 'meta-altera'... | 298 | Cloning into 'meta-altera'... |
299 | remote: Counting objects: 25170, done. | 299 | remote: Counting objects: 25170, done. |
@@ -337,7 +337,7 @@ Follow these steps to add a hardware layer: | |||
337 | 337 | ||
338 | .. code-block:: shell | 338 | .. code-block:: shell |
339 | 339 | ||
340 | $ cd ~/poky/build | 340 | $ cd poky/build |
341 | $ bitbake-layers add-layer ../meta-altera | 341 | $ bitbake-layers add-layer ../meta-altera |
342 | NOTE: Starting bitbake server... | 342 | NOTE: Starting bitbake server... |
343 | Parsing recipes: 100% |##################################################################| Time: 0:00:32 | 343 | Parsing recipes: 100% |##################################################################| Time: 0:00:32 |
@@ -374,7 +374,7 @@ The following commands run the tool to create a layer named | |||
374 | 374 | ||
375 | .. code-block:: shell | 375 | .. code-block:: shell |
376 | 376 | ||
377 | $ cd ~/poky | 377 | $ cd poky |
378 | $ bitbake-layers create-layer meta-mylayer | 378 | $ bitbake-layers create-layer meta-mylayer |
379 | NOTE: Starting bitbake server... | 379 | NOTE: Starting bitbake server... |
380 | Add your new layer with 'bitbake-layers add-layer meta-mylayer' | 380 | Add your new layer with 'bitbake-layers add-layer meta-mylayer' |
diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst index b7b59c1727..820b8314d1 100644 --- a/documentation/dev-manual/common-tasks.rst +++ b/documentation/dev-manual/common-tasks.rst | |||
@@ -3007,7 +3007,7 @@ The following steps describe how to set up the AUH utility: | |||
3007 | running the AUH utility: | 3007 | running the AUH utility: |
3008 | :: | 3008 | :: |
3009 | 3009 | ||
3010 | $ cd ~/poky | 3010 | $ cd poky |
3011 | $ source oe-init-build-env your_AUH_build_directory | 3011 | $ source oe-init-build-env your_AUH_build_directory |
3012 | 3012 | ||
3013 | Re-using an existing build directory and its configurations is not | 3013 | Re-using an existing build directory and its configurations is not |
@@ -5956,8 +5956,8 @@ the existing kernel, and then inserts a new kernel: | |||
5956 | kernel: | 5956 | kernel: |
5957 | :: | 5957 | :: |
5958 | 5958 | ||
5959 | $ wic cp ~/poky_sdk/tmp/work/qemux86-poky-linux/linux-yocto/4.12.12+git999-r0/linux-yocto-4.12.12+git999/arch/x86/boot/bzImage \ | 5959 | $ wic cp poky_sdk/tmp/work/qemux86-poky-linux/linux-yocto/4.12.12+git999-r0/linux-yocto-4.12.12+git999/arch/x86/boot/bzImage \ |
5960 | ~/poky/build/tmp/deploy/images/qemux86/core-image-minimal-qemux86.wic:1/vmlinuz | 5960 | poky/build/tmp/deploy/images/qemux86/core-image-minimal-qemux86.wic:1/vmlinuz |
5961 | 5961 | ||
5962 | Once the new kernel is added back into the image, you can use the | 5962 | Once the new kernel is added back into the image, you can use the |
5963 | ``dd`` command or :ref:`bmaptool | 5963 | ``dd`` command or :ref:`bmaptool |
@@ -6956,7 +6956,7 @@ variable to specify the format: | |||
6956 | 6956 | ||
6957 | 1. Open the ``local.conf`` file inside your | 6957 | 1. Open the ``local.conf`` file inside your |
6958 | :term:`Build Directory` (e.g. | 6958 | :term:`Build Directory` (e.g. |
6959 | ``~/poky/build/conf/local.conf``). | 6959 | ``poky/build/conf/local.conf``). |
6960 | 6960 | ||
6961 | 2. Select the desired package format as follows: | 6961 | 2. Select the desired package format as follows: |
6962 | :: | 6962 | :: |
@@ -7048,11 +7048,11 @@ From within the build directory where you have built an image based on | |||
7048 | your packaging choice (i.e. the | 7048 | your packaging choice (i.e. the |
7049 | :term:`PACKAGE_CLASSES` | 7049 | :term:`PACKAGE_CLASSES` |
7050 | setting), simply start the server. The following example assumes a build | 7050 | setting), simply start the server. The following example assumes a build |
7051 | directory of ``~/poky/build/tmp/deploy/rpm`` and a ``PACKAGE_CLASSES`` | 7051 | directory of ``poky/build/tmp/deploy/rpm`` and a ``PACKAGE_CLASSES`` |
7052 | setting of "package_rpm": | 7052 | setting of "package_rpm": |
7053 | :: | 7053 | :: |
7054 | 7054 | ||
7055 | $ cd ~/poky/build/tmp/deploy/rpm | 7055 | $ cd poky/build/tmp/deploy/rpm |
7056 | $ python3 -m http.server | 7056 | $ python3 -m http.server |
7057 | 7057 | ||
7058 | Target Setup | 7058 | Target Setup |
@@ -8409,7 +8409,7 @@ that queries the Git repository and prints just the differences that | |||
8409 | might be significant in human-readable form. Here is an example: | 8409 | might be significant in human-readable form. Here is an example: |
8410 | :: | 8410 | :: |
8411 | 8411 | ||
8412 | $ ~/poky/poky/scripts/buildhistory-diff . HEAD^ | 8412 | $ poky/poky/scripts/buildhistory-diff . HEAD^ |
8413 | Changes to images/qemux86_64/glibc/core-image-minimal (files-in-image.txt): | 8413 | Changes to images/qemux86_64/glibc/core-image-minimal (files-in-image.txt): |
8414 | /etc/anotherpkg.conf was added | 8414 | /etc/anotherpkg.conf was added |
8415 | /sbin/anotherpkg was added | 8415 | /sbin/anotherpkg was added |
@@ -10738,7 +10738,7 @@ been followed: | |||
10738 | are ``create-pull-request`` and ``send-pull-request``. You can find | 10738 | are ``create-pull-request`` and ``send-pull-request``. You can find |
10739 | these scripts in the ``scripts`` directory within the | 10739 | these scripts in the ``scripts`` directory within the |
10740 | :term:`Source Directory` (e.g. | 10740 | :term:`Source Directory` (e.g. |
10741 | ``~/poky/scripts``). | 10741 | ``poky/scripts``). |
10742 | 10742 | ||
10743 | Using these scripts correctly formats the requests without | 10743 | Using these scripts correctly formats the requests without |
10744 | introducing any whitespace or HTML formatting. The maintainer that | 10744 | introducing any whitespace or HTML formatting. The maintainer that |
@@ -10752,7 +10752,7 @@ been followed: | |||
10752 | line in the created patch files: | 10752 | line in the created patch files: |
10753 | :: | 10753 | :: |
10754 | 10754 | ||
10755 | $ ~/poky/scripts/create-pull-request -u meta-intel-contrib -s "Updated Manual Section Reference in README" | 10755 | $ poky/scripts/create-pull-request -u meta-intel-contrib -s "Updated Manual Section Reference in README" |
10756 | 10756 | ||
10757 | Running this script forms ``*.patch`` files in a folder named | 10757 | Running this script forms ``*.patch`` files in a folder named |
10758 | ``pull-``\ `PID` in the current directory. One of the patch files is a | 10758 | ``pull-``\ `PID` in the current directory. One of the patch files is a |
@@ -10766,7 +10766,7 @@ been followed: | |||
10766 | list: | 10766 | list: |
10767 | :: | 10767 | :: |
10768 | 10768 | ||
10769 | $ ~/poky/scripts/send-pull-request -p ~/meta-intel/pull-10565 -t meta-intel@yoctoproject.org | 10769 | $ poky/scripts/send-pull-request -p ~/meta-intel/pull-10565 -t meta-intel@yoctoproject.org |
10770 | 10770 | ||
10771 | You need to follow the prompts as the script is interactive. | 10771 | You need to follow the prompts as the script is interactive. |
10772 | 10772 | ||
diff --git a/documentation/dev-manual/qemu.rst b/documentation/dev-manual/qemu.rst index 766691b97b..c6bb9e9776 100644 --- a/documentation/dev-manual/qemu.rst +++ b/documentation/dev-manual/qemu.rst | |||
@@ -58,7 +58,7 @@ available. Follow these general steps to run QEMU: | |||
58 | environment script (i.e. :ref:`structure-core-script`): | 58 | environment script (i.e. :ref:`structure-core-script`): |
59 | :: | 59 | :: |
60 | 60 | ||
61 | $ cd ~/poky | 61 | $ cd poky |
62 | $ source oe-init-build-env | 62 | $ source oe-init-build-env |
63 | 63 | ||
64 | - If you installed a cross-toolchain, you can run the script that | 64 | - If you installed a cross-toolchain, you can run the script that |
@@ -66,7 +66,7 @@ available. Follow these general steps to run QEMU: | |||
66 | the initialization script from the default ``poky_sdk`` directory: | 66 | the initialization script from the default ``poky_sdk`` directory: |
67 | :: | 67 | :: |
68 | 68 | ||
69 | . ~/poky_sdk/environment-setup-core2-64-poky-linux | 69 | . poky_sdk/environment-setup-core2-64-poky-linux |
70 | 70 | ||
71 | 3. *Ensure the Artifacts are in Place:* You need to be sure you have a | 71 | 3. *Ensure the Artifacts are in Place:* You need to be sure you have a |
72 | pre-built kernel that will boot in QEMU. You also need the target | 72 | pre-built kernel that will boot in QEMU. You also need the target |
diff --git a/documentation/dev-manual/start.rst b/documentation/dev-manual/start.rst index 03061a79f3..efe369c751 100644 --- a/documentation/dev-manual/start.rst +++ b/documentation/dev-manual/start.rst | |||
@@ -768,7 +768,7 @@ Follow these steps to create a local version of the upstream | |||
768 | exists on your system and by default, it is checked out: | 768 | exists on your system and by default, it is checked out: |
769 | :: | 769 | :: |
770 | 770 | ||
771 | $ cd ~/poky | 771 | $ cd poky |
772 | $ git status | 772 | $ git status |
773 | On branch master | 773 | On branch master |
774 | Your branch is up-to-date with 'origin/master'. | 774 | Your branch is up-to-date with 'origin/master'. |
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst index 58adcc9b70..0e545d1b89 100644 --- a/documentation/kernel-dev/common.rst +++ b/documentation/kernel-dev/common.rst | |||
@@ -57,7 +57,7 @@ section: | |||
57 | the build environment script (i.e. :ref:`structure-core-script`): | 57 | the build environment script (i.e. :ref:`structure-core-script`): |
58 | :: | 58 | :: |
59 | 59 | ||
60 | $ cd ~/poky | 60 | $ cd poky |
61 | $ source oe-init-build-env | 61 | $ source oe-init-build-env |
62 | 62 | ||
63 | .. note:: | 63 | .. note:: |
@@ -74,7 +74,7 @@ section: | |||
74 | ``MACHINE`` variable appropriately in your ``conf/local.conf`` file | 74 | ``MACHINE`` variable appropriately in your ``conf/local.conf`` file |
75 | found in the | 75 | found in the |
76 | :term:`Build Directory` (i.e. | 76 | :term:`Build Directory` (i.e. |
77 | ``~/poky/build`` in this example). | 77 | ``poky/build`` in this example). |
78 | 78 | ||
79 | Also, since you are preparing to work on the kernel image, you need | 79 | Also, since you are preparing to work on the kernel image, you need |
80 | to set the | 80 | to set the |
@@ -94,7 +94,7 @@ section: | |||
94 | ``bitbake-layers create-layer`` command as follows: | 94 | ``bitbake-layers create-layer`` command as follows: |
95 | :: | 95 | :: |
96 | 96 | ||
97 | $ cd ~/poky/build | 97 | $ cd poky/build |
98 | $ bitbake-layers create-layer ../../meta-mylayer | 98 | $ bitbake-layers create-layer ../../meta-mylayer |
99 | NOTE: Starting bitbake server... | 99 | NOTE: Starting bitbake server... |
100 | Add your new layer with 'bitbake-layers add-layer ../../meta-mylayer' | 100 | Add your new layer with 'bitbake-layers add-layer ../../meta-mylayer' |
@@ -119,7 +119,7 @@ section: | |||
119 | ``bblayers.conf`` file as follows: | 119 | ``bblayers.conf`` file as follows: |
120 | :: | 120 | :: |
121 | 121 | ||
122 | $ cd ~/poky/build | 122 | $ cd poky/build |
123 | $ bitbake-layers add-layer ../../meta-mylayer | 123 | $ bitbake-layers add-layer ../../meta-mylayer |
124 | NOTE: Starting bitbake server... | 124 | NOTE: Starting bitbake server... |
125 | $ | 125 | $ |
@@ -128,7 +128,7 @@ section: | |||
128 | specifically for use with images to be run using QEMU: | 128 | specifically for use with images to be run using QEMU: |
129 | :: | 129 | :: |
130 | 130 | ||
131 | $ cd ~/poky/build | 131 | $ cd poky/build |
132 | $ bitbake core-image-minimal -c populate_sdk_ext | 132 | $ bitbake core-image-minimal -c populate_sdk_ext |
133 | 133 | ||
134 | Once | 134 | Once |
@@ -136,21 +136,21 @@ section: | |||
136 | ``*.sh`` file) in the following directory: | 136 | ``*.sh`` file) in the following directory: |
137 | :: | 137 | :: |
138 | 138 | ||
139 | ~/poky/build/tmp/deploy/sdk | 139 | poky/build/tmp/deploy/sdk |
140 | 140 | ||
141 | For this example, the installer file is named | 141 | For this example, the installer file is named |
142 | ``poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-&DISTRO;.sh``. | 142 | ``poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-&DISTRO;.sh``. |
143 | 143 | ||
144 | 6. *Install the Extensible SDK:* Use the following command to install | 144 | 6. *Install the Extensible SDK:* Use the following command to install |
145 | the SDK. For this example, install the SDK in the default | 145 | the SDK. For this example, install the SDK in the default |
146 | ``~/poky_sdk`` directory: | 146 | ``poky_sdk`` directory: |
147 | :: | 147 | :: |
148 | 148 | ||
149 | $ cd ~/poky/build/tmp/deploy/sdk | 149 | $ cd poky/build/tmp/deploy/sdk |
150 | $ ./poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-&DISTRO;.sh | 150 | $ ./poky-glibc-x86_64-core-image-minimal-i586-toolchain-ext-&DISTRO;.sh |
151 | Poky (Yocto Project Reference Distro) Extensible SDK installer version &DISTRO; | 151 | Poky (Yocto Project Reference Distro) Extensible SDK installer version &DISTRO; |
152 | ============================================================================ | 152 | ============================================================================ |
153 | Enter target directory for SDK (default: ~/poky_sdk): | 153 | Enter target directory for SDK (default: poky_sdk): |
154 | You are about to install the SDK to "/home/scottrif/poky_sdk". Proceed [Y/n]? Y | 154 | You are about to install the SDK to "/home/scottrif/poky_sdk". Proceed [Y/n]? Y |
155 | Extracting SDK......................................done | 155 | Extracting SDK......................................done |
156 | Setting it up... | 156 | Setting it up... |
@@ -175,7 +175,7 @@ section: | |||
175 | directed by the output from installing the SDK: | 175 | directed by the output from installing the SDK: |
176 | :: | 176 | :: |
177 | 177 | ||
178 | $ source ~/poky_sdk/environment-setup-i586-poky-linux | 178 | $ source poky_sdk/environment-setup-i586-poky-linux |
179 | "SDK environment now set up; additionally you may now run devtool to perform development tasks. | 179 | "SDK environment now set up; additionally you may now run devtool to perform development tasks. |
180 | Run devtool --help for further details. | 180 | Run devtool --help for further details. |
181 | 181 | ||
@@ -240,7 +240,7 @@ section: | |||
240 | section in the Yocto Project Development Tasks Manual. | 240 | section in the Yocto Project Development Tasks Manual. |
241 | :: | 241 | :: |
242 | 242 | ||
243 | $ cd ~/poky | 243 | $ cd poky |
244 | $ git branch | 244 | $ git branch |
245 | master | 245 | master |
246 | * &DISTRO_NAME_NO_CAP; | 246 | * &DISTRO_NAME_NO_CAP; |
@@ -260,7 +260,7 @@ section: | |||
260 | ``MACHINE`` variable appropriately in your ``conf/local.conf`` file | 260 | ``MACHINE`` variable appropriately in your ``conf/local.conf`` file |
261 | found in the | 261 | found in the |
262 | :term:`Build Directory` (i.e. | 262 | :term:`Build Directory` (i.e. |
263 | ``~/poky/build`` in this example). | 263 | ``poky/build`` in this example). |
264 | 264 | ||
265 | Also, since you are preparing to work on the kernel image, you need | 265 | Also, since you are preparing to work on the kernel image, you need |
266 | to set the | 266 | to set the |
@@ -280,7 +280,7 @@ section: | |||
280 | ``bitbake-layers create-layer`` command as follows: | 280 | ``bitbake-layers create-layer`` command as follows: |
281 | :: | 281 | :: |
282 | 282 | ||
283 | $ cd ~/poky/build | 283 | $ cd poky/build |
284 | $ bitbake-layers create-layer ../../meta-mylayer | 284 | $ bitbake-layers create-layer ../../meta-mylayer |
285 | NOTE: Starting bitbake server... | 285 | NOTE: Starting bitbake server... |
286 | Add your new layer with 'bitbake-layers add-layer ../../meta-mylayer' | 286 | Add your new layer with 'bitbake-layers add-layer ../../meta-mylayer' |
@@ -304,7 +304,7 @@ section: | |||
304 | ``bblayers.conf`` file as follows: | 304 | ``bblayers.conf`` file as follows: |
305 | :: | 305 | :: |
306 | 306 | ||
307 | $ cd ~/poky/build | 307 | $ cd poky/build |
308 | $ bitbake-layers add-layer ../../meta-mylayer | 308 | $ bitbake-layers add-layer ../../meta-mylayer |
309 | NOTE: Starting bitbake server ... | 309 | NOTE: Starting bitbake server ... |
310 | $ | 310 | $ |
@@ -398,7 +398,6 @@ home directory: | |||
398 | 1. *Create Structure*: Create the layer's structure: | 398 | 1. *Create Structure*: Create the layer's structure: |
399 | :: | 399 | :: |
400 | 400 | ||
401 | $ cd $HOME | ||
402 | $ mkdir meta-mylayer | 401 | $ mkdir meta-mylayer |
403 | $ mkdir meta-mylayer/conf | 402 | $ mkdir meta-mylayer/conf |
404 | $ mkdir meta-mylayer/recipes-kernel | 403 | $ mkdir meta-mylayer/recipes-kernel |
@@ -819,12 +818,12 @@ the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Se | |||
819 | 818 | ||
820 | 1. *Change the working directory*: In the previous step, the output | 819 | 1. *Change the working directory*: In the previous step, the output |
821 | noted where you can find the source files (e.g. | 820 | noted where you can find the source files (e.g. |
822 | ``~/poky_sdk/workspace/sources/linux-yocto``). Change to where the | 821 | ``poky_sdk/workspace/sources/linux-yocto``). Change to where the |
823 | kernel source code is before making your edits to the | 822 | kernel source code is before making your edits to the |
824 | ``calibrate.c`` file: | 823 | ``calibrate.c`` file: |
825 | :: | 824 | :: |
826 | 825 | ||
827 | $ cd ~/poky_sdk/workspace/sources/linux-yocto | 826 | $ cd poky_sdk/workspace/sources/linux-yocto |
828 | 827 | ||
829 | 2. *Edit the source file*: Edit the ``init/calibrate.c`` file to have | 828 | 2. *Edit the source file*: Edit the ``init/calibrate.c`` file to have |
830 | the following changes: | 829 | the following changes: |
@@ -896,7 +895,7 @@ the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Se | |||
896 | and use these Git commands to stage and commit your changes: | 895 | and use these Git commands to stage and commit your changes: |
897 | :: | 896 | :: |
898 | 897 | ||
899 | $ cd ~/poky_sdk/workspace/sources/linux-yocto | 898 | $ cd poky_sdk/workspace/sources/linux-yocto |
900 | $ git status | 899 | $ git status |
901 | $ git add init/calibrate.c | 900 | $ git add init/calibrate.c |
902 | $ git commit -m "calibrate: Add printk example" | 901 | $ git commit -m "calibrate: Add printk example" |
@@ -926,7 +925,7 @@ the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Se | |||
926 | set up to run BitBake: | 925 | set up to run BitBake: |
927 | :: | 926 | :: |
928 | 927 | ||
929 | $ cd ~/poky/build | 928 | $ cd poky/build |
930 | $ bitbake core-image-minimal | 929 | $ bitbake core-image-minimal |
931 | 930 | ||
932 | Using Traditional Kernel Development to Patch the Kernel | 931 | Using Traditional Kernel Development to Patch the Kernel |
@@ -1015,7 +1014,7 @@ Section. | |||
1015 | to the following to your ``local.conf``: | 1014 | to the following to your ``local.conf``: |
1016 | :: | 1015 | :: |
1017 | 1016 | ||
1018 | $ cd ~/poky/build/conf | 1017 | $ cd poky/build/conf |
1019 | 1018 | ||
1020 | Add the following to the ``local.conf``: | 1019 | Add the following to the ``local.conf``: |
1021 | :: | 1020 | :: |
@@ -1037,7 +1036,7 @@ Section. | |||
1037 | you can now use BitBake to build the image: | 1036 | you can now use BitBake to build the image: |
1038 | :: | 1037 | :: |
1039 | 1038 | ||
1040 | $ cd ~/poky/build | 1039 | $ cd poky/build |
1041 | $ bitbake core-image-minimal | 1040 | $ bitbake core-image-minimal |
1042 | 1041 | ||
1043 | 5. *Boot the image*: Boot the modified image in the QEMU emulator using | 1042 | 5. *Boot the image*: Boot the modified image in the QEMU emulator using |
@@ -1045,7 +1044,7 @@ Section. | |||
1045 | with no password: | 1044 | with no password: |
1046 | :: | 1045 | :: |
1047 | 1046 | ||
1048 | $ cd ~/poky/build | 1047 | $ cd poky/build |
1049 | $ runqemu qemux86 | 1048 | $ runqemu qemux86 |
1050 | 1049 | ||
1051 | 6. *Look for Your Changes:* As QEMU booted, you might have seen your | 1050 | 6. *Look for Your Changes:* As QEMU booted, you might have seen your |
@@ -1119,7 +1118,7 @@ Section. | |||
1119 | the following sequence of commands: | 1118 | the following sequence of commands: |
1120 | :: | 1119 | :: |
1121 | 1120 | ||
1122 | $ cd ~/poky/build | 1121 | $ cd poky/build |
1123 | $ bitbake -c cleanall yocto-linux | 1122 | $ bitbake -c cleanall yocto-linux |
1124 | $ bitbake core-image-minimal -c cleanall | 1123 | $ bitbake core-image-minimal -c cleanall |
1125 | $ bitbake core-image-minimal | 1124 | $ bitbake core-image-minimal |
@@ -1172,7 +1171,7 @@ environment, you must do the following: | |||
1172 | The following commands initialize the BitBake environment, run the | 1171 | The following commands initialize the BitBake environment, run the |
1173 | :ref:`ref-tasks-kernel_configme` | 1172 | :ref:`ref-tasks-kernel_configme` |
1174 | task, and launch ``menuconfig``. These commands assume the Source | 1173 | task, and launch ``menuconfig``. These commands assume the Source |
1175 | Directory's top-level folder is ``~/poky``: | 1174 | Directory's top-level folder is ``poky``: |
1176 | :: | 1175 | :: |
1177 | 1176 | ||
1178 | $ cd poky | 1177 | $ cd poky |
diff --git a/documentation/ref-manual/terms.rst b/documentation/ref-manual/terms.rst index bf46148876..32bb75b271 100644 --- a/documentation/ref-manual/terms.rst +++ b/documentation/ref-manual/terms.rst | |||
@@ -28,7 +28,7 @@ universal, the list includes them just in case: | |||
28 | to allow for matching recipe names. For example, suppose you have an | 28 | to allow for matching recipe names. For example, suppose you have an |
29 | append file named as follows: | 29 | append file named as follows: |
30 | :: | 30 | :: |
31 | 31 | ||
32 | busybox_1.21.%.bbappend | 32 | busybox_1.21.%.bbappend |
33 | 33 | ||
34 | That append file | 34 | That append file |
@@ -76,7 +76,7 @@ universal, the list includes them just in case: | |||
76 | 76 | ||
77 | .. code-block:: shell | 77 | .. code-block:: shell |
78 | 78 | ||
79 | $ cd $HOME/poky | 79 | $ cd poky |
80 | $ source oe-init-build-env | 80 | $ source oe-init-build-env |
81 | 81 | ||
82 | - Create the Build Directory inside your home directory and | 82 | - Create the Build Directory inside your home directory and |
@@ -84,19 +84,16 @@ universal, the list includes them just in case: | |||
84 | 84 | ||
85 | .. code-block:: shell | 85 | .. code-block:: shell |
86 | 86 | ||
87 | $ cd $HOME | ||
88 | $ source poky/oe-init-build-env test-builds | 87 | $ source poky/oe-init-build-env test-builds |
89 | 88 | ||
90 | - Provide a directory path and specifically name the Build | 89 | - Provide a directory path and specifically name the Build |
91 | Directory. Any intermediate folders in the pathname must exist. | 90 | Directory. Any intermediate folders in the pathname must exist. |
92 | This next example creates a Build Directory named | 91 | This next example creates a Build Directory named |
93 | ``YP-&POKYVERSION;`` in your home directory within the existing | 92 | ``YP-&POKYVERSION;`` within the existing directory ``mybuilds``: |
94 | directory ``mybuilds``: | ||
95 | 93 | ||
96 | .. code-block:: shell | 94 | .. code-block:: shell |
97 | 95 | ||
98 | $ cd $HOME | 96 | $ source poky/oe-init-build-env mybuilds/YP-&POKYVERSION; |
99 | $ source $HOME/poky/oe-init-build-env $HOME/mybuilds/YP-&POKYVERSION; | ||
100 | 97 | ||
101 | .. note:: | 98 | .. note:: |
102 | 99 | ||
diff --git a/documentation/sdk-manual/appendix-obtain.rst b/documentation/sdk-manual/appendix-obtain.rst index f158c244ab..395102c3bd 100644 --- a/documentation/sdk-manual/appendix-obtain.rst +++ b/documentation/sdk-manual/appendix-obtain.rst | |||
@@ -173,7 +173,7 @@ build the SDK installer. Follow these steps: | |||
173 | ``tmp/deploy/sdk`` in the Build Directory. Following is an example: | 173 | ``tmp/deploy/sdk`` in the Build Directory. Following is an example: |
174 | :: | 174 | :: |
175 | 175 | ||
176 | $ cd ~/poky/build/tmp/deploy/sdk | 176 | $ cd poky/build/tmp/deploy/sdk |
177 | $ ./poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-&DISTRO;.sh | 177 | $ ./poky-glibc-x86_64-core-image-sato-core2-64-toolchain-ext-&DISTRO;.sh |
178 | 178 | ||
179 | During execution of the script, you choose the root location for the | 179 | During execution of the script, you choose the root location for the |
@@ -249,7 +249,7 @@ Follow these steps to extract the root filesystem: | |||
249 | ":ref:`sdk-manual/appendix-obtain:locating pre-built sdk installers`" section: | 249 | ":ref:`sdk-manual/appendix-obtain:locating pre-built sdk installers`" section: |
250 | :: | 250 | :: |
251 | 251 | ||
252 | $ source ~/poky_sdk/environment-setup-core2-64-poky-linux | 252 | $ source poky_sdk/environment-setup-core2-64-poky-linux |
253 | 253 | ||
254 | 3. *Extract the Root Filesystem:* Use the ``runqemu-extract-sdk`` | 254 | 3. *Extract the Root Filesystem:* Use the ``runqemu-extract-sdk`` |
255 | command and provide the root filesystem image. | 255 | command and provide the root filesystem image. |
diff --git a/documentation/sdk-manual/extensible.rst b/documentation/sdk-manual/extensible.rst index 5962e9460a..d2ed9a9b83 100644 --- a/documentation/sdk-manual/extensible.rst +++ b/documentation/sdk-manual/extensible.rst | |||
@@ -118,7 +118,7 @@ architecture. The example assumes the SDK installer is located in | |||
118 | $ ./Downloads/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-ext-2.5.sh | 118 | $ ./Downloads/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-ext-2.5.sh |
119 | Poky (Yocto Project Reference Distro) Extensible SDK installer version 2.5 | 119 | Poky (Yocto Project Reference Distro) Extensible SDK installer version 2.5 |
120 | ========================================================================== | 120 | ========================================================================== |
121 | Enter target directory for SDK (default: ~/poky_sdk): | 121 | Enter target directory for SDK (default: poky_sdk): |
122 | You are about to install the SDK to "/home/scottrif/poky_sdk". Proceed [Y/n]? Y | 122 | You are about to install the SDK to "/home/scottrif/poky_sdk". Proceed [Y/n]? Y |
123 | Extracting SDK..............done | 123 | Extracting SDK..............done |
124 | Setting it up... | 124 | Setting it up... |
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 | ||
560 | If your Toaster database had only one build, the above | 560 | 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: | |||
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 |