From patchwork Sun Mar 1 07:52:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247236 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb8x4G8bz9sSH for ; Sun, 1 Mar 2020 18:52:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B42E9861A4; Sun, 1 Mar 2020 07:52:31 +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 9idpDXzJW39n; Sun, 1 Mar 2020 07:52:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BC2386165; Sun, 1 Mar 2020 07:52:30 +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 C782F1BF3FE for ; Sun, 1 Mar 2020 07:52:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B9E8420002 for ; Sun, 1 Mar 2020 07:52:28 +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 hVpWDvX4a0iB for ; Sun, 1 Mar 2020 07:52:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by silver.osuosl.org (Postfix) with ESMTPS id 38E3F1FFC1 for ; Sun, 1 Mar 2020 07:52:27 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id i11so3024566pju.3 for ; Sat, 29 Feb 2020 23:52:27 -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=06wbsjzs4ZpswKDF34P4z+EmRp9LOOo7CEPFMedMCKw=; b=k0XSk3Zi1ahtf8j7FrK4y02cAdmYHFctAMNB9bRcQB64dB1AI9qLpZx9nFZmdC9LLy unm030BJD6xr+ZP0HaCUsYKNS/P6ddePEKr359SzsIPy8mrDN8vYfZ7P0NWUrvZP3Jpr D2IHEX+efv1/Dl0RmLa55v5G3EIIZl77KzmYExnsWb1ceZbwopckeymQf5oQq0BcUuJf c7iqCzBs7QfOnPCJKvGq1YPdYx5HtZUJkyOJ9sNci40XYi3nF0JSrrcsJZTqzWKZHaPP C27NMgCKk162r+jj3t8yyAfn0dNhv/9OhFlmA7aOHfpRFsDXmCu5rMeHl1XUug0oeyzD 5ivg== X-Gm-Message-State: APjAAAUYCZc+k8FduweC76hfjX6Ly/0v3GyKHKrt8FE5TCLkLTE/fEF8 d2eGceQxxqkGv4MxPhVDKYb7QcDoe9XdMg== X-Google-Smtp-Source: APXvYqygA1hklqNSKJmKYEujyNFmK9o+vKcmK0EyRqfLAbiRejSh7isjrS69Qw5Bs3sup6LTw6wS9A== X-Received: by 2002:a17:90a:16d7:: with SMTP id y23mr13694657pje.6.1583049146312; Sat, 29 Feb 2020 23:52:26 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:25 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:18 -0800 Message-Id: <20200301075223.1398715-1-christian@paral.in> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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. 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 v2 -> v3: - cjs: cleaned up spelling and moved extract hook to configure step - cjs: applied fixes from vincent fazio related to host packages Signed-off-by: Christian Stewart --- package/go/go.mk | 8 ++++++-- package/pkg-golang.mk | 31 +++++++++++++++++++------------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index 376c3db7f0..1291874b1d 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 go module downloads +HOST_GO_GOPATH = $(DL_DIR)/go-module ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) @@ -43,13 +45,15 @@ else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le endif -# For the convienience of target packages. +# For the convenience 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..7b5c263806 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -35,8 +35,16 @@ GO_TARGET_ENV = \ $(GO_COMMON_ENV) GO_HOST_ENV = \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ CGO_CFLAGS="$(HOST_CFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" \ + GO111MODULE=on \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOPROXY=off \ + GOROOT="$(HOST_GO_ROOT)" \ + GOPATH="$(HOST_GO_GOPATH)" \ + GOTOOLDIR="$(HOST_GO_TOOLDIR)" \ $(GO_COMMON_ENV) ################################################################################ @@ -60,6 +68,7 @@ $(2)_WORKSPACE ?= _gopath $(2)_BUILD_OPTS += \ -ldflags "$$($(2)_LDFLAGS)" \ + -mod=vendor \ -tags "$$($(2)_TAGS)" \ -trimpath \ -p $(PARALLEL_JOBS) @@ -79,23 +88,23 @@ 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_PATH = $$(@D) -$(2)_SRC_SUBDIR ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) -$(2)_SRC_PATH = $$(@D)/$$($(2)_WORKSPACE)/src/$$($(2)_SRC_SUBDIR) +$(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE) # 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) + if [ ! -f $$($(2)_SRC_PATH)/go.mod ] && [ -n "$$($(2)_GOMOD)" ]; then \ + printf "module $$($(2)_GOMOD)\n" > $$($(2)_SRC_PATH)/go.mod; \ + fi endef endif @@ -113,11 +122,10 @@ define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ cd $$($(2)_SRC_PATH); \ $$(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 @@ -126,11 +134,10 @@ define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ cd $$($(2)_SRC_PATH); \ $$(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 patchwork Sun Mar 1 07:52:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247237 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb933NTDz9sSH for ; Sun, 1 Mar 2020 18:52:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D50E586788; Sun, 1 Mar 2020 07:52:37 +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 4usepuMne0VR; Sun, 1 Mar 2020 07:52:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F45686223; Sun, 1 Mar 2020 07:52:31 +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 111121BF3FE for ; Sun, 1 Mar 2020 07:52:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09B8484B80 for ; Sun, 1 Mar 2020 07:52:29 +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 Xo9adRf_maxd for ; Sun, 1 Mar 2020 07:52:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5DE1884B23 for ; Sun, 1 Mar 2020 07:52:28 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id 2so3967655pfg.12 for ; Sat, 29 Feb 2020 23:52:28 -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=/xTlmx/ZZa5K+NJjri5VQ7KiDapPuBXbEhVgWtZk+/w=; b=HRfHvwPTwrRT/SzASjVr7L6nWXpovZNOFaMdJUxYldomsPrxCt/pt1V+1fGQQLppJN wluH4vXSoSR0GGvAbfqGKHriWGBhPKaXPKKBZk4K22ZhS0Mcxd8UIhHOR1RvbX0wvKp6 TRWoIsmmcxtMog95UnB3hseKyg/s849j1cuDivR+nDeQ8Uz33WV1JJ2UDlcS4T0LtNM/ M+CXFFbDd+Oy1bi+raYfWDdxj2lFmKWJBtVh3rYWV0FXhcDYK4PCh5ph6b8fWkjV6tW4 4UNyIxRPYV9qRegd0YHb6MwuymU2AbSPGm4JMJW9M4XlP4NWQEJF+2nyvbz/HdXks1iy yE6w== X-Gm-Message-State: APjAAAXLlKhcbH/fBqmquVyMJCZcI91E1NYGN2Z+kT4NmO/WlK7yX9RQ zos2n/bQZIExJsNxy+FCHJZbK0E8rTW9Pw== X-Google-Smtp-Source: APXvYqyajw3M3jN88gSPfahauDfXGKxj+pgoGLGpG7IjaPHAMeu7lwxoKhiY5uRPeDGVkmf+jCTFuQ== X-Received: by 2002:a63:ed4d:: with SMTP id m13mr13268439pgk.350.1583049147339; Sat, 29 Feb 2020 23:52:27 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:26 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:19 -0800 Message-Id: <20200301075223.1398715-2-christian@paral.in> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301075223.1398715-1-christian@paral.in> References: <20200301075223.1398715-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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 4c2f84ab16..aedfb5ef9e 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 Sun Mar 1 07:52:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247239 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb985NpQz9sSH for ; Sun, 1 Mar 2020 18:52:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F1D71869F2; Sun, 1 Mar 2020 07:52:42 +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 kL5bTAuMGsjF; Sun, 1 Mar 2020 07:52:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 22EEA86569; Sun, 1 Mar 2020 07:52:34 +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 22E9B1BF3FE for ; Sun, 1 Mar 2020 07:52:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E4BC861A4 for ; Sun, 1 Mar 2020 07:52:30 +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 eBOTt0aB5F02 for ; Sun, 1 Mar 2020 07:52:29 +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 7946F860DB for ; Sun, 1 Mar 2020 07:52:29 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id i13so3994262pfe.3 for ; Sat, 29 Feb 2020 23:52:29 -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=cOrbSHOgKcCC5y3BYWzrjlV7S4170ea6W7nCZor3gAg=; b=tSRjzu5zR2X/TPnQG6U7lA/tVlHK8PE4CE6UxsrJR+5L3MzaaOQmRFPjlo2ml7Wf+F 0fIew29CvKmQZlSyYV9+HGP4utNoFlcp9QiNK/7z7S6QKQFUWClCydF3yMLpYzhYHd9k dVMlqewe0ueoM2bjCh8CTqo9pjFpyA11ydGkll39h8Jj66oPNBzr8n1Bd/t9atctQBwS 9IXmWAmG6lzznOZoQeizS/yxYU3dqBtoaCpkySxDOYlTiU3eWIKJmmrag9Y9A7OSLRcJ 6n6lAMccjxB5MF4TxthMT53DbwdwNYDeMcsf8j0t6eZ/tpq52cJ6qUBqgJAIMBbXU7Bn KuoA== X-Gm-Message-State: APjAAAUKSQ/v4AONtZ6apGYeaLv4/5Gq/rbqml5M37LFBrZIo0vKUgvT GHFQCBWtV6Kams1LA3SKQM8QiB3yBNHq8A== X-Google-Smtp-Source: APXvYqzUjOkIaiPlrajwBxUHQI73PQDSlV5PR8eDVWC/RoSTQ5NE8c7BXqZxPSfhzrMV8v49gllvSQ== X-Received: by 2002:a63:291:: with SMTP id 139mr12965622pgc.342.1583049148725; Sat, 29 Feb 2020 23:52:28 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:28 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:20 -0800 Message-Id: <20200301075223.1398715-3-christian@paral.in> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301075223.1398715-1-christian@paral.in> References: <20200301075223.1398715-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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 67de8d7468..0a971850d0 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 Sun Mar 1 07:52:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247240 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb9H05bGz9sSH for ; Sun, 1 Mar 2020 18:52:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 087F4861CF; Sun, 1 Mar 2020 07:52:47 +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 o5IDMINr7gMc; Sun, 1 Mar 2020 07:52:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0979086767; Sun, 1 Mar 2020 07:52:37 +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 3E5D71BF3FE for ; Sun, 1 Mar 2020 07:52:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3B28887F52 for ; Sun, 1 Mar 2020 07:52:31 +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 L5RRDKy+jkjD for ; Sun, 1 Mar 2020 07:52:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9184887F50 for ; Sun, 1 Mar 2020 07:52:30 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id t24so3803655pgj.7 for ; Sat, 29 Feb 2020 23:52:30 -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=ZSzqHEySG1s20FKmXLiCqHhbKwxWrKiaL8RF+724rWU=; b=R524RC2FhQMU6ZJTsfHBi9XYXHcEfgTjr74WvH+mKwQfxRvPJIeRLzAYZb+VP35ZB0 sepunFbI5v/IVsQl+N/2CmLZWNNWOrZyQevEgBucYfOcWbvnI9dyE3k38DBGhKYbopXL +vaHPZihPPfZ4FVRp+qVJkaFTdhFdE0qru8JiOSAcyeUCK8XCxgOk1ORf1azDFaKisxq rTre9px033BvcZ103e0cGmfHuWWE+pgNuQ9Dpoj2XlyeG/h9f2ogKfEI155Ar5xJt8i+ S0AyNO+2X5Qzsfp95CcsAu0YAODDb42TNBE2crnqnjcXGxjc1EvRdDWZzMYYkj3lSssC gC/A== X-Gm-Message-State: APjAAAWa2OmfFkCVMlYhvgpaeiks4r+hsBVFsawMU2WlU492WLpQzbH3 iCXFHoYCjpnOEFz8r2yCcn/V/A63JroTEw== X-Google-Smtp-Source: APXvYqzLkwn6PJxpU7KULDobox4rhjRm9GUxmtj5CSSDiLYrWrYVh9Kcr6BR46fMos9UrdsiqFmOpA== X-Received: by 2002:a63:4823:: with SMTP id v35mr12941242pga.177.1583049149819; Sat, 29 Feb 2020 23:52:29 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:29 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:21 -0800 Message-Id: <20200301075223.1398715-4-christian@paral.in> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301075223.1398715-1-christian@paral.in> References: <20200301075223.1398715-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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 Sun Mar 1 07:52:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247241 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb9J6M6Yz9sSH for ; Sun, 1 Mar 2020 18:52:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9AD2E8781D; Sun, 1 Mar 2020 07:52:49 +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 T0m2MN4tfTey; Sun, 1 Mar 2020 07:52:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 56D4F86223; Sun, 1 Mar 2020 07:52:38 +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 332C01BF3FE for ; Sun, 1 Mar 2020 07:52:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3059E87F52 for ; Sun, 1 Mar 2020 07:52:32 +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 B3YZL09f6ypm for ; Sun, 1 Mar 2020 07:52:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by hemlock.osuosl.org (Postfix) with ESMTPS id 91C2087F50 for ; Sun, 1 Mar 2020 07:52:31 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id 6so3821707pgk.0 for ; Sat, 29 Feb 2020 23:52:31 -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=Glr8FgVv4yFlzKbqq8m/NbWQ0I7ruF25Qc08+EPW9lY=; b=Eo8wRr/AcbaBCz8yhQR5B5K8MfOPdiEpebjSDYi84V3oPNjU3q2HDNHyx9974w3E2z x5apLUlhjKW1fVW05M4X+JgWDGW3bMYzfPNyVYUrASXNwSvpBVO+YyhzVeL/CpJ83L4j ra/sU9GFeGWurW5yddZRdZFQZUO3hEzlvyeOm+FlkSlH0Vi1Mzqr4wd7w/SvinooUDA0 sbp/u1rlI56hK3mZKgNy/YwmGvTeKc6MjrYI5G8Gm0LHKRy1jhe3dqIfzkjzuOWGhKPO suOTpNB8u8AKqv/KcBdl0z+pMPUSBLHN6wTaQ9t4cmPDy5QdBIANh0qjWBXGx1CDUf1t G6/w== X-Gm-Message-State: APjAAAUSXqjaFi0S6JeyjfeSTh5ZLS/8SRMiW0MaAFR8m22XxHdYF6AS S8CA3LkAuj/h7BZoWd/TinUkRO/ff1ghgA== X-Google-Smtp-Source: APXvYqzRv5LSbbW+F2DvGkxDpLAqoa+usli6RDqIq8cxA9olHHSsqmkg7OagW33IEDdrY8Kiw46fvg== X-Received: by 2002:a65:5b04:: with SMTP id y4mr13787310pgq.25.1583049150864; Sat, 29 Feb 2020 23:52:30 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:30 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:22 -0800 Message-Id: <20200301075223.1398715-5-christian@paral.in> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301075223.1398715-1-christian@paral.in> References: <20200301075223.1398715-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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 Sun Mar 1 07:52:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 1247238 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com 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 48Vb962VtNz9sSH for ; Sun, 1 Mar 2020 18:52:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AC1B41FFC1; Sun, 1 Mar 2020 07:52:40 +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 4lbyIZvMPaJX; Sun, 1 Mar 2020 07:52:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 984E920002; Sun, 1 Mar 2020 07:52:39 +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 541D51BF3FE for ; Sun, 1 Mar 2020 07:52:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5132287F52 for ; Sun, 1 Mar 2020 07:52:33 +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 ks+SsTL3OFka for ; Sun, 1 Mar 2020 07:52:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9765087F50 for ; Sun, 1 Mar 2020 07:52:32 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id q4so2954027pls.4 for ; Sat, 29 Feb 2020 23:52:32 -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=85YWgJDw6IvpwjqhQWfRpYBi38BRmEnuphCwODRxv8I=; b=rRjCbYuk3UcFQ0l44V1l9kj7WkdSg88PWCQJBL9kddtQmPcOKMY7bjVVDwkd4zPo4v 4yxfpYG67H7k3J/esOBl+Gl90uf9//TGbY0GDTtBXFoJWlxLMgmkusXVq2O4CYqf1YlP KCAJwS9sVBYVKzlE3FBnWE9EkR2Mby3gS1iiy8jGTNz8lidZXOnM35YsWLvswA9MZ6Oe NG0OkZBAM15DQXlSwBVfcCFF7GQodhu8g2YXI3u4O8T5nO6744v8a+DIwXXqZmx90fq9 PubGnBJQ1FR5EoD0WNZWl9zpcEnAFcb3mmgLHuZ/MGAFxmtuEBGdM7poyLmwguSqGfCl 5CWg== X-Gm-Message-State: APjAAAUkOMjv7OTf1sft7EEPp7t5o0q1trY99GuzdGMkjrvl0qZZy3RY i9tEwbovlrPTrleOD74QVYozRzPeEkFRSA== X-Google-Smtp-Source: APXvYqyyT9X6wBH2/PWemBPaaPIIPLGAgqoON+d2SPJat8ZsjiTg1b9b1w9lkSNL2vpqSzJHjct13Q== X-Received: by 2002:a17:90a:a88d:: with SMTP id h13mr13476810pjq.55.1583049151898; Sat, 29 Feb 2020 23:52:31 -0800 (PST) Received: from localhost.localdomain (cpe-172-91-135-199.socal.res.rr.com. [172.91.135.199]) by smtp.gmail.com with ESMTPSA id 190sm15955676pga.85.2020.02.29.23.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Feb 2020 23:52:31 -0800 (PST) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 29 Feb 2020 23:52:23 -0800 Message-Id: <20200301075223.1398715-6-christian@paral.in> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200301075223.1398715-1-christian@paral.in> References: <20200301075223.1398715-1-christian@paral.in> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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 , Vincent Fazio , 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