From 34adc67d5b8bd4277142f652aeaea766d4e15ffe Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 8 Aug 2020 08:50:39 -0700 Subject: [PATCH 1/9] github: setup CI workflow configurations automated build + check-package + legal-info. Signed-off-by: Christian Stewart --- .github/workflows/buildroot-e2e.yml | 58 +++++++++++++++++++++++ .github/workflows/buildroot-e2e_defconfig | 22 +++++++++ 2 files changed, 80 insertions(+) create mode 100644 .github/workflows/buildroot-e2e.yml create mode 100644 .github/workflows/buildroot-e2e_defconfig diff --git a/.github/workflows/buildroot-e2e.yml b/.github/workflows/buildroot-e2e.yml new file mode 100644 index 00000000000..1136f7e6378 --- /dev/null +++ b/.github/workflows/buildroot-e2e.yml @@ -0,0 +1,58 @@ +name: CI + +# Controls when the action will run. +on: + push: + branches: [master, skiff, skiff-next] + pull_request: + branches: [skiff, skiff-next, upstream-master] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks + steps: + # Checks-out the repo under $GITHUB_WORKSPACE + - uses: actions/checkout@v2 + + - name: Cache build cache and downloads + uses: actions/cache@v2 + env: + cache-name: cache-buildroot + with: + path: ~/br-cache/ + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Makefile') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + + # Detect changes vs upstream-master + - name: Detect changes vs upstream-master + run: | + cd $GITHUB_WORKSPACE + git fetch + echo "::set-env name=CHANGED_VS_UPSTREAM::$(git diff --diff-filter=ACM --name-only origin/upstream-master | xargs)" + + # Run check-package on changed files + - name: Run check-package on all changed files and setup env + run: | + cd $GITHUB_WORKSPACE + ./utils/check-package $CHANGED_VS_UPSTREAM + + # Installing buildroot deps + - name: Install buildroot apt deps + run: | + sudo apt-get install -y libelf-dev + + # Test a build + - name: Run a generic build + run: | + cd $GITHUB_WORKSPACE + make defconfig BR2_DEFCONFIG=$(pwd)/.github/workflows/buildroot-e2e_defconfig + make -s all legal-info BR2_CCACHE_DIR=${HOME}/br-cache/ccache BR2_DL_DIR=${HOME}/br-cache/dl + diff --git a/.github/workflows/buildroot-e2e_defconfig b/.github/workflows/buildroot-e2e_defconfig new file mode 100644 index 00000000000..2bd0999459a --- /dev/null +++ b/.github/workflows/buildroot-e2e_defconfig @@ -0,0 +1,22 @@ +BR2_x86_64=y +BR2_x86_core_avx2=y +BR2_CCACHE=y +BR2_OPTIMIZE_FAST=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GCC_ENABLE_LTO=n +BR2_INIT_SYSTEMD=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_SYSTEM_BIN_SH_BASH=y +BR2_ENABLE_LOCALE_WHITELIST="C en_US en_US.UTF-8" +BR2_GENERATE_LOCALE="en_US.UTF-8" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="x86_64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_DELVE=y +BR2_PACKAGE_DOCKER_CLI=y +BR2_PACKAGE_DOCKER_CLI_STATIC=y +BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y From 9300b856c39f4e905ca5c8e51fd75ba9662fa4ca Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 20 Aug 2020 16:12:01 -0700 Subject: [PATCH 2/9] .github: add per-branch upstream file upstream: origin/upstream-master Signed-off-by: Christian Stewart --- .github/buildroot-upstream | 1 + .github/workflows/buildroot-e2e.yml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .github/buildroot-upstream diff --git a/.github/buildroot-upstream b/.github/buildroot-upstream new file mode 100644 index 00000000000..2a7b31d87ad --- /dev/null +++ b/.github/buildroot-upstream @@ -0,0 +1 @@ +origin/upstream-master \ No newline at end of file diff --git a/.github/workflows/buildroot-e2e.yml b/.github/workflows/buildroot-e2e.yml index 1136f7e6378..f9688808eb9 100644 --- a/.github/workflows/buildroot-e2e.yml +++ b/.github/workflows/buildroot-e2e.yml @@ -32,11 +32,12 @@ jobs: ${{ runner.os }}- # Detect changes vs upstream-master - - name: Detect changes vs upstream-master + - name: Detect changes vs upstream run: | cd $GITHUB_WORKSPACE git fetch - echo "::set-env name=CHANGED_VS_UPSTREAM::$(git diff --diff-filter=ACM --name-only origin/upstream-master | xargs)" + export BUILDROOT_UPSTREAM=$(cat .github/buildroot-upstream) + echo "::set-env name=CHANGED_VS_UPSTREAM::$(git diff --diff-filter=ACM --name-only $BUILDROOT_UPSTREAM | xargs)" # Run check-package on changed files - name: Run check-package on all changed files and setup env From 1be5956fabe356c70989d6c5f4aecd215eb15e23 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 16 Mar 2019 16:48:16 -0700 Subject: [PATCH 3/9] package/go: implement go modules integration The Go compiler needs to know the "import path" to the root of package source repositories. Previously, this was done by creating a fake _gopath in the build directory and symlinking the package source into that path. Go has deprecated the GOPATH mechanism in favor of a new approach - Modules - which specifies the root import path (and dependencies) in a "go.mod" file. This commit moves Buildroot to use the new go.mod approach. Both host and target Go packages compile correctly with small tweaks adjusting the build target specifier. Note: the Go module system will NOT download sources from the Internet due to GOPROXY=off and -mod=vendor. All Buildroot packages currently have "vendor" directories included with dependencies' source code. The environment variables passed to Go during host and target package compilation have been fixed to correctly pass CC, CXX, CFLAGS, and so on. Reference: https://github.com/golang/go/wiki/Modules Signed-off-by: Christian Stewart v2 -> v3: - cjs: cleaned up spelling and moved extract hook to configure step - cjs: applied fixes from vincent fazio related to host packages v3 -> v4: - cjs: clean up HOST and TARGET variables passed to Go - cjs: fix all CXXflags, cgo env vars to be consistent/correct - cjs: document / explain the difference from GOPATH --- package/go/go.mk | 55 +++++++++++++++++++++++++-------- package/pkg-golang.mk | 71 +++++++++++++++++++++---------------------- 2 files changed, 76 insertions(+), 50 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index 72604a250b9..74e5298e664 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -12,6 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache @@ -43,16 +44,51 @@ else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le endif -# For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) -HOST_GO_TARGET_ENV = \ - GO111MODULE=off \ - GOARCH=$(GO_GOARCH) \ - GOCACHE="$(HOST_GO_TARGET_CACHE)" \ +HOST_GO_COMMON_ENV = \ + CC=$(HOSTCC_NOCCACHE) \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + CXX=$(HOSTCXX_NOCCACHE) \ + GO111MODULE=on \ + GOBIN= \ + GOFLAGS=-mod=vendor \ + GOPATH="$(HOST_GO_GOPATH)" \ + GOPROXY=off \ GOROOT="$(HOST_GO_ROOT)" \ + GOTOOLDIR="$(HOST_GO_TOOLDIR)" \ + PATH=$(BR_PATH) + +# Used for compiling host packages. +HOST_GO_HOST_ENV = \ + $(HOST_GO_COMMON_ENV) \ + CGO_CFLAGS="$(HOST_CFLAGS)" \ + CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ + CGO_FFLAGS="$(HOST_FCFLAGS)" \ + CGO_LDFLAGS="$(HOST_LDFLAGS)" \ + GOARCH="" \ + GOCACHE="$(HOST_GO_HOST_CACHE)" + +# Used for compiling the host-go compiler and target packages. +HOST_GO_CROSS_ENV = \ + $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOARCH=$(GO_GOARCH) \ + GO_ASSUME_CROSSCOMPILING=1 + +# Used for compiling target packages. +# +# Note: CC and CXX must be set as well as TARGET_ variants. +HOST_GO_TARGET_ENV = \ + $(HOST_GO_COMMON_ENV) \ + $(HOST_GO_CROSS_ENV) \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ - GOTOOLDIR="$(HOST_GO_TOOLDIR)" + CGO_CFLAGS="$(TARGET_CFLAGS)" \ + CGO_CXXFLAGS="$(TARGET_CXXFLAGS)" \ + CGO_FFLAGS="$(TARGET_FCFLAGS)" \ + CGO_LDFLAGS="$(TARGET_LDFLAGS)" \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" # The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is # set, build in cgo support for any go programs that may need it. Note that @@ -64,13 +100,6 @@ else HOST_GO_CGO_ENABLED = 0 endif -HOST_GO_CROSS_ENV = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ - GO_ASSUME_CROSSCOMPILING=1 - else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go can still be used to build packages for the host. No need to set all # the arch stuff since we will not be cross-compiling. diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 2494ce028cf..2d80e99619f 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -23,21 +23,11 @@ GO_BIN = $(HOST_DIR)/bin/go -# We pass an empty GOBIN, otherwise "go install: cannot install -# cross-compiled binaries when GOBIN is set" -GO_COMMON_ENV = \ - PATH=$(BR_PATH) \ - GOBIN= \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) - -GO_TARGET_ENV = \ - $(HOST_GO_TARGET_ENV) \ - $(GO_COMMON_ENV) - -GO_HOST_ENV = \ - CGO_CFLAGS="$(HOST_CFLAGS)" \ - CGO_LDFLAGS="$(HOST_LDFLAGS)" \ - $(GO_COMMON_ENV) +# Used when compiling host packages. +GO_HOST_ENV = $(HOST_GO_HOST_ENV) + +# Used when compiling target packages. +GO_TARGET_ENV = $(HOST_GO_TARGET_ENV) ################################################################################ # inner-golang-package -- defines how the configuration, compilation and @@ -56,8 +46,6 @@ GO_HOST_ENV = \ define inner-golang-package -$(2)_WORKSPACE ?= _gopath - $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ -tags "$$($(2)_TAGS)" \ @@ -79,25 +67,36 @@ endif $(2)_INSTALL_BINS ?= $(1) -# Source files in Go should be extracted in a precise folder in the hierarchy -# of GOPATH. It usually resolves around domain/vendor/software. By default, we -# derive domain/vendor/software from the upstream URL of the project, but we -# allow $(2)_SRC_SUBDIR to be overridden if needed. +# Source files in Go usually use an import path resolved around +# domain/vendor/software. We infer domain/vendor/software from the upstream URL +# of the project. $(2)_SRC_DOMAIN = $$(call domain,$$($(2)_SITE)) $(2)_SRC_VENDOR = $$(word 1,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) $(2)_SRC_SOFTWARE = $$(word 2,$$(subst /, ,$$(call notdomain,$$($(2)_SITE)))) -$(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -$(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) - -# Configure step. Only define it if not already defined by the package .mk -# file. -ifndef $(2)_CONFIGURE_CMDS -define $(2)_CONFIGURE_CMDS - mkdir -p $$(dir $$($(2)_SRC_PATH)) - ln -sf $$(@D) $$($(2)_SRC_PATH) +# $(2)_GOMOD is the root Go module path for the project, inferred if not set. +# If the go.mod file does not exist, one is written with this root path. +# Replaces the old GOPATH/symlink mechanism for setting the root import path. +$(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) + +# Correctly configure the go.mod and go.sum files for the module system. +# Note: Go is configured to use the "vendor" dir and not make network calls. +define $(2)_APPLY_EXTRACT_GOMOD + if [ -f $$($(2)_PKGDIR)/go.mod ]; then \ + cp $$($(2)_PKGDIR)/go.mod $$(@D)/go.mod; \ + if [ -f $$(@D)/go.sum ]; then \ + rm $$(@D)/go.sum; \ + fi; \ + fi; \ + if [ -f $$($(2)_PKGDIR)/go.sum ]; then \ + cp $$($(2)_PKGDIR)/go.sum $$(@D)/go.sum; \ + fi + if [ ! -f $$(@D)/go.mod ] && [ -n "$$($(2)_GOMOD)" ]; then \ + printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \ + fi endef -endif + +$(2)_POST_EXTRACT_HOOKS += $(2)_APPLY_EXTRACT_GOMOD # Build step. Only define it if not already defined by the package .mk # file. @@ -111,26 +110,24 @@ endif # Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ + cd $$(@D); \ $$(GO_TARGET_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$(d) ) endef else # Build package for host define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ - cd $$($(2)_SRC_PATH); \ + cd $$(@D); \ $$(GO_HOST_ENV) \ - GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ $$($(2)_GO_ENV) \ $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ - ./$$(d) + $$(d) ) endef endif From e6eba233019ae0f5b9216b747714d3436df4c037 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 4 Dec 2019 16:30:25 -0800 Subject: [PATCH 4/9] package/runc: remove unnecessary workspace identifier Signed-off-by: Christian Stewart --- package/runc/runc.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 4c2f84ab161..aedfb5ef9e5 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,10 +9,7 @@ RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_WORKSPACE = Godeps/_workspace - RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - RUNC_TAGS = cgo static_build ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From c7dbf38a041ad803c6175a97cf3a64b3083c769c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 4 Dec 2019 16:34:05 -0800 Subject: [PATCH 5/9] package/docker-containerd: fix go-module package identifier/targets Signed-off-by: Christian Stewart --- package/docker-containerd/docker-containerd.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 5a44489065f..8b17e6997a5 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -9,13 +9,14 @@ DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINER DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE -DOCKER_CONTAINERD_WORKSPACE = vendor - +DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd DOCKER_CONTAINERD_LDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) - -DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim + -X $(DOCKER_CONTAINERD_GOMOD).GitCommit=$(DOCKER_CONTAINERD_VERSION) +DOCKER_CONTAINERD_BUILD_TARGETS = \ + $(DOCKER_CONTAINERD_GOMOD)/cmd/ctr \ + $(DOCKER_CONTAINERD_GOMOD)/cmd/containerd \ + $(DOCKER_CONTAINERD_GOMOD)/cmd/containerd-shim DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From 60d3f82fc2d7bb8e950da0fb1257e7ba3abb1dfd Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 4 Dec 2019 16:20:06 -0800 Subject: [PATCH 6/9] package/docker-engine: fix go-module package identifier Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 6bb382f5a7d..5809e3e6c48 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -11,14 +11,14 @@ DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-pkgconf -DOCKER_ENGINE_SRC_SUBDIR = github.com/docker/docker DOCKER_ENGINE_LDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ -X main.Version=$(DOCKER_ENGINE_VERSION) - DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd + +DOCKER_ENGINE_GOMOD = github.com/docker/docker +DOCKER_ENGINE_BUILD_TARGETS = $(DOCKER_ENGINE_GOMOD)/cmd/dockerd ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp From e95dbe2b04de5e85768c331092804ebb5af57179 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 4 Dec 2019 16:37:28 -0800 Subject: [PATCH 7/9] package/docker-cli: fix go-module package identifier Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 1466b0afbdc..07700809d51 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -13,12 +13,13 @@ DOCKER_CLI_LICENSE_FILES = LICENSE DOCKER_CLI_DEPENDENCIES = host-pkgconf -DOCKER_CLI_TAGS = autogen -DOCKER_CLI_BUILD_TARGETS = cmd/docker - +DOCKER_CLI_GOMOD = github.com/docker/cli DOCKER_CLI_LDFLAGS = \ - -X github.com/docker/cli/cli.GitCommit=$(DOCKER_CLI_VERSION) \ - -X github.com/docker/cli/cli.Version=$(DOCKER_CLI_VERSION) + -X $(DOCKER_CLI_GOMOD).GitCommit=$(DOCKER_CLI_VERSION) \ + -X $(DOCKER_CLI_GOMOD).Version=$(DOCKER_CLI_VERSION) + +DOCKER_CLI_BUILD_TARGETS = $(DOCKER_CLI_GOMOD)/cmd/docker +DOCKER_CLI_TAGS = autogen ifeq ($(BR2_PACKAGE_DOCKER_CLI_STATIC),y) DOCKER_CLI_LDFLAGS += -extldflags '-static' From ce7b2fe0b52e7d132cb17880dff4a4a331a028bf Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 7 Dec 2019 10:07:03 -0800 Subject: [PATCH 8/9] package/docker-proxy: fix go-module package identifier Signed-off-by: Christian Stewart --- package/docker-proxy/docker-proxy.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index 8843266c300..41ae07da091 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -12,9 +12,7 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE DOCKER_PROXY_DEPENDENCIES = host-pkgconf -DOCKER_PROXY_WORKSPACE = gopath - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy +DOCKER_PROXY_BUILD_TARGETS = github.com/docker/libnetwork/cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy From 140a35ff52f2f37cad94cc44f7ba60914963f1c6 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 13 Aug 2020 13:35:27 -0700 Subject: [PATCH 9/9] package/mender-artifact: fix go-module package build target Signed-off-by: Christian Stewart --- package/mender-artifact/mender-artifact.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index b2310d5bc21..a16e05c3ee0 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -40,7 +40,7 @@ HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION) -HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact +HOST_MENDER_ARTIFACT_BUILD_TARGETS = github.com/mendersoftware/mender-artifact/cli/mender-artifact HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME)