diff options
Diffstat (limited to 'documentation/ref-manual/migration-1.6.rst')
-rw-r--r-- | documentation/ref-manual/migration-1.6.rst | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/documentation/ref-manual/migration-1.6.rst b/documentation/ref-manual/migration-1.6.rst index b55be46e55..a6c4c8a93a 100644 --- a/documentation/ref-manual/migration-1.6.rst +++ b/documentation/ref-manual/migration-1.6.rst | |||
@@ -53,9 +53,12 @@ Matching Branch Requirement for Git Fetching | |||
53 | When fetching source from a Git repository using | 53 | When fetching source from a Git repository using |
54 | :term:`SRC_URI`, BitBake will now validate the | 54 | :term:`SRC_URI`, BitBake will now validate the |
55 | :term:`SRCREV` value against the branch. You can specify | 55 | :term:`SRCREV` value against the branch. You can specify |
56 | the branch using the following form: SRC_URI = | 56 | the branch using the following form: |
57 | "git://server.name/repository;branch=branchname" If you do not specify a | 57 | :: |
58 | branch, BitBake looks in the default "master" branch. | 58 | |
59 | SRC_URI = "git://server.name/repository;branch=branchname" | ||
60 | |||
61 | If you do not specify a branch, BitBake looks in the default "master" branch. | ||
59 | 62 | ||
60 | Alternatively, if you need to bypass this check (e.g. if you are | 63 | Alternatively, if you need to bypass this check (e.g. if you are |
61 | fetching a revision corresponding to a tag that is not on any branch), | 64 | fetching a revision corresponding to a tag that is not on any branch), |
@@ -123,8 +126,7 @@ Changes to Variables | |||
123 | -------------------- | 126 | -------------------- |
124 | 127 | ||
125 | The following variables have changed. For information on the | 128 | The following variables have changed. For information on the |
126 | OpenEmbedded build system variables, see the "`Variables | 129 | OpenEmbedded build system variables, see the ":doc:`ref-variables`" Chapter. |
127 | Glossary <#ref-variables-glos>`__" Chapter. | ||
128 | 130 | ||
129 | .. _migration-1.6-variable-changes-TMPDIR: | 131 | .. _migration-1.6-variable-changes-TMPDIR: |
130 | 132 | ||
@@ -254,11 +256,8 @@ default. The following additional lines are needed in your | |||
254 | 256 | ||
255 | .. note:: | 257 | .. note:: |
256 | 258 | ||
257 | The default | 259 | The default ``local.conf`` contains these statements. Consequently, if you |
258 | local.conf | 260 | are building a headless system and using a default ``local.conf`` |
259 | contains these statements. Consequently, if you are building a | ||
260 | headless system and using a default | ||
261 | local.conf | ||
262 | file, you will need comment these two lines out. | 261 | file, you will need comment these two lines out. |
263 | 262 | ||
264 | .. _migration-1.6-core-image-basic: | 263 | .. _migration-1.6-core-image-basic: |
@@ -412,6 +411,6 @@ The previous reference BSPs for the ``beagleboard`` and | |||
412 | ``routerstationpro`` machines are still available in a new | 411 | ``routerstationpro`` machines are still available in a new |
413 | ``meta-yocto-bsp-old`` layer in the | 412 | ``meta-yocto-bsp-old`` layer in the |
414 | :yocto_git:`Source Repositories <>` at | 413 | :yocto_git:`Source Repositories <>` at |
415 | http://git.yoctoproject.org/cgit/cgit.cgi/meta-yocto-bsp-old/. | 414 | :yocto_git:`/cgit/cgit.cgi/meta-yocto-bsp-old/`. |
416 | 415 | ||
417 | 416 | ||