Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide, affected packages: fix build with golang 1.16 #14886

Merged
merged 8 commits into from
Feb 25, 2021
Merged

treewide, affected packages: fix build with golang 1.16 #14886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b732157
restic-rest-server: fix build with golang 1.16
cotequeiroz Feb 24, 2021
cffae02
tor-fw-helper: fix build with golang 1.16
cotequeiroz Feb 24, 2021
619270d
cni: fix build with golang 1.16
cotequeiroz Feb 24, 2021
2d48a7b
containerd: fix build with golang 1.16
cotequeiroz Feb 24, 2021
5b2d060
docker: fix build with golang 1.16
cotequeiroz Feb 24, 2021
8a4bb56
dockerd: fix build with golang 1.16
cotequeiroz Feb 24, 2021
d9f7dff
libnetwork: fix build with golang 1.16
cotequeiroz Feb 24, 2021
bb9641e
oci-runtime-tools: fix build with golang 1.16
cotequeiroz Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion net/restic-rest-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=restic-rest-server
PKG_VERSION:=0.9.7
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION)
PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz
Expand Down Expand Up @@ -43,6 +43,8 @@ API. It provides secure and efficient way to backup data remotely, using restic
backup client via the rest: URL.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto

define Package/restic-rest-server/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/rest-server $(1)/usr/bin/restic-rest-server
Expand Down
4 changes: 3 additions & 1 deletion net/tor-fw-helper/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=tor-fw-helper
PKG_VERSION:=0.3
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.torproject.org/tor-fw-helper.git
Expand Down Expand Up @@ -69,6 +69,8 @@ $(call Package/tor-fw-helper/Default/description)
This package provides the source files for the helper program.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto

$(eval $(call GoBinPackage,tor-fw-helper))
$(eval $(call BuildPackage,tor-fw-helper))

Expand Down
3 changes: 2 additions & 1 deletion utils/cni/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=cni
PKG_VERSION:=0.8.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand All @@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk

PKG_USE_MIPS16:=0
GO_PKG_BUILD_VARS += GO111MODULE=auto

define Package/cni
SECTION:=utils
Expand Down
3 changes: 2 additions & 1 deletion utils/containerd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=containerd
PKG_VERSION:=1.4.3
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand Down Expand Up @@ -36,6 +36,7 @@ define Package/containerd/description
An industry-standard container runtime with an emphasis on simplicity, robustness and portability
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto
GO_PKG_INSTALL_ALL:=1
MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
MAKE_VARS += $(GO_PKG_VARS)
Expand Down
3 changes: 2 additions & 1 deletion utils/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=docker
PKG_VERSION:=20.10.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand Down Expand Up @@ -34,6 +34,7 @@ define Package/docker/description
The CLI used in the Docker CE and Docker EE products.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

Expand Down
3 changes: 2 additions & 1 deletion utils/dockerd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=dockerd
PKG_VERSION:=20.10.2
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand Down Expand Up @@ -46,6 +46,7 @@ define Package/dockerd/description
The Docker CE Engine.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

Expand Down
4 changes: 3 additions & 1 deletion utils/libnetwork/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=libnetwork
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand Down Expand Up @@ -38,6 +38,8 @@ Libnetwork provides a native Go implementation for connecting containers.
The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto

define Package/libnetwork/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))

Expand Down
4 changes: 3 additions & 1 deletion utils/oci-runtime-tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=oci-runtime-tools
PKG_VERSION:=1.0.0-pre20210122
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

Expand Down Expand Up @@ -54,6 +54,8 @@ define Package/oci-runtime-tests/description
installable via npm.
endef

GO_PKG_BUILD_VARS += GO111MODULE=auto

define Build/Compile
$(call GoPackage/Build/Compile)
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
Expand Down