Skip to contentSkip to conversation

package/{python-}protobuf: bump to version 21.3

PATCH In review Michael Nosthoff via buildroot 3 participants 6 messages Jul 21, 2022 – Jul 27, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/{python-}protobuf: bump to version 21.3

protobuf changed its versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that.

[1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06

---
 package/protobuf/protobuf.hash               | 2 +-
 package/protobuf/protobuf.mk                 | 6 ++++--
 package/python-protobuf/python-protobuf.hash | 2 +-
 package/python-protobuf/python-protobuf.mk   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
package/protobuf/protobuf.hash +1 -1
index f37b2dee40..1006fd3d64 100644
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
-sha256  dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9  protobuf-cpp-3.20.1.tar.gz
+sha256  c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc  protobuf-cpp-3.21.3.tar.gz
package/protobuf/protobuf.mk +4 -2
index c4c33ba7da..5c08421bbc 100644
@@ -7,9 +7,11 @@
 # When bumping this package, make sure to also verify if the
 # python-protobuf package still works and to update its hash,
 # as they share the same version/site variables.
-PROTOBUF_VERSION = 3.20.1
+PROTOBUF_VERSION_MAJOR = 3
+PROTOBUF_VERSION_MINOR = 21.3
+PROTOBUF_VERSION = ${PROTOBUF_VERSION_MAJOR}.${PROTOBUF_VERSION_MINOR}
 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
-PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
 PROTOBUF_LICENSE = BSD-3-Clause
 PROTOBUF_LICENSE_FILES = LICENSE
 PROTOBUF_CPE_ID_VENDOR = google
package/python-protobuf/python-protobuf.hash +1 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8  protobuf-python-3.20.1.tar.gz
+sha256  ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2  protobuf-python-4.21.3.tar.gz
 sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
package/python-protobuf/python-protobuf.mk +2 -1
index b91ba49339..8c21779faf 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION = $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
 PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
 PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
 PYTHON_PROTOBUF_LICENSE = BSD-3-Clause
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 5 lines · Michael Nosthoff via buildroot

protobuf changed its versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that.

I think that the crazy stuff that was done upstream warrants a bit more
consideration on our side...

They are basically trying to encode two separate things in the version number:

- the version of protobuf itself (i.e. the protocol definition) - this is 21.3;

- the version of the language-specific API - this is 3 for all languages, except for python where it was bumped to 4 because it has breaking changes in the 21.0 release.

First remark: due to this breaking change, I expect that an update of ola (our
only in-tree consumer of python-protobuf) may be needed as well.

The version of the language-specific API is basically just there to to
indicate breaking changes. In the context of Buildroot, I think it's the protoc version which is more relevant.

Then there's release-monitoring. For protobuf, it says 21.3. For
python-protobuf, we have a mapping to the same protobuf package [1].

Quoted 25 lines

[1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06

---
  package/protobuf/protobuf.hash               | 2 +-
  package/protobuf/protobuf.mk                 | 6 ++++--
  package/python-protobuf/python-protobuf.hash | 2 +-
  package/python-protobuf/python-protobuf.mk   | 3 ++-
  4 files changed, 8 insertions(+), 5 deletions(-)
package/protobuf/protobuf.hash +1 -1
index f37b2dee40..1006fd3d64 100644
@@ -1,3 +1,3 @@
  # Locally calculated
  sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
-sha256  dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9  protobuf-cpp-3.20.1.tar.gz
+sha256  c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc  protobuf-cpp-3.21.3.tar.gz
package/protobuf/protobuf.mk +0 -0
index c4c33ba7da..5c08421bbc 100644

package/protobuf/protobuf.mk line 13

Quoted 8 lines
package/protobuf/protobuf.mk +3 -1
@@ -7,9 +7,11 @@
  # When bumping this package, make sure to also verify if the
  # python-protobuf package still works and to update its hash,
  # as they share the same version/site variables.
-PROTOBUF_VERSION = 3.20.1
 
+PROTOBUF_VERSION_MAJOR = 3
+PROTOBUF_VERSION_MINOR = 21.3
+PROTOBUF_VERSION = ${PROTOBUF_VERSION_MAJOR}.${PROTOBUF_VERSION_MINOR}

So I think we should set PROTOBUF_VERSION = 21.3.

package/protobuf/protobuf.mk line 13

Quoted 1 line
package/protobuf/protobuf.mk +0 -0
  PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz

And change this into
PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz

Note that I don't think it's useful to create a separate variable for the 3.
part. This is the only place where it is going to be used, and even if it would be the same for python-protobuf, it's better to have it explicit in each binding instead of in a shared variable.

Regards,
Arnout

[1] https://release-monitoring.org/project/3715/

Quoted 19 lines
package/protobuf/protobuf.mk +1 -1
-PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
  PROTOBUF_LICENSE = BSD-3-Clause
  PROTOBUF_LICENSE_FILES = LICENSE

PROTOBUF_CPE_ID_VENDOR = google

package/python-protobuf/python-protobuf.hash +1 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
  # Locally calculated
-sha256  d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8  protobuf-python-3.20.1.tar.gz
+sha256  ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2  protobuf-python-4.21.3.tar.gz
  sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
package/python-protobuf/python-protobuf.mk +0 -0
index b91ba49339..8c21779faf 100644

package/python-protobuf/python-protobuf.mk line 11

Quoted 9 lines
package/python-protobuf/python-protobuf.mk +2 -1
@@ -4,7 +4,8 @@
  #
  ################################################################################
 
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION = $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
  PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
  PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
  PYTHON_PROTOBUF_LICENSE = BSD-3-Clause

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw

Hi Arnoud,
hi Julien,

(julien, i added you as the ola maintainer as this patch might break it)

Quoted 14 lines · Arnout Vandecappelle
Quoted 5 lines · Michael Nosthoff via buildroot

protobuf changed its versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that.

I think that the crazy stuff that was done upstream warrants a bit more
consideration on our side...

They are basically trying to encode two separate things in the version number:

Quoted 8 lines

- the version of protobuf itself (i.e. the protocol definition) - this is 21.3;

- the version of the language-specific API - this is 3 for all languages, except for python where it was bumped to 4 because it has breaking changes in the 21.0 release.

First remark: due to this breaking change, I expect that an update of ola (our
only in-tree consumer of python-protobuf) may be needed as well.

The "breaking changes" according to
https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
don't actually sound "too breaking" to me.

I tried compiling ola with the bumped version. But it is beyond my knowledge how to test this. @Julien could you check if this version bump of python-protobuf affects ola?

Quoted 8 lines

The version of the language-specific API is basically just there to to
indicate breaking changes. In the context of Buildroot, I think it's the protoc version which is more relevant.

Then there's release-monitoring. For protobuf, it says 21.3. For
python-protobuf, we have a mapping to the same protobuf package [1].

I'm not quite sure what you mean here. should we got with PYTHON_PROTOBUF_VERSION = 4.x.x or do the same as with the cpp version and just add -4. to the SOURCE?
Where do I see the release-monitoring mapping?

Quoted 41 lines
Quoted 27 lines

[1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06

---
  package/protobuf/protobuf.hash               | 2 +-
  package/protobuf/protobuf.mk                 | 6 ++++--
  package/python-protobuf/python-protobuf.hash | 2 +-
  package/python-protobuf/python-protobuf.mk   | 3 ++-
  4 files changed, 8 insertions(+), 5 deletions(-)
package/protobuf/protobuf.hash +1 -1
index f37b2dee40..1006fd3d64 100644
@@ -1,3 +1,3 @@
  # Locally calculated
  sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
-sha256  dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9  protobuf-cpp-3.20.1.tar.gz
+sha256  c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc  protobuf-cpp-3.21.3.tar.gz
package/protobuf/protobuf.mk +0 -0
index c4c33ba7da..5c08421bbc 100644

package/protobuf/protobuf.mk line 13

Quoted 8 lines
package/protobuf/protobuf.mk +3 -1
@@ -7,9 +7,11 @@
  # When bumping this package, make sure to also verify if the
  # python-protobuf package still works and to update its hash,
  # as they share the same version/site variables.
-PROTOBUF_VERSION = 3.20.1
 
+PROTOBUF_VERSION_MAJOR = 3
+PROTOBUF_VERSION_MINOR = 21.3
+PROTOBUF_VERSION = ${PROTOBUF_VERSION_MAJOR}.${PROTOBUF_VERSION_MINOR}

So I think we should set PROTOBUF_VERSION = 21.3.

package/protobuf/protobuf.mk line 13

Quoted 1 line
package/protobuf/protobuf.mk +0 -0
  PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
Quoted 7 lines

And change this into
PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz

Note that I don't think it's useful to create a separate variable for the 3.
part. This is the only place where it is going to be used, and even if it would be the same for python-protobuf, it's better to have it explicit in each binding instead of in a shared variable.

I'll send a v2 doing that.

Quoted 28 lines

Regards,
Arnout

[1] https://release-monitoring.org/project/3715/

Quoted 22 lines
package/protobuf/protobuf.mk +1 -1
-PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
  PROTOBUF_LICENSE = BSD-3-Clause
  PROTOBUF_LICENSE_FILES = LICENSE

PROTOBUF_CPE_ID_VENDOR = google

package/python-protobuf/python-protobuf.hash +1 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
  # Locally calculated
-sha256  d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8  protobuf-python-3.20.1.tar.gz
+sha256  ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2  protobuf-python-4.21.3.tar.gz
  sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
package/python-protobuf/python-protobuf.mk +0 -0
index b91ba49339..8c21779faf 100644
@@ -4,7 +4,8 @@
  #
  ################################################################################
 
Quoted 6 lines

package/python-protobuf/python-protobuf.mk line 11

Quoted 6 lines
package/python-protobuf/python-protobuf.mk +2 -1
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION = $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
  PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
  PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
  PYTHON_PROTOBUF_LICENSE = BSD-3-Clause

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
Quoted 30 lines · Michael Nosthoff

Hi Arnoud,
hi Julien,

(julien, i added you as the ola maintainer as this patch might break it)

Quoted 14 lines · Arnout Vandecappelle
Quoted 5 lines · Michael Nosthoff via buildroot

protobuf changed its versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that.

I think that the crazy stuff that was done upstream warrants a bit more
consideration on our side...

They are basically trying to encode two separate things in the version number:

Quoted 8 lines

- the version of protobuf itself (i.e. the protocol definition) - this is 21.3;

- the version of the language-specific API - this is 3 for all languages, except for python where it was bumped to 4 because it has breaking changes in the 21.0 release.

First remark: due to this breaking change, I expect that an update of ola (our
only in-tree consumer of python-protobuf) may be needed as well.

Quoted 6 lines

The "breaking changes" according to
https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
don't actually sound "too breaking" to me.

I tried compiling ola with the bumped version. But it is beyond my knowledge how to test this. @Julien could you check if this version bump of python-protobuf affects ola?

A runtime test for ola would be nice!

Quoted 6 lines
Quoted 6 lines

The version of the language-specific API is basically just there to to
indicate breaking changes. In the context of Buildroot, I think it's the protoc version which is more relevant.

Quoted 6 lines
Quoted 3 lines

Then there's release-monitoring. For protobuf, it says 21.3. For
python-protobuf, we have a mapping to the same protobuf package [1].

I'm not quite sure what you mean here. should we got with PYTHON_PROTOBUF_VERSION = 4.x.x or do the same as with the cpp version and just add -4. to the SOURCE?

Yes, that's what I meant, prepend the 4. in the SOURCE definition.

Quoted 1 line

Where do I see the release-monitoring mapping?

The URL that I referred to before:
[snip]

Quoted 1 line
Quoted 1 line

[1] https://release-monitoring.org/project/3715/

Regards,
Arnout

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
package/protobuf/protobuf.mk +1 -1
-PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
   PROTOBUF_LICENSE = BSD-3-Clause
   PROTOBUF_LICENSE_FILES = LICENSE
   PROTOBUF_CPE_ID_VENDOR = google
package/python-protobuf/python-protobuf.hash +1 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
   # Locally calculated
-sha256  d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8  protobuf-python-3.20.1.tar.gz
+sha256  ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2  protobuf-python-4.21.3.tar.gz
   sha256  6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d  LICENSE
package/python-protobuf/python-protobuf.mk +0 -0
index b91ba49339..8c21779faf 100644
@@ -4,7 +4,8 @@
   #
   ################################################################################
 
Quoted 7 lines
Quoted 6 lines

package/python-protobuf/python-protobuf.mk line 11

Quoted 6 lines
package/python-protobuf/python-protobuf.mk +2 -1
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION = $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
   PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
   PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
   PYTHON_PROTOBUF_LICENSE = BSD-3-Clause

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Tested-by on v1 1/1
#4 lore raw
In reply to Michael Nosthoff via buildroot

Hi Michael, All,

I successfully runtime-tested this patch in qemu_aarch64_virt_defconfig with ola client commands and Python3 RDM discovery. I'll try to make a runtime test for this.

Quoted 9 lines · Michael Nosthoff via buildroot

protobuf changed its versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that.

[1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06

Quoted 79 lines
---
 package/protobuf/protobuf.hash               | 2 +-
 package/protobuf/protobuf.mk                 | 6 ++++--
 package/python-protobuf/python-protobuf.hash | 2 +-
 package/python-protobuf/python-protobuf.mk   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
package/protobuf/protobuf.hash +0 -0
index f37b2dee40..1006fd3d64 100644
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256

6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
-sha256 dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9 protobuf-cpp-3.20.1.tar.gz
+sha256 c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc protobuf-cpp-3.21.3.tar.gz

package/protobuf/protobuf.mk +4 -2
index c4c33ba7da..5c08421bbc 100644
@@ -7,9 +7,11 @@
 # When bumping this package, make sure to also verify if the
 # python-protobuf package still works and to update its hash,
 # as they share the same version/site variables.
-PROTOBUF_VERSION = 3.20.1
+PROTOBUF_VERSION_MAJOR = 3
+PROTOBUF_VERSION_MINOR = 21.3
+PROTOBUF_VERSION = ${PROTOBUF_VERSION_MAJOR}.${PROTOBUF_VERSION_MINOR}
 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
-PROTOBUF_SITE =
 https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE =
 https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
 PROTOBUF_LICENSE = BSD-3-Clause

PROTOBUF_LICENSE_FILES = LICENSE
PROTOBUF_CPE_ID_VENDOR = google

package/python-protobuf/python-protobuf.hash +0 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256

d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8 protobuf-python-3.20.1.tar.gz
+sha256 ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2 protobuf-python-4.21.3.tar.gz
sha256
6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE

package/python-protobuf/python-protobuf.mk +2 -1
index b91ba49339..8c21779faf 100644
@@ -4,7 +4,8 @@
 #
 
 ################################################################################
 
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION =
 $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
 PYTHON_PROTOBUF_SOURCE = 

protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
PYTHON_PROTOBUF_LICENSE = BSD-3-Clause
--
2.25.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw

Hi Julien,

Quoted 18 lines · Julien Olivain

Hi Michael, All,

I successfully runtime-tested this patch in qemu_aarch64_virt_defconfig with
ola client commands and Python3 RDM discovery. I'll try to make a runtime
test for this.

Quoted 8 lines · Michael Nosthoff via buildroot

protobuf changed its versioning scheme [1]. The Release version is now only
the Minor.Patch version of the language specific version.

C++ stays on version 3, but python got bumped to 4. So the handling in the .mk
files changed to reflect that.

Quoted 5 lines
Quoted 3 lines

[1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06

great, thank you.
I'll add your tag to the v2.

Regards,
Michael

Quoted 82 lines
Quoted 82 lines
---
 package/protobuf/protobuf.hash               | 2 +-
 package/protobuf/protobuf.mk                 | 6 ++++--
 package/python-protobuf/python-protobuf.hash | 2 +-
 package/python-protobuf/python-protobuf.mk   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
package/protobuf/protobuf.hash +0 -0
index f37b2dee40..1006fd3d64 100644
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256

6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
-sha256 dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9 protobuf-cpp-3.20.1.tar.gz
+sha256 c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc protobuf-cpp-3.21.3.tar.gz

package/protobuf/protobuf.mk +4 -2
index c4c33ba7da..5c08421bbc 100644
@@ -7,9 +7,11 @@
 # When bumping this package, make sure to also verify if the
 # python-protobuf package still works and to update its hash,
 # as they share the same version/site variables.
-PROTOBUF_VERSION = 3.20.1
+PROTOBUF_VERSION_MAJOR = 3
+PROTOBUF_VERSION_MINOR = 21.3
+PROTOBUF_VERSION = ${PROTOBUF_VERSION_MAJOR}.${PROTOBUF_VERSION_MINOR}
 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
-PROTOBUF_SITE =
 https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_SITE =
 https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION_MINOR)
 PROTOBUF_LICENSE = BSD-3-Clause

PROTOBUF_LICENSE_FILES = LICENSE
PROTOBUF_CPE_ID_VENDOR = google

package/python-protobuf/python-protobuf.hash +0 -1
index ddfa48b491..06ec32c5b5 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256

d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8 protobuf-python-3.20.1.tar.gz
+sha256 ab5cda843c1fa2a34c5cdd30b65ae8bd148d8063e7f1b2bfe7daf23e763b0ff2 protobuf-python-4.21.3.tar.gz
sha256
6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE

package/python-protobuf/python-protobuf.mk +2 -1
index b91ba49339..8c21779faf 100644
@@ -4,7 +4,8 @@
 #
 
 ################################################################################
 
-PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_VERSION_MAJOR = 4
+PYTHON_PROTOBUF_VERSION =
 $(PYTHON_PROTOBUF_VERSION_MAJOR).$(PROTOBUF_VERSION_MINOR)
 PYTHON_PROTOBUF_SOURCE = 

protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
PYTHON_PROTOBUF_LICENSE = BSD-3-Clause
--
2.25.1

Quoted 8 lines
Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

Julien.

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot