openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-01 00:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

docker-ce: fix vars order

Browse Source 
GO_PKG_BUILD_VARS should be put behind golang-package.mk,
otherwise it will be overridden.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-03-06 11:47:22 +08:00
parent d2ca698523
commit 6e6c10767b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/docker-ce/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=docker-ce
PKG_VERSION:=19.03.12
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE
@ -30,7 +30,6 @@ PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
GO_PKG:=github.com/docker
GO_PKG_BUILD_VARS += GO111MODULE=auto
include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk
@ -84,6 +83,7 @@ define Build/Configure
$(LN) $(PKG_BUILD_DIR)/engine $(GO_PKG_BUILD_DIR)/src/$(GO_PKG)/docker
endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
ifeq ($(CONFIG_DOCKER_SECCOMP),y)
BUILDTAGS:=seccomp
else