summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2021-03-25 20:27:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-06 22:29:49 +0100
commitae19be727a889aa961cfa8baeb5896675a7aa7ab (patch)
tree9a8e51cf36b2fbd1c149cc196cfc926b15e5b662 /documentation
parentbe976e3aa119d378010273ac8bb8134a4018ef43 (diff)
downloadpoky-ae19be727a889aa961cfa8baeb5896675a7aa7ab.tar.gz
Quick build: checkout a branch instead of a fixed tag
- Add guidelines for choosing a release - Check-out a branch instead of a fixed tag This way it's possible to pull release updates later (From yocto-docs rev: 00b45fcf7e37616b46ca003b49c83594c061c40b) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/brief-yoctoprojectqs/index.rst63
1 files changed, 39 insertions, 24 deletions
diff --git a/documentation/brief-yoctoprojectqs/index.rst b/documentation/brief-yoctoprojectqs/index.rst
index f68ad168b8..7bba47ea9c 100644
--- a/documentation/brief-yoctoprojectqs/index.rst
+++ b/documentation/brief-yoctoprojectqs/index.rst
@@ -106,42 +106,57 @@ commands to clone the Poky repository.
106 Resolving deltas: 100% (323116/323116), done. 106 Resolving deltas: 100% (323116/323116), done.
107 Checking connectivity... done. 107 Checking connectivity... done.
108 108
109Move to the ``poky`` directory and take a look at the tags: 109Go to :yocto_wiki:`Releases wiki page </Releases>`, and choose a release
110codename (such as ``&DISTRO_NAME_NO_CAP;``), corresponding to either the
111latest stable release or a Long Term Support release.
112
113Then move to the ``poky`` directory and take a look at existing branches:
110 114
111.. code-block:: shell 115.. code-block:: shell
112 116
113 $ cd poky 117 $ cd poky
114 $ git fetch --tags 118 $ git branch -a
115 $ git tag 119 .
116 1.1_M1.final 120 .
117 1.1_M1.rc1 121 .
118 1.1_M1.rc2 122 remotes/origin/HEAD -> origin/master
119 1.1_M2.final 123 remotes/origin/dunfell
120 1.1_M2.rc1 124 remotes/origin/dunfell-next
125 .
126 .
127 .
128 remotes/origin/gatesgarth
129 remotes/origin/gatesgarth-next
130 .
121 . 131 .
122 . 132 .
133 remotes/origin/master
134 remotes/origin/master-next
123 . 135 .
124 yocto-2.5 136 .
125 yocto-2.5.1 137 .
126 yocto-2.5.2 138
127 yocto-2.6 139
128 yocto-2.6.1 140For this example, check out the ``&DISTRO_NAME_NO_CAP;`` branch based on the
129 yocto-2.6.2 141``&DISTRO_NAME;`` release:
130 yocto-2.7
131 yocto_1.5_M5.rc8
132
133For this example, check out the branch based on the
134``&DISTRO_REL_TAG;`` release:
135 142
136.. code-block:: shell 143.. code-block:: shell
137 144
138 $ git checkout tags/&DISTRO_REL_TAG; -b my-&DISTRO_REL_TAG; 145 $ git checkout -t origin/&DISTRO_NAME_NO_CAP; -b my-&DISTRO_NAME_NO_CAP;
139 Switched to a new branch 'my-&DISTRO_REL_TAG;' 146 Branch 'my-&DISTRO_NAME_NO_CAP;' set up to track remote branch '&DISTRO_NAME_NO_CAP;' from 'origin'.
147 Switched to a new branch 'my-&DISTRO_NAME_NO_CAP;'
140 148
141The previous Git checkout command creates a local branch named 149The previous Git checkout command creates a local branch named
142``my-&DISTRO_REL_TAG;``. The files available to you in that branch exactly 150``my-&DISTRO_NAME_NO_CAP;``. The files available to you in that branch
143match the repository's files in the ``&DISTRO_NAME_NO_CAP;`` development 151exactly match the repository's files in the ``&DISTRO_NAME_NO_CAP;``
144branch at the time of the Yocto Project &DISTRO_REL_TAG; release. 152release branch.
153
154Note that you can regularly type the following command in the same directory
155to keep your local files in sync with the release branch:
156
157.. code-block:: shell
158
159 $ git pull
145 160
146For more options and information about accessing Yocto Project related 161For more options and information about accessing Yocto Project related
147repositories, see the 162repositories, see the