containerd: upgrade Build-Depends to Golang 1.17
The Build-Depends package "golang-github-containernetworking-plugins" has been upgraded to 1.2.0 by https://review.opendev.org/c/starlingx/integ/+/878722, that causes a build issue of containerd: ===================== src/github.com/containernetworking/plugins/vendor/golang.org/x/sys/unix/syscall.go:83:16: undefined: unsafe.Slice src/github.com/containernetworking/plugins/vendor/golang.org/x/sys/unix/syscall_linux.go:2270:9: undefined: unsafe.Slice src/github.com/containernetworking/plugins/vendor/golang.org/x/sys/unix/syscall_unix.go:118:7: undefined: unsafe.Slice src/github.com/containernetworking/plugins/vendor/golang.org/x/sys/unix/sysvshm_unix.go:33:7: undefined: unsafe.Slice ===================== The "unsafe.Slice" is introduced since Golong 1.17, so change the Build-Depends. Test Plan: - PASS: build-pkgs -a -c - PASS: build-image Closes-Bug: 2016936 Signed-off-by: Yue Tao <Yue.Tao@windriver.com> Change-Id: Ic14ef5f273e5d6b5deb2de00f74d3b823bd198ad
This commit is contained in:
parent
1969e7770b
commit
da9d57b295
@ -24,6 +24,7 @@ CRI_FILE += vendor/k8s.io vendor/github.com/docker/docker
|
|||||||
CRI_FILE += vendor/github.com/containerd/imgcrypt
|
CRI_FILE += vendor/github.com/containerd/imgcrypt
|
||||||
|
|
||||||
export DH_GOLANG_EXCLUDES := $(EXCLUDES)
|
export DH_GOLANG_EXCLUDES := $(EXCLUDES)
|
||||||
|
export PATH := /usr/lib/go-1.17/bin:$(PATH)
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@ --buildsystem=golang --with=golang --builddirectory=_build
|
dh $@ --buildsystem=golang --with=golang --builddirectory=_build
|
||||||
|
@ -0,0 +1,27 @@
|
|||||||
|
From 5a09ae888e41a92bcb76c6d0ec5fe452fe0695bf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yue Tao <yue.tao@windriver.com>
|
||||||
|
Date: Tue, 18 Apr 2023 08:41:40 +0000
|
||||||
|
Subject: [PATCH] Update to Go 1.17 due to containernetworking-plugins upgraded
|
||||||
|
to v1.2.0
|
||||||
|
|
||||||
|
Signed-off-by: Yue Tao <yue.tao@windriver.com>
|
||||||
|
---
|
||||||
|
debian/control | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/debian/control b/debian/control
|
||||||
|
index 57a3a9c..db17fb8 100644
|
||||||
|
--- a/debian/control
|
||||||
|
+++ b/debian/control
|
||||||
|
@@ -8,7 +8,7 @@ Uploaders: Tianon Gravi <tianon@debian.org>,
|
||||||
|
Build-Depends: debhelper-compat (= 13),
|
||||||
|
dh-golang,
|
||||||
|
go-md2man,
|
||||||
|
- golang-any,
|
||||||
|
+ golang-1.17,
|
||||||
|
golang-github-burntsushi-toml-dev,
|
||||||
|
golang-github-containerd-btrfs-dev (>= 0.0~git20200117.1539353~),
|
||||||
|
golang-github-containerd-cgroups-dev (>= 0.0~git20200817.7a3c009~),
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
1
kubernetes/containerd/debian/deb_patches/series
Normal file
1
kubernetes/containerd/debian/deb_patches/series
Normal file
@ -0,0 +1 @@
|
|||||||
|
0001-Update-to-Go-1.17-due-to-containernetworking-plugins.patch
|
Loading…
Reference in New Issue
Block a user