feat: upgrade proto libraries

This upgrades protobuf and protoc-gen-go to the latest stable versions. Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
siderolabs · Jan 7, 2021 · 4689294 · 4689294
1 parent 05b7372
commit 4689294
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -21,13 +21,13 @@ all: $(TARGETS) ## Builds all known pkgs.
 help: ## This help menu.
 	@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-target-%: ## Builds the specified target defined in the Dockerfile. The build result will only remain in the build cache.
+target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache.
 	@$(BUILD) \
 		--target=$* \
 		$(COMMON_ARGS) \
 		$(TARGET_ARGS) .
 
-docker-%: ## Builds the specified target defined in the Dockerfile using the docker output type. The build result will be loaded into docker.
+docker-%: ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into docker.
 	@$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)"
 
 .PHONY: $(TARGETS)

diff --git a/protobuf/pkg.yaml b/protobuf/pkg.yaml
@@ -4,13 +4,13 @@ dependencies:
   - stage: patch
 steps:
   - sources:
-      - url: https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protobuf-cpp-3.12.3.tar.gz
-        destination: protobuf-cpp-3.7.1.tar.gz
-        sha256: 4ef97ec6a8e0570d22ad8c57c99d2055a61ea2643b8e1a0998d2c844916c4968
-        sha512: a30677d152eee663960ed363b62464a455057796a5938e900deaa8fa0e3ba468675be450846b7c27b722114ee6d735bd27edc302f38a39486f7e44f71d155c66
+      - url: https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protobuf-cpp-3.14.0.tar.gz
+        destination: protobuf-cpp.tar.gz
+        sha256: 50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659
+        sha512: 021a377a2bcfb1ee540e49371d1d7297d77359fd0de7b4a079918e8580258a7ee14256a9b392853dc6744e88d63b2fae723ab61cc9af599828f07f48b0161c74
     prepare:
       - |
-        tar -xzf protobuf-cpp-3.7.1.tar.gz --strip-components=1
+        tar -xzf protobuf-cpp.tar.gz --strip-components=1
 
         ./configure \
         --prefix="${TOOLCHAIN}" \

diff --git a/protoc-gen-go/pkg.yaml b/protoc-gen-go/pkg.yaml
@@ -4,23 +4,23 @@ dependencies:
   - stage: golang
 steps:
   - sources:
-      - url: https://github.com/golang/protobuf/archive/v1.4.2/golang-protobuf-1.4.2.tar.gz
-        destination: golang-protobuf.tar.gz
-        sha256: a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
-        sha512: ee0cff1649ccc8b34305b601eb005bc38e222d2e2b8f161d75b9f1da68eef4aa16f52399f9c53b96971cfd7d33a4afe5b0fcbdbd90bb2d0cd46d4e51020051ea
+      - url: https://github.com/protocolbuffers/protobuf-go/archive/v1.25.0.tar.gz
+        destination: protobuf-go.tar.gz
+        sha256: c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
+        sha512: f5e4c2399174ae41d73f902b189f792a22856e88cfdf2c09a9f39871179f2e937d2de24a46fc5e95b6c3870fab17d832480b95be49d27d8664ec2e0a4706cf3b
     prepare:
       - |
-        tar -xzf golang-protobuf.tar.gz --strip-components=1
+        tar -xzf protobuf-go.tar.gz --strip-components=1
     build:
       - |
         export PATH=${TOOLCHAIN}/go/bin:${PATH}
         export GO111MODULE=on
-        cd protoc-gen-go
+        cd cmd/protoc-gen-go
         go build .
     install:
       - |
         mkdir -p /rootfs${TOOLCHAIN}/bin
-        mv protoc-gen-go/protoc-gen-go /rootfs${TOOLCHAIN}/bin
+        mv cmd/protoc-gen-go/protoc-gen-go /rootfs${TOOLCHAIN}/bin
 finalize:
   - from: /rootfs
     to: /