From patchwork Sat Dec 30 10:02:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 854084 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.133; helo=hemlock.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=amarulasolutions-com.20150623.gappssmtp.com header.i=@amarulasolutions-com.20150623.gappssmtp.com header.b="lNQnIslo"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z7zXX0cM2z9t2M for ; Sat, 30 Dec 2017 21:02:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D191D87557; Sat, 30 Dec 2017 10:02: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 6GLWad-coMU4; Sat, 30 Dec 2017 10:02:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 09CA287527; Sat, 30 Dec 2017 10:02:30 +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 EA3DC1C0B30 for ; Sat, 30 Dec 2017 10:02:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D4C95858F4 for ; Sat, 30 Dec 2017 10:02:24 +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 bSEBF8ZCu+cY for ; Sat, 30 Dec 2017 10:02:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 408C7851DE for ; Sat, 30 Dec 2017 10:02:19 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id w68so30874676wrc.10 for ; Sat, 30 Dec 2017 02:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9zGdCr3YQZpuzztuyPalf8oX/ichAFXi9GZU9CpcIAY=; b=lNQnIslo+/DDlSH6NAJcZ3zmtYrDlNNn04u08UsB9DuegiZjcBYHqUkyTnLJoW4SmM y+2vCrPYZgSP5MBGdurCrPmcBGvdjZlq/mSLXeaXWEugBtmnNE/F9Qf5rbI809gORYG1 81eu+e2po1Abkn5bYPbTmLX+T6sXXhtjQIimLPQRjh1Ttav+I4uQHDB42Yv7smiDheBZ 2m1e0g2m36ZgVgm68tmh7EfkvprKVoinFdXO+hSZnbS+w+3BZsmbQe/Seicmuzt81hQX 3j89tL7U/bFO31ULpH9kDF+qBeLJ2U1TBjuy85++O0Gn/Fz8ydEG7lpIuBm6GWu0BXbx KaEw== 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=9zGdCr3YQZpuzztuyPalf8oX/ichAFXi9GZU9CpcIAY=; b=WBJ0ME46Ij8KXAbOGdlQyCSMwUD433sZjIXrAWr5WKzGYjdvYb8OUUQeRobNKlOTXr 5/LcmKBa+6xz6eANw2z2R88C2kM5yEYQbIo5AmJYpfmqOOW1euNULby7pFOmzi6Y31QE XheF9VW2M8Vm4EwdfLZ3TUDvXjIKHJXwZMaw0sr35KlrfyTlovitEMg//cHbDt/gP8Rz fSwJc2OK7QQjLaxy8hrkJ4bt9lwWaMDlHX3N/hE2ebYx1wOWSHvoh06SYBoqDXBk3Uin ZJFMbl7lTs6BK7Y3Hqorw6dG7bJZrBr0F8wzJaAXerD4JMXiYtlqShA7V/1ISZk8ZNpP FKMA== X-Gm-Message-State: AKGB3mIqLCdZR3zcsJaTG/3k9ac1qtNW7GIBWeVJac9iocx/mAbNhf43 dZAh6D2JZLCZyB8dL14bKQVPvp/uT8k= X-Google-Smtp-Source: ACJfBotiktYWJ1lsph27sxos/+kqJkBx8fQjfHbjkcyBybk8PXim7jEz3MIz10jjSf+j+dlmy6guoQ== X-Received: by 10.223.135.39 with SMTP id a36mr21779272wra.50.1514628137517; Sat, 30 Dec 2017 02:02:17 -0800 (PST) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id n65sm66180723wrb.17.2017.12.30.02.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 Dec 2017 02:02:16 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sat, 30 Dec 2017 11:02:04 +0100 Message-Id: <1514628127-15938-5-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514628127-15938-1-git-send-email-angelo@amarulasolutions.com> References: <1514628127-15938-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v2 4/7] package/runc: converting to golang infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Angelo Compagnucci This patch converts the runc package to the new golang infrastructure. Signed-off-by: Angelo Compagnucci --- package/runc/runc.mk | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index fb3fec2..f497b6d 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,42 +9,15 @@ RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_DEPENDENCIES = host-go +RUNC_GOPATH = Godeps/_workspace -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_GO_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) -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_GO_TAGS += 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 $(@D) && $(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))