From patchwork Sat Jan 11 04:13:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221527 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmh06qt3z9sP6 for ; Sat, 11 Jan 2020 15:14:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2926B22246; Sat, 11 Jan 2020 04:14:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ewTswfmK6KwA; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D67E220481; Sat, 11 Jan 2020 04:14:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BE42A1BF30F for ; Sat, 11 Jan 2020 04:13:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BAAD887D39 for ; Sat, 11 Jan 2020 04:13:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JtIiLi8hbNhM for ; Sat, 11 Jan 2020 04:13:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id BE122884E7 for ; Sat, 11 Jan 2020 04:13:57 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id 4so2098743pfz.9 for ; Fri, 10 Jan 2020 20:13:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Zd2IVOZxonQoYEQieCN7Ch12FA/+ihdw+0h4aptSd04=; b=R+kgKDxdrIJDDsaZ9624HCCqqV4c+kH1Wnxy5agh+3LMo0XtxP5rBKI1pQzoueuACv NtrQGp2ZKe7HUcpeJcGIi867mi0HKQ3tpU0b7r2kc+EhsG2lDDTQIYRoV6EtQ3Lj0QKT OLeOkCoSHCyphnhc2EhJ8xBCikj3CbYOMWw7eURUKTd9MzvLGSgC7bbl+VFtqxFXTVcr fHZ8VoJilZSuHvW8gT7oCiD4d2KleuSnvhiclKy8yw3EFsuQ2LCBMGp4R9+xYHc1loMM 2Ra3WymdvpWUBx3zx97Ediu+CbZ1CVcqU1xU5JRRoBHmrWD+VL6SLA0CFJUkH13asc6T L5xg== X-Gm-Message-State: APjAAAXR1Djhlcp6hQA2GTFxAbVjYhebv5T7WoHhc+9b+L31OcnKiD4D /Z/MFF69kxgJY3yD1ehbbZVw2A+Qkuo= X-Google-Smtp-Source: APXvYqzPuK0dFsEllGIYupRLUgx2SIXeGjSkxD2xYZb+jD1HpJcQ3dIqi07e+jAtwB5tkOA4nO3Y6w== X-Received: by 2002:a63:2ccc:: with SMTP id s195mr8453940pgs.75.1578716036874; Fri, 10 Jan 2020 20:13:56 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:13:56 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:50 -0800 Message-Id: <20200111041355.21705-1-christian@paral.in> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/6] package/go: implement go modules integration X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit moves from the GOPATH mechanism to the new GO111MODULE approach for Go based packages. Old Go packages compile with small tweaks. All Golang packages currently in Buildroot have been build-tested after the change. The Go module system replaces the GOPATH mechanism by allowing the Go tool to work with packages correctly without a GOPATH tree. Reference: https://github.com/golang/go/wiki/Modules Signed-off-by: Christian Stewart --- package/go/go.mk | 6 +++++- package/pkg-golang.mk | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index a0f796c21b..46acda7dd0 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -15,6 +15,8 @@ HOST_GO_DEPENDENCIES = host-go-bootstrap 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 +# used for the Go module and build cache +HOST_GO_GOPATH = $(DL_DIR)/go-module ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) @@ -46,10 +48,12 @@ endif # For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ - GO111MODULE=off \ + GO111MODULE=on \ GOARCH=$(GO_GOARCH) \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOPROXY=off \ GOROOT="$(HOST_GO_ROOT)" \ + GOPATH="$(HOST_GO_GOPATH)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ GOTOOLDIR="$(HOST_GO_TOOLDIR)" diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 2494ce028c..7fbf44b1c7 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -60,6 +60,7 @@ $(2)_WORKSPACE ?= _gopath $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -mod=vendor \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) @@ -79,25 +80,34 @@ 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)_GOMOD can be overridden. $(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 ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) + +# Correctly configure the go.mod and go.sum files for the module system. +# TODO: Perform the "go mod vendor" download step. +# Today, we still only support modules with a vendor/ tree in the source. +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,13 +121,12 @@ 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 From patchwork Sat Jan 11 04:13:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221526 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmgx4Wpyz9sP6 for ; Sat, 11 Jan 2020 15:14:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6B487834ED; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FvNY7udnGCFm; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E70218457E; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 147691BF30F for ; Sat, 11 Jan 2020 04:13:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0D9F78457E for ; Sat, 11 Jan 2020 04:13:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ENRmcMWLD44X for ; Sat, 11 Jan 2020 04:13:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 99974834ED for ; Sat, 11 Jan 2020 04:13:58 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id a33so1941799pgm.5 for ; Fri, 10 Jan 2020 20:13:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M8fLPpxKqdsqqg7EBendLrQs+Bs7RJGgs0Uyt4ibS0U=; b=DpZ4oMZM8ek36AKhlYnL1D9W88riMv4C0oSQD8LuFjKV/729MwUJjOOXCuYe1dI4s3 DbPOUML8wQpj+V2OJPyVOjeXft/uEi11PmxGeQfU9ZXRRPgSNuOZcvcXZao2s0gdkcbK t10tGx8sq1Sdff87PdbB6JSWjR5fSKPeeSO41uQ242hFQKByhOsZrVCS1ia0bP9mIV1q xG4A7RQQtXhhVncUQoYwd6Ta94U8Cmefz+qr/JNcUkuQdQfxaBlwhP8Ww4m7ORmEWmwi PmcbfkUKuV9gI4JaLCh1TVm/0t0pcoSGoxDJBKZvmWxZ2+HeHUEf65gB2mSB83lBtbd4 WP+Q== X-Gm-Message-State: APjAAAVz+hNGnXCgftfTb6o/ydyhrvjVi3TtUbJy0UZjo59UOZEpnOge CIMsAqWI+XIotXkeX3W5YzuLU+v19ms= X-Google-Smtp-Source: APXvYqxiz3GgrQRBsUzc5zftCqpRxenOAkl+f28tORY3/RVz4URBKhYYzqfVjWUOj7DoD5xoWaGjGA== X-Received: by 2002:a63:1101:: with SMTP id g1mr8401122pgl.435.1578716038045; Fri, 10 Jan 2020 20:13:58 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:13:57 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:51 -0800 Message-Id: <20200111041355.21705-2-christian@paral.in> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111041355.21705-1-christian@paral.in> References: <20200111041355.21705-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/6] package/runc: remove unnecessary workspace identifier X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 acf61ab160..9a237aca38 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 patchwork Sat Jan 11 04:13:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221528 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmh20N29z9sPn for ; Sat, 11 Jan 2020 15:14:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 91DC685455; Sat, 11 Jan 2020 04:14:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xNgtsMI2kh6S; Sat, 11 Jan 2020 04:14:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2F75684E66; Sat, 11 Jan 2020 04:14:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 559FE1BF30F for ; Sat, 11 Jan 2020 04:14:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 467B72046C for ; Sat, 11 Jan 2020 04:14:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Em3ESk8eOFb9 for ; Sat, 11 Jan 2020 04:13:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by silver.osuosl.org (Postfix) with ESMTPS id A5A4E203BF for ; Sat, 11 Jan 2020 04:13:59 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id i23so2114976pfo.2 for ; Fri, 10 Jan 2020 20:13:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6D0FeRsBAvVaL/LCex6XoYjN8A1WiQu/kDwnPbsHnXM=; b=PbyBgES68psCla73/RCTKEtk4myg9HLYoje10C27LVk1QBitLpdIH1B7DIrr3uxZjJ RGQ0YXOV9RtqjQ0QZbSqU1arBX5tyHzrwMbbARWJbTFbJBufArghS8ciKdojM/td5QVT Fkm3lwOolCHe4ZYrAfbliA0ibbIeqhg5X3+hFuPVNgT4KtYqR1Zt/OSivcD7AFkcIg0D 0640JAdWqOZBIjIKS8YEakt9AJFldLluFH1O9dRPFWToM4b1AwAmXQKYo35tm7t8r6la DxprWbJKNhVyBjfQeApEfeVPjhcGtjPh8vL9ZrkGDHst+VJZjyrpc7fZ3xW8VFty2uy+ vHdg== X-Gm-Message-State: APjAAAVg2d1BZCBu3i8YFy50ZkzV4xLGLqv8GbNLQ4C3w6wyMNlWhvPN IJgrOjg/QTuo+SIH/njoSZ4wgTSTbac= X-Google-Smtp-Source: APXvYqyDwx95rmf+GrikxX3l3dUPQVq8OccvrxXEfJeS+n2pOYcCUTBeJTEnX3niw0MNhm2wlmqa5w== X-Received: by 2002:a63:5203:: with SMTP id g3mr8327469pgb.377.1578716038973; Fri, 10 Jan 2020 20:13:58 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:13:58 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:52 -0800 Message-Id: <20200111041355.21705-3-christian@paral.in> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111041355.21705-1-christian@paral.in> References: <20200111041355.21705-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/6] package/docker-containerd: fix go-module package identifier/targets X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 69068e44f8..1d090d2326 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 patchwork Sat Jan 11 04:13:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221530 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmh31JCFz9sR0 for ; Sat, 11 Jan 2020 15:14:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9F571203BF; Sat, 11 Jan 2020 04:14:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZFxHWnn5b2RM; Sat, 11 Jan 2020 04:14:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 375D722854; Sat, 11 Jan 2020 04:14:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E02531BF30F for ; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DBBB222177 for ; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EmwrpGYlty1s for ; Sat, 11 Jan 2020 04:14:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by silver.osuosl.org (Postfix) with ESMTPS id 8690B203BF for ; Sat, 11 Jan 2020 04:14:00 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id g6so1626264plt.2 for ; Fri, 10 Jan 2020 20:14:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MF1+cZe3eN0XGioNJeZ+O3sKp1Eb7RMIRAs99Rusrvk=; b=mDTkCUS8VLZGZdQFvSreaoRwf6nxrDxDW/n5hrVDdH8OkqIaRmCQMFrMs+RsvSpRcQ FD57k/tueOj8kZo7jkpAV/VpyaOWLBC88l6QvvwD5TUN9K7OV1t1YgHeDMlWkC9ZoCMM 9mFRzypb7Truq2Sy6BVHFUjT3Ad7/DoOLpFm4k0HdaxNw+7NRzTKTR62Me1BwMuA/zWB MOLAyRI93Gyh8pJU3bZbkOqPdP3JlS9cF64kY9rc6nwl6T2sj2vQ5zkw1a0yOWCvhmlw ciMEgNvhmgJhR91zu4l/qx6vr6atRMn+6IAGbyPpCksEDAGv+DuEMx+9yLztLELpub0J I2kg== X-Gm-Message-State: APjAAAUbeidvew/UKeIgNwhtHU9ipsHf+xixMQsdR7rE0wo+NGNDKnl1 qNFxmjSfC8pvwG9FDDM/jxPID9iMqiQ= X-Google-Smtp-Source: APXvYqxhjC+VjuTguoSgExBbs4/BJvR/TQ263V2QTN/y6udX6O34QCBCYOHrDz9AEh4t2cWUYpzjOg== X-Received: by 2002:a17:90a:17e3:: with SMTP id q90mr9148769pja.139.1578716039883; Fri, 10 Jan 2020 20:13:59 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:13:59 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:53 -0800 Message-Id: <20200111041355.21705-4-christian@paral.in> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111041355.21705-1-christian@paral.in> References: <20200111041355.21705-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/6] package/docker-engine: fix go-module package identifier X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 eb3a7fd29f..e44d561b45 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 patchwork Sat Jan 11 04:13:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221531 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmh70RZNz9sP6 for ; Sat, 11 Jan 2020 15:14:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CF8F854C0; Sat, 11 Jan 2020 04:14:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZRSqXZLsrshd; Sat, 11 Jan 2020 04:14:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 89A0F85456; Sat, 11 Jan 2020 04:14:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8C8051BF30F for ; Sat, 11 Jan 2020 04:14:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 86515884E7 for ; Sat, 11 Jan 2020 04:14:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ig54qs0yyjlD for ; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8323D87D39 for ; Sat, 11 Jan 2020 04:14:01 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id f20so1617348plj.5 for ; Fri, 10 Jan 2020 20:14:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2z7gO5uYOiLPnYcLSaPb4zkGZkC6mlOfdYRBgj0O5jo=; b=HSp9pW2HCSJzlgJv7exFUuwcaWQVuQp7CWdBUCMZ5VUb/XlixneLVBWFskWcmpTaAx fWnPYxJ98FMNv7k0wam5TOLszJC7Hhmv1qL2KHiaexIbWeBcTs6ueZoVo1FtZJNcs60W kSliEJzWin1XTyaCui2zRfV5u+YmbUl7SZOcn0GosAPWHuNY0OFo9h9bjlxwiDH+IbSD 7bmEmGQrDH0UKTYht3jB1+FPrR9MYqKeT9DZBowoxiSg6Ux5ROWp7TRDtzcKIMUWDhuJ zGwttzOqew+Wq7f2aIuYIvEv/+RR5ZJ9CsKrp3b/5gcTvk+PUdzKDwAxX133Uv9elps2 bMqA== X-Gm-Message-State: APjAAAXewcynkca3jEc1iXT1RpHE3l+JwOPelofvxG8Hh47IBQYj9+Yt zidkGI/MXinonjnuekybGZrd0PAeYS0= X-Google-Smtp-Source: APXvYqzzTS5PL6Ztdc8xe2ut4qkDJKmPWN2RcmItr5X9+zFGXRiGfDjB8IDveUcchsKLiUCTbH+0SA== X-Received: by 2002:a17:902:a5c1:: with SMTP id t1mr8502989plq.87.1578716040582; Fri, 10 Jan 2020 20:14:00 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:14:00 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:54 -0800 Message-Id: <20200111041355.21705-5-christian@paral.in> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111041355.21705-1-christian@paral.in> References: <20200111041355.21705-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 5/6] package/docker-cli: fix go-module package identifier X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 4ad30e0278..12fb563885 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 patchwork Sat Jan 11 04:13:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1221529 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=paral.in Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47vmh26bgjz9sP6 for ; Sat, 11 Jan 2020 15:14:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 598FC87D39; Sat, 11 Jan 2020 04:14:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DoCPdAHstgtF; Sat, 11 Jan 2020 04:14:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 941C8884E7; Sat, 11 Jan 2020 04:14:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ED6731BF30F for ; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E7D8084BE7 for ; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iForbvAQ6wxQ for ; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id 474E68455E for ; Sat, 11 Jan 2020 04:14:02 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id x185so2110413pfc.5 for ; Fri, 10 Jan 2020 20:14:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mdfrHIdEsbp58tXL/Pqy09x5q6mgN6TP6yAl0JdgtFA=; b=Hpk2ynCs9RtpChsZpnId7etFROYyP8n9ghDRd3K5Sbag+uWZ1zdndn6Bt10F4I4agX ZfhLgxwOX6qgTZ/RASlGlTeOxiUXiezYmeFuT78edQKBbm1XdMaI02zuvVvKUqIphCj2 Ma05VFV0SXICxTfKg9V052ohF7eQSqDyOXQvGmTm67zYiB2cTqGlBmsw4pSmYvVWU3pi p0ziqJWoRwp0JPm/kHOSAZbNxb2y6hvpYVOa3kS2qncyyT7CDKeVgo01uzjp8cv3XVcy 5BQ6IqJbeDoMpdfLZaCkQHN7KznMYCMUMwJY57Utfhvy5wroeZfTmkRwbg9LEwxZ4gyg Td1A== X-Gm-Message-State: APjAAAXi+KoBIzG9/HPEB8Ol5oQ+0leKm1BWM4SLIwDtvbGYCAk3V6u4 CnShCTOm1xWLR3VvYWCCWXXKAZq1Eao= X-Google-Smtp-Source: APXvYqwt7Kq4edanRa9qK8qXGLYhP99xjYk96lrVkRuWqrDre+J9O8RV8ZoqDfNOn33TpwN3oPKeOA== X-Received: by 2002:a63:e14b:: with SMTP id h11mr8308561pgk.297.1578716041621; Fri, 10 Jan 2020 20:14:01 -0800 (PST) Received: from localhost.localdomain ([165.254.106.58]) by smtp.gmail.com with ESMTPSA id o16sm4368779pgl.58.2020.01.10.20.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:14:01 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Fri, 10 Jan 2020 20:13:55 -0800 Message-Id: <20200111041355.21705-6-christian@paral.in> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111041355.21705-1-christian@paral.in> References: <20200111041355.21705-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 6/6] package/docker-proxy: fix go-module package identifier X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Christian Stewart , Anisse Astier , Thomas Petazzoni , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 8843266c30..41ae07da09 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