Skip to contentSkip to conversation

] bitbake: update masters version to some farout version

PATCH In review Armin Kuster 5 participants 6 messages Apr 12, 2019 – Apr 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ] bitbake: update masters version to some farout version

This is to avoid having master being updated when we branch for a new release.

Also, master should not be at the same version as the last stable release.

---
 bin/bitbake        | 2 +-
 lib/bb/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
bin/bitbake +1 -1
index 57dec2a..952c47e 100755
@@ -38,7 +38,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException
 if sys.getfilesystemencoding() != "utf-8":
     sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")
 
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 if __name__ == "__main__":
     if __version__ != bb.__version__:
lib/bb/__init__.py +1 -1
index 4bc47c8..a86197a 100644
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 import sys
 if sys.version_info < (3, 4, 0):
Signature · 1 line
2.7.4
#1 lore raw

My concern here is a user of an old clone of bitbake master won't trigger the oe-core bitbake version checks, it could just silently behave badly, or explode instead :)

Quoted 50 lines · Armin Kuster

This is to avoid having master being updated when we branch for a new release.

Also, master should not be at the same version as the last stable release.

---
 bin/bitbake        | 2 +-
 lib/bb/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
bin/bitbake +0 -0
index 57dec2a..952c47e 100755
@@ -38,7 +38,7 @@ from bb.main import bitbake_main,

