Using stable releases from git

Using stable releases from git

[Joshua Lock]

It's beginning to sound like we've caught some folks off guard by 
pushing changes to the edison branch of the poky repository in 
preparation for an upcoming edison point release.

The named branches are development branches for the release, stable 
release development will be done in the named branch and we can't 
guarantee they will be issue free (though we intend them to be where 
possible).

If you're looking to use a git checkout which matches the release 
tarballs you should checkout the tags for the releases. i.e. for Poky 
Edison-6.0/Yocto 1.1:

http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0

Having suffered through a couple of stable cycles recently I anticipate 
that in future the release branches will be updated more frequently. 
This will make it even more important to use a tag, rather than a 
branch, to track the releases using git.

Cheers,
Joshua
-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre

Re: Using stable releases from git

[jfabernathy]

[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]

On 01/30/2012 05:58 PM, Joshua Lock wrote:
> It's beginning to sound like we've caught some folks off guard by 
> pushing changes to the edison branch of the poky repository in 
> preparation for an upcoming edison point release.
>
> The named branches are development branches for the release, stable 
> release development will be done in the named branch and we can't 
> guarantee they will be issue free (though we intend them to be where 
> possible).
>
> If you're looking to use a git checkout which matches the release 
> tarballs you should checkout the tags for the releases. i.e. for Poky 
> Edison-6.0/Yocto 1.1:
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>
So instead of doing:

git checkout -b edison origin/edison

what should I do if I want to stay in sync with the tarball.  This may just be a doc problem.

Jim A


> Having suffered through a couple of stable cycles recently I 
> anticipate that in future the release branches will be updated more 
> frequently. This will make it even more important to use a tag, rather 
> than a branch, to track the releases using git.
>
> Cheers,
> Joshua


