From patchwork Tue Oct 24 21:14:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 830042 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="Vy1Dfd/i"; 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 3yM5dF0LCcz9t2c for ; Wed, 25 Oct 2017 08:14:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D88A188A96; Tue, 24 Oct 2017 21:14:54 +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 pMgeN4F3pcVz; Tue, 24 Oct 2017 21:14:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 149E088AA6; Tue, 24 Oct 2017 21:14:51 +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 0E6621BF25F for ; Tue, 24 Oct 2017 21:14:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 084FC88B74 for ; Tue, 24 Oct 2017 21:14:47 +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 OBfLomKo04mq for ; Tue, 24 Oct 2017 21:14:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0E87F88B50 for ; Tue, 24 Oct 2017 21:14:46 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id u138so18889547wmu.4 for ; Tue, 24 Oct 2017 14:14:45 -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=uQ9DsNBPBlbahU5LLqiEqTaXFlZGKoN5mNY1UJL3x4Y=; b=Vy1Dfd/ih9xo+eNQXwaJGA4ILfyYKtc6SFiglaUc/NObVSpB+ZnVbEBfSKfpGZ222W 83RSaXhMN5ebi/41/DPHWSVgPYKHDhIzFv23HJB5NK0HmA4otOWREVpUCVI2Rlltxlwj 5pOhYQ38l0b35scyPqSr44fHHPi8QUBXLRXguRbLdgwUSJzyEMEennUbxPhq/sc0zS14 B1yqh2U1/gcBNdH1cGS/HexgFjmUM3dZ57SdlzgqlGdzp/O70/JOM/uyJs1g64WQd/Bp Es72Ojlq5FWyH0+HrMU2fdLv4+0sWvDAbHf4LD2VxX70jcKhr21OeH9g5b0ay0vJbmMH s3nw== 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=uQ9DsNBPBlbahU5LLqiEqTaXFlZGKoN5mNY1UJL3x4Y=; b=nr8p/k3UVnN8Bz+reUDLJxG0RVzNvQjVptavssmp7AidtxvX/NasLBFRfx1RK8bgdq 9I+wGkoC2pHkLWx3Jjlsea1Zs9/ezJZAUHZa8GQCGYhhvzakHeQyyqYQiSNukCPOhhkC BRbXAr7G9ChwpBxdswIQ4ez7zHE3aW6VLwFAtURItSxrHtHkECk/WV6+FBJ/KtZI93fY nfIfEa+XUYy+Lj/OTvBgQLUbD+lXVIPJsCfbzit0r/nVsTkmtgod5k4IzFv3mdQMjwah o7yXvYxlRCSvVP7h0sHuIODjKISiRW7i849WDRBXwEzOAgaPcyTJ7YljMmEJ/wd1epno YKNQ== X-Gm-Message-State: AMCzsaWT3w0D70KDsIfynHI7zp4JCV3IYINbpXSU2KXlHCM9LFlsFA/S vYFHL9urAv4CbCHDSN+kGrHB3ON4 X-Google-Smtp-Source: ABhQp+QO9GGCZkq+xpj/IMRoPZs/fk8sg2Lo/DMP7Zahnhs8hrV5pYb6juy8Divk1Q5ijpFAuKw9nQ== X-Received: by 10.28.50.200 with SMTP id y191mr5832wmy.74.1508879684016; Tue, 24 Oct 2017 14:14:44 -0700 (PDT) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id k105sm1240527wrc.90.2017.10.24.14.14.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 14:14:43 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 24 Oct 2017 23:14:32 +0200 Message-Id: <1508879672-12957-4-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508879672-12957-1-git-send-email-angelo.compagnucci@gmail.com> References: <1508879672-12957-1-git-send-email-angelo.compagnucci@gmail.com> Cc: christian@paral.in Subject: [Buildroot] [RFC v4 4/4] package/runc: 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 runc package to the new golang infrastructure. Signed-off-by: Angelo Compagnucci --- package/runc/runc.mk | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 0b51e11..5d9e732 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,43 +9,13 @@ RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_DEPENDENCIES = host-go +RUNC_GO_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) -RUNC_GOPATH = "$(@D)/Godeps/_workspace" -RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(RUNC_GOPATH)" \ - PATH=$(BR_PATH) - -RUNC_GLDFLAGS = \ - -X main.gitCommit=$(RUNC_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -RUNC_GLDFLAGS += -extldflags '-static' -endif - -RUNC_GOTAGS = cgo static_build +RUNC_GO_TAGS = cgo static_build ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_GOTAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif -define RUNC_CONFIGURE_CMDS - mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_BUILD_CMDS - cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && \ - $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ - build -v -o $(@D)/bin/runc \ - -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . -endef - -define RUNC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) +$(eval $(golang-package))