NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/balena-engine: bump to version 20.10.26

Browse Source 
Like docker-engine and docker-cli, balena-engine uses a non-standard
vendor/ directory structure, so we use the same fixes as we introduced
for docker-engine ((see commit: package/docker-engine: bump version to
v23.0.0):

  - remove the problematic vendor/modules.txt
  - create a go.mod

Also remove the vendor/archive/ sub-tree (fixes a build error) because
Go no longer allows having duplicate packages in GOPATH and GOROOT.

vendor/archive/tar cannot be in vendor/ because it exists in the
standard library.  Since we remove the full vendor/archive/, that is
also fixed.

https://github.com/balena-os/balena-engine/releases/tag/v20.10.26

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Christian Stewart 2023-02-06 20:31:21 -08:00 committed by Yann E. MORIN
parent 0781f44c0a
commit 1a1081dcbf
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/balena-engine/balena-engine.hash
View File

@ -1,3 +1,3 @@
# Locally computed # Locally computed
sha256 4fb38109d133d499de366466a612fb6f523ea99d56fcd69b45dc494a75fbce0f balena-engine-20.10.21.tar.gz sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz
sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE

13
package/balena-engine/balena-engine.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
BALENA_ENGINE_VERSION = 20.10.21 BALENA_ENGINE_VERSION = 20.10.26
BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION))
BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE = Apache-2.0
@ -34,6 +34,17 @@ BALENA_ENGINE_TAGS = \
BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine
# create the go.mod file with language version go1.19
# remove the conflicting vendor/modules.txt
# remove the conflicting vendor/archive (not allowed in go1.20)
# https://github.com/moby/moby/issues/44618#issuecomment-1343565705
define BALENA_ENGINE_FIX_VENDORING
printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod
rm -f $(@D)/vendor/modules.txt
rm -rf $(@D)/vendor/archive
endef
BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING
ifeq ($(BR2_INIT_SYSTEMD),y) ifeq ($(BR2_INIT_SYSTEMD),y)
BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_DEPENDENCIES += systemd
BALENA_ENGINE_TAGS += journald BALENA_ENGINE_TAGS += journald