[-- Attachment #2: Type: text/html, Size: 2104 bytes --]

Re: Using stable releases from git

[McClintock Matthew-B29882]

On Mon, Jan 30, 2012 at 5:05 PM, jfabernathy <jfabernathy@gmail.com> wrote:
> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>
> It's beginning to sound like we've caught some folks off guard by pushing
> changes to the edison branch of the poky repository in preparation for an
> upcoming edison point release.
>
> The named branches are development branches for the release, stable release
> development will be done in the named branch and we can't guarantee they
> will be issue free (though we intend them to be where possible).
>
> If you're looking to use a git checkout which matches the release tarballs
> you should checkout the tags for the releases. i.e. for Poky
> Edison-6.0/Yocto 1.1:
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>
> So instead of doing:
>
> git checkout -b edison origin/edison
>
> what should I do if I want to stay in sync with the tarball.  This may just
> be a doc problem.

git checkout -b edison1.1 edison-6.0

(confusing versions... I think that tag should really be poky-6.0)

-M

Re: Using stable releases from git

[Joshua Lock]

On 30/01/12 15:05, jfabernathy wrote:
> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>> It's beginning to sound like we've caught some folks off guard by
>> pushing changes to the edison branch of the poky repository in
>> preparation for an upcoming edison point release.
>>
>> The named branches are development branches for the release, stable
>> release development will be done in the named branch and we can't
>> guarantee they will be issue free (though we intend them to be where
>> possible).
>>
>> If you're looking to use a git checkout which matches the release
>> tarballs you should checkout the tags for the releases. i.e. for Poky
>> Edison-6.0/Yocto 1.1:
>>
>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>>
> So instead of doing:
>
> git checkout -b edison origin/edison
>
> what should I do if I want to stay in sync with the tarball.  This may just be a doc problem.

I'd do:

git fetch --tags
git checkout edison-6.0

Then when a new tarball comes out, you'd repeat with the new tag name.

You can see the tags with:
git tag -l
(be sure to have git fetch --tags first)

i.e. to update through bernard releases
git fetch --tags
git checkout bernard-5.0
<time passes, 5.0.1 released>
git fetch --tags
git checkout bernard-5.0.1
<time passes, 5.0.2 released>
git fetch --tags
git checkout bernard-5.0.2

Cheers,
Joshua
-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre

Re: Using stable releases from git

[jfabernathy]

On 01/30/2012 06:15 PM, Joshua Lock wrote:
> On 30/01/12 15:05, jfabernathy wrote:
>> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>>> It's beginning to sound like we've caught some folks off guard by
>>> pushing changes to the edison branch of the poky repository in
>>> preparation for an upcoming edison point release.
>>>
>>> The named branches are development branches for the release, stable
>>> release development will be done in the named branch and we can't
>>> guarantee they will be issue free (though we intend them to be where
>>> possible).
>>>
>>> If you're looking to use a git checkout which matches the release
>>> tarballs you should checkout the tags for the releases. i.e. for Poky
>>> Edison-6.0/Yocto 1.1:
>>>
>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
>>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>>>
>> So instead of doing:
>>
>> git checkout -b edison origin/edison
>>
>> what should I do if I want to stay in sync with the tarball.  This 
>> may just be a doc problem.
>
> I'd do:
>
> git fetch --tags
> git checkout edison-6.0
>
> Then when a new tarball comes out, you'd repeat with the new tag name.
>

We I just tried that and it crashed a lot quicker.  I'll just stick to 
the tarballs until this is all sorted out.

Jim A

> You can see the tags with:
> git tag -l
> (be sure to have git fetch --tags first)
>
> i.e. to update through bernard releases
> git fetch --tags
> git checkout bernard-5.0
> <time passes, 5.0.1 released>
> git fetch --tags
> git checkout bernard-5.0.1
> <time passes, 5.0.2 released>
> git fetch --tags
> git checkout bernard-5.0.2
>
> Cheers,
> Joshua

Re: Using stable releases from git

[Joshua Lock]

On 30/01/12 15:32, jfabernathy wrote:
> On 01/30/2012 06:15 PM, Joshua Lock wrote:
>> On 30/01/12 15:05, jfabernathy wrote:
>>> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>>>> It's beginning to sound like we've caught some folks off guard by
>>>> pushing changes to the edison branch of the poky repository in
>>>> preparation for an upcoming edison point release.
>>>>
>>>> The named branches are development branches for the release, stable
>>>> release development will be done in the named branch and we can't
>>>> guarantee they will be issue free (though we intend them to be where
>>>> possible).
>>>>
>>>> If you're looking to use a git checkout which matches the release
>>>> tarballs you should checkout the tags for the releases. i.e. for Poky
>>>> Edison-6.0/Yocto 1.1:
>>>>
>>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
>>>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>>>>
>>> So instead of doing:
>>>
>>> git checkout -b edison origin/edison
>>>
>>> what should I do if I want to stay in sync with the tarball. This may
>>> just be a doc problem.
>>
>> I'd do:
>>
>> git fetch --tags
>> git checkout edison-6.0
>>
>> Then when a new tarball comes out, you'd repeat with the new tag name.
>>
>
> We I just tried that and it crashed a lot quicker. I'll just stick to
> the tarballs until this is all sorted out.

Are you using an appropriate tag (or branch) of meta-intel? The master 
branch of meta-intel with the bernard tag of poky will fail to parse 
because some of the recipes being appended to in meta-intel have changed 
names.

Cheers,
Joshua
-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre

Re: Using stable releases from git

[jfabernathy]

On 01/30/2012 11:38 PM, Joshua Lock wrote:
> On 30/01/12 15:32, jfabernathy wrote:
>> On 01/30/2012 06:15 PM, Joshua Lock wrote:
>>> On 30/01/12 15:05, jfabernathy wrote:
>>>> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>>>>> It's beginning to sound like we've caught some folks off guard by
>>>>> pushing changes to the edison branch of the poky repository in
>>>>> preparation for an upcoming edison point release.
>>>>>
>>>>> The named branches are development branches for the release, stable
>>>>> release development will be done in the named branch and we can't
>>>>> guarantee they will be issue free (though we intend them to be where
>>>>> possible).
>>>>>
>>>>> If you're looking to use a git checkout which matches the release
>>>>> tarballs you should checkout the tags for the releases. i.e. for Poky
>>>>> Edison-6.0/Yocto 1.1:
>>>>>
>>>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
>>>>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0 
>>>>>
>>>>>
>>>> So instead of doing:
>>>>
>>>> git checkout -b edison origin/edison
>>>>
>>>> what should I do if I want to stay in sync with the tarball. This may
>>>> just be a doc problem.
>>>
>>> I'd do:
>>>
>>> git fetch --tags
>>> git checkout edison-6.0
>>>
>>> Then when a new tarball comes out, you'd repeat with the new tag name.
>>>
>>
>> We I just tried that and it crashed a lot quicker. I'll just stick to
>> the tarballs until this is all sorted out.
>
> Are you using an appropriate tag (or branch) of meta-intel? The master 
> branch of meta-intel with the bernard tag of poky will fail to parse 
> because some of the recipes being appended to in meta-intel have 
> changed names.
>
Can you explain the branch vs. tag as Yocto uses it?  most of the help 
on git checkout refers to branch, where we are talking using a tag 
name.  In Yocto what is the difference?
> Cheers,
> Joshua

Re: Using stable releases from git

[Joshua Lock]

On 31/01/12 07:28, jfabernathy wrote:
> On 01/30/2012 11:38 PM, Joshua Lock wrote:
>> On 30/01/12 15:32, jfabernathy wrote:
>>> On 01/30/2012 06:15 PM, Joshua Lock wrote:
>>>> On 30/01/12 15:05, jfabernathy wrote:
>>>>> On 01/30/2012 05:58 PM, Joshua Lock wrote:
>>>>>> It's beginning to sound like we've caught some folks off guard by
>>>>>> pushing changes to the edison branch of the poky repository in
>>>>>> preparation for an upcoming edison point release.
>>>>>>
>>>>>> The named branches are development branches for the release, stable
>>>>>> release development will be done in the named branch and we can't
>>>>>> guarantee they will be issue free (though we intend them to be where
>>>>>> possible).
>>>>>>
>>>>>> If you're looking to use a git checkout which matches the release
>>>>>> tarballs you should checkout the tags for the releases. i.e. for Poky
>>>>>> Edison-6.0/Yocto 1.1:
>>>>>>
>>>>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tag/?id=edison-6.0
>>>>>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tag/?id=edison-6.0
>>>>>>
>>>>>>
>>>>> So instead of doing:
>>>>>
>>>>> git checkout -b edison origin/edison
>>>>>
>>>>> what should I do if I want to stay in sync with the tarball. This may
>>>>> just be a doc problem.
>>>>
>>>> I'd do:
>>>>
>>>> git fetch --tags
>>>> git checkout edison-6.0
>>>>
>>>> Then when a new tarball comes out, you'd repeat with the new tag name.
>>>>
>>>
>>> We I just tried that and it crashed a lot quicker. I'll just stick to
>>> the tarballs until this is all sorted out.
>>
>> Are you using an appropriate tag (or branch) of meta-intel? The master
>> branch of meta-intel with the bernard tag of poky will fail to parse
>> because some of the recipes being appended to in meta-intel have
>> changed names.
>>
> Can you explain the branch vs. tag as Yocto uses it? most of the help on
> git checkout refers to branch, where we are talking using a tag name. In
> Yocto what is the difference?

A tag is a snapshot, a release or milestone usually, and is static. 
Releases (and their tarballs) are generated from a tag.

A branch represents some ongoing development of some sort, we branch 
master when we're close to release and only put bug fixes in the branch. 
When it comes to release time we tag the release.

We use those same branches for any stable maintenance work, once that's 
ready for release we'll create another tag.

In short:
* branches are for development and the contents change
* tags are snapshots

Cheers,
Joshua
-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre