stable = pre-0.6.5 ?

[Michel Blais]

Hi,

I installed olsrd on OpenWRT from stable git (buildroot = src-git olsrd
http://olsr.org/git/olsrd.git;stable).

I was thinking that the stable version was 0.6.4 but when I look at the
version :

# olsrd -v

*** olsr.org - pre-0.6.5-git_-hash_

Is pre-0.6.5 stable and safe to use on production ?

Thanks

Michel

[Henning Rogge]

Hi,

as you maybe did not notice, we reorganized the branches of our
repository a few months ago.

There is no "Stable" branch anymore, just "Master" where we develop
stuff and "release-X.Y.Z" branches where we stabilize code for a
release.

Each stable release is tagged by a "vX.Y.Z" tag, which is also signed.
The latest release is the "v0.6.4" tag.

"pre-0.6.5" is the name of the current "Master" development code that
will go into the 0.6.5 release branch in the future.

Henning Rogge

Post by Michel Blais
Hi,
I installed olsrd on OpenWRT from stable git (buildroot = src-git olsrd
http://olsr.org/git/olsrd.git;stable).
I was thinking that the stable version was 0.6.4 but when I look at the
# olsrd -v
*** olsr.org - pre-0.6.5-git_-hash_
Is pre-0.6.5 stable and safe to use on production ?
Thanks
Michel
--
Olsr-users mailing list
https://lists.olsr.org/mailman/listinfo/olsr-users

[Michel Blais]

So If I understand, instead of using

buildroot = src-git olsrd http://olsr.org/git/olsrd.git;stable

I should use

buildroot = src-git olsrd http://olsr.org/git/olsrd.git;0.6.4

Also, README file for OpenWRT folder should be updated.

Thanks

Michel

Post by Henning Rogge
Hi,
as you maybe did not notice, we reorganized the branches of our
repository a few months ago.
There is no "Stable" branch anymore, just "Master" where we develop
stuff and "release-X.Y.Z" branches where we stabilize code for a
release.
Each stable release is tagged by a "vX.Y.Z" tag, which is also signed.
The latest release is the "v0.6.4" tag.
"pre-0.6.5" is the name of the current "Master" development code that
will go into the 0.6.5 release branch in the future.
Henning Rogge

Post by Michel Blais
Hi,
I installed olsrd on OpenWRT from stable git (buildroot = src-git olsrd
http://olsr.org/git/olsrd.git;stable).
I was thinking that the stable version was 0.6.4 but when I look at the
# olsrd -v
*** olsr.org - pre-0.6.5-git_-hash_
Is pre-0.6.5 stable and safe to use on production ?
Thanks
Michel
--
Olsr-users mailing list
https://lists.olsr.org/mailman/listinfo/olsr-users

[Ferry Huberts]

Post by Michel Blais
So If I understand, instead of using
buildroot = src-git olsrd http://olsr.org/git/olsrd.git;stable

The stable branch no longer exists, so this should not build.
If it does build then you have a problem.

Post by Michel Blais
I should use
buildroot = src-git olsrd http://olsr.org/git/olsrd.git;0.6.4

you can use
- release-0.6.4 (which is the release branch for 0.6.4)
- v0.6.4 (which is the tag on release 0.6.4)

The branch _might_ accumulate fixes _if_ we want to release bug fix
versions on that release train (unlikely).


Ferry

Post by Michel Blais
Also, README file for OpenWRT folder should be updated.
Thanks
Michel

Post by Henning Rogge
Hi,
as you maybe did not notice, we reorganized the branches of our
repository a few months ago.
There is no "Stable" branch anymore, just "Master" where we
develop stuff and "release-X.Y.Z" branches where we stabilize code
for a release.
Each stable release is tagged by a "vX.Y.Z" tag, which is also
signed. The latest release is the "v0.6.4" tag.
"pre-0.6.5" is the name of the current "Master" development code
that will go into the 0.6.5 release branch in the future.
Henning Rogge
On Fri, Nov 16, 2012 at 7:57 PM, Michel Blais

Post by Michel Blais
Hi,
I installed olsrd on OpenWRT from stable git (buildroot = src-git
olsrd http://olsr.org/git/olsrd.git;stable).
I was thinking that the stable version was 0.6.4 but when I look
# olsrd -v
*** olsr.org - pre-0.6.5-git_-hash_
Is pre-0.6.5 stable and safe to use on production ?
Thanks
Michel
https://lists.olsr.org/mailman/listinfo/olsr-users

[Henning Rogge]

Post by Ferry Huberts

Post by Michel Blais
So If I understand, instead of using
buildroot = src-git olsrd http://olsr.org/git/olsrd.git;stable

The stable branch no longer exists, so this should not build.
If it does build then you have a problem.

Maybe OpenWRT first clones the repository and then fails to detect the
"cannot switch to stable branch" error... which means it builds the
default branch. *G*

Henning

[Ferry Huberts]

Post by Henning Rogge

Post by Ferry Huberts

Post by Michel Blais
So If I understand, instead of using
buildroot = src-git olsrd http://olsr.org/git/olsrd.git;stable

The stable branch no longer exists, so this should not build.
If it does build then you have a problem.

Maybe OpenWRT first clones the repository and then fails to detect the
"cannot switch to stable branch" error... which means it builds the
default branch. *G*

or maybe (a combination of)
- he works from an existing clone (with the stable branch still in it)
- the openwrt does _not_ do a prune.


The correct way for a build system is:
git fetch origin --prune
git reset --hard origin/<tree-ish>
...do the rest of the build...

[Michel Blais]

I didn't see it at first but the're was a error when updating feeds that
the branch didn't exist and that it will use HEAD instead or something
like that.

Anyway, it work fine by adding the following to feeds.conf.default
(don't know why I writed buildroot).

src-git olsrd http://olsr.org/git/olsrd.git;release-0.6.4

Michel

Post by Henning Rogge

Post by Ferry Huberts

Post by Michel Blais
So If I understand, instead of using
buildroot = src-git olsrd http://olsr.org/git/olsrd.git;stable

The stable branch no longer exists, so this should not build.
If it does build then you have a problem.

Maybe OpenWRT first clones the repository and then fails to detect the
"cannot switch to stable branch" error... which means it builds the
default branch. *G*
Henning