From patchwork Wed Oct 25 09:26:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 830155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SaZhe4cK"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yMPtH47VKz9sNx for ; Wed, 25 Oct 2017 20:27:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8106089500; Wed, 25 Oct 2017 09:27: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 MvZ5TiUayyTg; Wed, 25 Oct 2017 09:27:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 94666894F5; Wed, 25 Oct 2017 09:27:09 +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 4726C1C0621 for ; Wed, 25 Oct 2017 09:27:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 417E588C55 for ; Wed, 25 Oct 2017 09:27:03 +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 sHKses8Jlq3j for ; Wed, 25 Oct 2017 09:27:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9A321824FD for ; Wed, 25 Oct 2017 09:27:02 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id u138so543172wmu.5 for ; Wed, 25 Oct 2017 02:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N4KFTZQ3vxlnI5dsMDmlXewwK0nONFaXqPPkiNEzOZE=; b=SaZhe4cKNILHSAFe0sNyKkaFjyUo7MYELxIKHkjeXpCiiL6kPglQ2/bDicGYd+O0Cu Aojc8gan4F/QImRsfwtlvhAa4TzafhiPfJRlw9rlDpb48ernfRvuungcLiA61mxt1VBb Uy7BeMDrlF0NjptQrPdWZiWzQRSNj6u0pvj7b7YoM75USZKxBp0gjAWgxNPbCH1EdRnT UIpsFkoHQQRbNh7VTRO4bHpXGEty2oGFjNopzAvOHxk7PJsenrF6UbvKOmgb0hGIDAQI WrUx2ioRMPMdelBmMtunkHeKnWJzC6HJTAAeEWuSt5BjxF4e6N6VVaXVKsEVWCRWcSTK choA== 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; bh=N4KFTZQ3vxlnI5dsMDmlXewwK0nONFaXqPPkiNEzOZE=; b=obrNjZTmxfapdDLliVB3zaOi21JJKtUSH0gxRQh1E3kDkrBaq2qvvQiAjq1CY9EaDH Msi9lSglpGOYy2+9P7fkwb/x0xwaPF1DAAWmxAWpVc0lsX29CODC1/os0bKNN8wdqCU/ iYalpIvair9bQOM0RayXXSiylpBfgJG5FtrUSFkuRgSDd+R4GtgWozGItqq8MWlbu3z3 9Kvl6nIXsJYyUYv4JKJeQ36zVRU56w2YCWYRfcALkL3xdWjmD+rY/CIR98b0DT76WkU9 pbciZiFIaXTx3SqytcuwbRYeeMj3dIbRQKvFv5V5CFXys51o23YjPK2n56kQegrqcahl k0oA== X-Gm-Message-State: AMCzsaUUqTKw8s16zuyedyLdQ4P9lYeTcIO9qwEVxp8BAfoHiKttcjbg wxQeV9Xx9hEWyqJ62f7M6uP9teLm X-Google-Smtp-Source: ABhQp+QL+pRqFv+d2GJxrQaR+rNnDzJkvQsM9WRNZ0YpeOifjj2YQcKA0lto3wY6iWdaOb8OzhcdDg== X-Received: by 10.28.180.2 with SMTP id d2mr1045586wmf.118.1508923620655; Wed, 25 Oct 2017 02:27:00 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id q7sm2009311wrg.97.2017.10.25.02.26.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Oct 2017 02:26:59 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 25 Oct 2017 11:26:49 +0200 Message-Id: <1508923609-2022-5-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508923609-2022-1-git-send-email-angelo.compagnucci@gmail.com> References: <1508923609-2022-1-git-send-email-angelo.compagnucci@gmail.com> Cc: christian@paral.in Subject: [Buildroot] [RFC v5 5/5] package/docker-containerd: converting to golang infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch converts the docker-containerd package to the new golang infrastructure. Signed-off-by: Angelo Compagnucci --- package/docker-containerd/docker-containerd.mk | 37 +++++++++++--------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index ffbadb0..34e7674 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -9,39 +9,32 @@ DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VER DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code -DOCKER_CONTAINERD_DEPENDENCIES = host-go +DOCKER_CONTAINERD_GOPATH = vendor -DOCKER_CONTAINERD_GOPATH = "$(@D)/vendor" -DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_CONTAINERD_GOPATH)" - -DOCKER_CONTAINERD_GLDFLAGS = \ +DOCKER_CONTAINERD_GO_LDFLAGS = \ -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' -endif - -define DOCKER_CONTAINERD_CONFIGURE_CMDS - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker - ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers - ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc +define DOCKER_CONTAINERD_LINK_DIR + ln -sf $(@D) $(@D)/$(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd + mkdir -p $(@D)/$(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers + ln -s $(RUNC_SRCDIR) $(@D)/$(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc endef +DOCKER_CONTAINERD_POST_CONFIGURE_HOOKS += DOCKER_CONTAINERD_LINK_DIR + define DOCKER_CONTAINERD_BUILD_CMDS $(foreach d,ctr containerd containerd-shim,\ - cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \ - -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep)) + cd $(@D)/$(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd; \ + $(DOCKER_CONTAINERD_GO_ENV) \ + $(DOCKER_CONTAINERD_GO) \ + $(DOCKER_CONTAINERD_BUILD_OPTS) ./$(d)$(sep)) endef define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc - $(INSTALL) -D -m 0755 $(@D)/bin/containerd $(TARGET_DIR)/usr/bin/docker-containerd - $(INSTALL) -D -m 0755 $(@D)/bin/containerd-shim $(TARGET_DIR)/usr/bin/containerd-shim + $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_CONTAINERD_BINDIR)/containerd $(TARGET_DIR)/usr/bin/docker-containerd + $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_CONTAINERD_BINDIR)/containerd-shim $(TARGET_DIR)/usr/bin/containerd-shim ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim endef -$(eval $(generic-package)) +$(eval $(golang-package))