BitBakeConfigParameters, BBMainException
if sys.getfilesystemencoding() != "utf-8":
sys.exit("Please use a locale setting which supports UTF-8 (such as
LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")

bin/bitbake +1 -1
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 if __name__ == "__main__":
     if __version__ != bb.__version__:
lib/bb/__init__.py +1 -2
index 4bc47c8..a86197a 100644
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 import sys
 if sys.version_info < (3, 4, 0):
--

2.7.4

--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Signature · 4 lines
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
#2 lore raw
Quoted 3 lines · Christopher Larson

My concern here is a user of an old clone of bitbake master won't trigger the oe-core bitbake version checks, it could just silently behave badly, or explode instead :)

ok. but so how is it Master is 1.40 and Warrior is 1.42 isn't causing a version trigger?

Is the version in the __init__.py needed ?  Warriors does not match and I have not seen any version check issues.

as always, thanks for the feedback,
Dazed and confused

Quoted 66 lines

On Thu, Apr 11, 2019 at 6:20 PM Armin Kuster <[email protected] <mailto:[email protected]>> wrote:

    This is to avoid having master being updated when we branch
    for a new release.

    Also, master should not be at the same version as the last
    stable release.

    Signed-off-by: Armin Kuster <[email protected]
    <mailto:[email protected]>>
    ---
     bin/bitbake        | 2 +-
     lib/bb/__init__.py | 2 +-
     2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/bin/bitbake b/bin/bitbake
    index 57dec2a..952c47e 100755
    --- a/bin/bitbake
    +++ b/bin/bitbake
    @@ -38,7 +38,7 @@ from bb.main import bitbake_main,
    BitBakeConfigParameters, BBMainException
     if sys.getfilesystemencoding() != "utf-8":
         sys.exit("Please use a locale setting which supports UTF-8
    (such as LANG=en_US.UTF-8).\nPython can't change the filesystem
    locale after loading so we need a UTF-8 when Python starts or
    things won't work.")

    -__version__ = "1.40.0"
    +__version__ = "1.99.0"

     if __name__ == "__main__":
         if __version__ != bb.__version__:
    diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
    index 4bc47c8..a86197a 100644
    --- a/lib/bb/__init__.py
    +++ b/lib/bb/__init__.py
    @@ -21,7 +21,7 @@
     # with this program; if not, write to the Free Software
    Foundation, Inc.,
     # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

    -__version__ = "1.40.0"
    +__version__ = "1.99.0"

     import sys
     if sys.version_info < (3, 4, 0):
    -- 
    2.7.4

    -- 
    _______________________________________________
    bitbake-devel mailing list
    [email protected]
    <mailto:[email protected]>
    http://lists.openembedded.org/mailman/listinfo/bitbake-devel
Signature · 4 lines
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
#3 lore raw
Quoted 1 line

but so how is it Master is 1.40

It isn't, master is currently identical with 1.42 branch, so both are 1.42.

Setting it farout, will cause issues once new incompatible change is introduced in the metadata and the sanity check needs to be updated to require even more farout version.

Quoted 85 lines · akuster

On 4/12/19 8:23 AM, Christopher Larson wrote:

My concern here is a user of an old clone of bitbake master won't trigger the oe-core bitbake version checks, it could just silently behave badly, or explode instead :)

ok. but so how is it Master is 1.40 and Warrior is 1.42 isn't causing a version trigger?

Is the version in the __init__.py needed ? Warriors does not match and I have not seen any version check issues.

as always, thanks for the feedback,
Dazed and confused

Quoted 44 lines · Armin Kuster

This is to avoid having master being updated when we branch for a new release.

Also, master should not be at the same version as the last stable release.

---
 bin/bitbake        | 2 +-
 lib/bb/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
bin/bitbake +0 -0
index 57dec2a..952c47e 100755
@@ -38,7 +38,7 @@ from bb.main import bitbake_main,

BitBakeConfigParameters, BBMainException
if sys.getfilesystemencoding() != "utf-8":
sys.exit("Please use a locale setting which supports UTF-8 (such as
LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")

bin/bitbake +1 -1
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 if __name__ == "__main__":
     if __version__ != bb.__version__:
lib/bb/__init__.py +1 -2
index 4bc47c8..a86197a 100644
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.40.0"
+__version__ = "1.99.0"
 
 import sys
 if sys.version_info < (3, 4, 0):
--

2.7.4

Quoted 6 lines

--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics

--
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

author
#4 lore raw
Quoted 4 lines · Martin Jansa
Quoted 1 line

but so how is it Master is 1.40

It isn't, master is currently identical with 1.42 branch, so both are 1.42.

Yes you are correct. As of this email it is.

Three hours ago master was updated to 1.42
https://git.openembedded.org/bitbake/commit/?id=00b133af009f9e7c1a4c751b6ef4902f47a81fe2

Master then got bumped to 1.43
https://git.openembedded.org/bitbake/commit/?id=aae15f3c16fb463962eee100a8b0bcd5fc01ad96

again three hours ago.

so now all it right with the world. : )

- armin

Quoted 97 lines

Setting it farout, will cause issues once new incompatible change is introduced in the metadata and the sanity check needs to be updated to require even more farout version.

On Fri, Apr 12, 2019 at 8:04 AM akuster <[email protected] <mailto:[email protected]>> wrote:

    On 4/12/19 8:23 AM, Christopher Larson wrote:
Quoted 3 lines

My concern here is a user of an old clone of bitbake master won't trigger the oe-core bitbake version checks, it could just silently behave badly, or explode instead :)

ok. but so how is it Master is 1.40 and Warrior is 1.42 isn't causing a version trigger?

Is the version in the __init__.py needed ?  Warriors does not match and I have not seen any version check issues.

as always, thanks for the feedback,
Dazed and confused

Quoted 60 lines
    On Thu, Apr 11, 2019 at 6:20 PM Armin Kuster
    <[email protected] <mailto:[email protected]>> wrote:

        This is to avoid having master being updated when we branch
        for a new release.

        Also, master should not be at the same version as the last
        stable release.

        Signed-off-by: Armin Kuster <[email protected]
        <mailto:[email protected]>>
        ---
         bin/bitbake        | 2 +-
         lib/bb/__init__.py | 2 +-
         2 files changed, 2 insertions(+), 2 deletions(-)

        diff --git a/bin/bitbake b/bin/bitbake
        index 57dec2a..952c47e 100755
        --- a/bin/bitbake
        +++ b/bin/bitbake
        @@ -38,7 +38,7 @@ from bb.main import bitbake_main,
        BitBakeConfigParameters, BBMainException
         if sys.getfilesystemencoding() != "utf-8":
             sys.exit("Please use a locale setting which supports
        UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the
        filesystem locale after loading so we need a UTF-8 when
        Python starts or things won't work.")

        -__version__ = "1.40.0"
        +__version__ = "1.99.0"

         if __name__ == "__main__":
             if __version__ != bb.__version__:
        diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
        index 4bc47c8..a86197a 100644
        --- a/lib/bb/__init__.py
        +++ b/lib/bb/__init__.py
        @@ -21,7 +21,7 @@
         # with this program; if not, write to the Free Software
        Foundation, Inc.,
         # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

        -__version__ = "1.40.0"
        +__version__ = "1.99.0"

         import sys
         if sys.version_info < (3, 4, 0):
        -- 
        2.7.4

        -- 
        _______________________________________________
        bitbake-devel mailing list
        [email protected]
        <mailto:[email protected]>
        http://lists.openembedded.org/mailman/listinfo/bitbake-devel
Quoted 6 lines
    -- 
    Christopher Larson
    kergoth at gmail dot com
    Founder - BitBake, OpenEmbedded, OpenZaurus
    Senior Software Engineer, Mentor Graphics
    -- 
    _______________________________________________
    bitbake-devel mailing list
    [email protected]
    <mailto:[email protected]>
    http://lists.openembedded.org/mailman/listinfo/bitbake-devel
#5 lore raw
Quoted 12 lines · On Fri, 2019-04-12 at 08:39 -0700, akuster808 wrote:
Quoted 4 lines · Martin Jansa
Quoted 1 line

but so how is it Master is 1.40

It isn't, master is currently identical with 1.42 branch, so both are 1.42.

Yes you are correct. As of this email it is.

Three hours ago master was updated to 1.42
https://git.openembedded.org/bitbake/commit/?id=00b133af009f9e7c1a4c751b6ef4902f47a81fe2

Quoted 6 lines

Master then got bumped to 1.43
https://git.openembedded.org/bitbake/commit/?id=aae15f3c16fb463962eee100a8b0bcd5fc01ad96

again three hours ago.

so now all it right with the world. : )

Just to follow up this was basically the release process working. Master was in sync with 1.42, we released and 1.42 ended in the branch, 1.43 continued in master...

Cheers,

Richard