From patchwork Wed Dec 6 10:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 845123 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.137; helo=fraxinus.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="fXwDP+IK"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ysFtg3btqz9s9Y for ; Wed, 6 Dec 2017 21:57:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC5FF880AE; Wed, 6 Dec 2017 10:57:13 +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 sssHtDyxYkQS; Wed, 6 Dec 2017 10:57:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 468F488055; Wed, 6 Dec 2017 10:57:13 +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 D6B0F1C041E for ; Wed, 6 Dec 2017 10:57:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD48388B97 for ; Wed, 6 Dec 2017 10:57:09 +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 7aPsDKo7WcPG for ; Wed, 6 Dec 2017 10:57:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id A0F3788B5D for ; Wed, 6 Dec 2017 10:57:07 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id a41so3424622wra.6 for ; Wed, 06 Dec 2017 02:57:07 -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=LS8jq5kFSMoK0LyqjEtTUMWCSHEtL6if4iTWTz4UDh0=; b=fXwDP+IKf7mSJvn9D/j0Ck3ILpNt0OXw1V06W2CB8/ch1+sjm/XB5mvenhQp1AQv9U YVXPRqNkqkQmSm3/75pQTCx8dCGbL1PkDfvxrmCNlC3tJY2CkXYMPJn2TRVtYukJqHhc w5nE5+IZb5tMoflXX5RieOInM62wu/Emd/VtHCY+m/hgPlANRrpA0IuWogSaHppCSO75 CRjQ1QSoL6SEjoAN3/xtmbSl0VWRFdba82+PomrQlilyG5DbFPyMGa5SwM8XtBBvpNIM LHbm9eOXDXuBIeovoHY89Zq7279dvFZreQ/kHk9rOUARGx308xw+Jn4sJVe7P9BpF400 aceQ== 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=LS8jq5kFSMoK0LyqjEtTUMWCSHEtL6if4iTWTz4UDh0=; b=ZOYd8rx9oNW/I/vA1ybsr1NjAQuWbho2IR06Dk9vIeI2xcnoz1sEEKQmAb3v+QLdvR 6IOk7Z1VtzxWX/2bLX1N6Xoc0JKFBybJwZXSbJ7ZaS4sNT2g3nobvlj5XUtcEELf3IXr qyRgG2NLVphxmwypMg4cVkvddxzU9v1/nb39q0Y407csiGvJKogGDiRLHy/1cqWWhFCy lamAq7Q2PEY9ZEgVXud/J+pBjCPpHUm6GaSMN19QFxpJ7bqPCovuSusAl2RKG9n9f4lq Yhn4ZUfoKFdtciZIXnnBBs7CLD4gLrL2KjTgLkwVGDX64svOVb79mKaTXe661fcYu7bb cSCQ== X-Gm-Message-State: AJaThX5kdP4BmZyojwCSaJQkqWj0QNbfw1e7FlisXSaxLz7pU2qKLynn OvfApaoR/otTkOL6HmuhJ+PmwtLRwZg= X-Google-Smtp-Source: AGs4zMbjJsp+iZ9nitcl9QgVnHLrgAPHV7TqKJfBCLE2aYKSieHYjYupl+gBa5yMUEct059rKlEiRw== X-Received: by 10.223.183.17 with SMTP id l17mr20455927wre.1.1512557825679; Wed, 06 Dec 2017 02:57:05 -0800 (PST) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id 31sm2433971wrm.59.2017.12.06.02.57.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Dec 2017 02:57:05 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 6 Dec 2017 11:56:55 +0100 Message-Id: <1512557817-431-4-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512557817-431-1-git-send-email-angelo@amarulasolutions.com> References: <1512557817-431-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH 3/5] package/flannel: 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 flannel package to the new golang infrastructure. Signed-off-by: Angelo Compagnucci --- package/flannel/flannel.mk | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index bbb2c72..6c9d9dd 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -11,36 +11,12 @@ FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -FLANNEL_DEPENDENCIES = host-go - -FLANNEL_MAKE_ENV = \ - $(HOST_GO_TARGET_ENV) \ - GOBIN="$(@D)/bin" \ - GOPATH="$(@D)/gopath" \ - CGO_ENABLED=1 - -FLANNEL_GLDFLAGS = \ - -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -FLANNEL_GLDFLAGS += -extldflags '-static' -endif - -define FLANNEL_CONFIGURE_CMDS - # Put sources at prescribed GOPATH location. - mkdir -p $(@D)/gopath/src/github.com/coreos - ln -s $(@D) $(@D)/gopath/src/github.com/coreos/flannel -endef - -define FLANNEL_BUILD_CMDS - cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/bin/go \ - build -v -o $(@D)/bin/flanneld -ldflags "$(FLANNEL_GLDFLAGS)" . -endef +FLANNEL_GO_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) +# Install flannel to its well known location. define FLANNEL_INSTALL_TARGET_CMDS - # Install flannel to its well known location. - $(INSTALL) -D -m 0755 $(@D)/bin/flanneld $(TARGET_DIR)/opt/bin/flanneld + $(INSTALL) -D -m 0755 $(FLANNEL_BINDIR)/flannel $(TARGET_DIR)/opt/bin/flanneld $(INSTALL) -D -m 0755 $(@D)/dist/mk-docker-opts.sh $(TARGET_DIR)/opt/bin/mk-docker-opts.sh endef -$(eval $(generic-package)) +$(eval $(golang-package))