Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14886 from cotequeiroz/golang

Browse source 
treewide, affected packages: fix build with golang 1.16
This commit is contained in:
Rosen Penev 2021-02-24 16:54:34 -08:00 committed by GitHub
commit ea190c260e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/restic-rest-server/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=restic-rest-server PKG_NAME:=restic-rest-server
PKG_VERSION:=0.9.7 PKG_VERSION:=0.9.7
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION)
PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz
@ -43,6 +43,8 @@ API. It provides secure and efficient way to backup data remotely, using restic
backup client via the rest: URL. backup client via the rest: URL.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Package/restic-rest-server/install define Package/restic-rest-server/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/rest-server $(1)/usr/bin/restic-rest-server $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/rest-server $(1)/usr/bin/restic-rest-server

4
net/tor-fw-helper/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tor-fw-helper PKG_NAME:=tor-fw-helper
PKG_VERSION:=0.3 PKG_VERSION:=0.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.torproject.org/tor-fw-helper.git PKG_SOURCE_URL:=https://git.torproject.org/tor-fw-helper.git
@ -69,6 +69,8 @@ $(call Package/tor-fw-helper/Default/description)
This package provides the source files for the helper program. This package provides the source files for the helper program.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
$(eval $(call GoBinPackage,tor-fw-helper)) $(eval $(call GoBinPackage,tor-fw-helper))
$(eval $(call BuildPackage,tor-fw-helper)) $(eval $(call BuildPackage,tor-fw-helper))

3
utils/cni/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cni PKG_NAME:=cni
PKG_VERSION:=0.8.0 PKG_VERSION:=0.8.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk include ../../lang/golang/golang-package.mk
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Package/cni define Package/cni
SECTION:=utils SECTION:=utils

3
utils/containerd/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=containerd PKG_NAME:=containerd
PKG_VERSION:=1.4.3 PKG_VERSION:=1.4.3
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -36,6 +36,7 @@ define Package/containerd/description
An industry-standard container runtime with an emphasis on simplicity, robustness and portability An industry-standard container runtime with an emphasis on simplicity, robustness and portability
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
GO_PKG_INSTALL_ALL:=1 GO_PKG_INSTALL_ALL:=1
MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
MAKE_VARS += $(GO_PKG_VARS) MAKE_VARS += $(GO_PKG_VARS)

3
utils/docker/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=docker PKG_NAME:=docker
PKG_VERSION:=20.10.2 PKG_VERSION:=20.10.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -34,6 +34,7 @@ define Package/docker/description
The CLI used in the Docker CE and Docker EE products. The CLI used in the Docker CE and Docker EE products.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

3
utils/dockerd/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dockerd PKG_NAME:=dockerd
PKG_VERSION:=20.10.2 PKG_VERSION:=20.10.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -46,6 +46,7 @@ define Package/dockerd/description
The Docker CE Engine. The Docker CE Engine.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

4
utils/libnetwork/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libnetwork PKG_NAME:=libnetwork
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -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. 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 endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Package/libnetwork/install define Package/libnetwork/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))

4
utils/oci-runtime-tools/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=oci-runtime-tools PKG_NAME:=oci-runtime-tools
PKG_VERSION:=1.0.0-pre20210122 PKG_VERSION:=1.0.0-pre20210122
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -54,6 +54,8 @@ define Package/oci-runtime-tests/description
installable via npm. installable via npm.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Build/Compile define Build/Compile
$(call GoPackage/Build/Compile) $(call GoPackage/Build/Compile)
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))