From patchwork Sat Dec 30 10:02:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 854083 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="KQhN5ByO"; 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 3z7zXV6rP4z9t2M for ; Sat, 30 Dec 2017 21:02:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 077B486B10; Sat, 30 Dec 2017 10:02:33 +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 w_YUaqB1QwwO; Sat, 30 Dec 2017 10:02:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C9DD0866BF; Sat, 30 Dec 2017 10:02:31 +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 AA7991C0B30 for ; Sat, 30 Dec 2017 10:02:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A369D851DE for ; Sat, 30 Dec 2017 10:02:25 +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 R23HqWvRd8VV 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 0F3F584EAD for ; Sat, 30 Dec 2017 10:02:18 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id f8so32510780wre.4 for ; Sat, 30 Dec 2017 02:02:18 -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=K60RWIrQms9lzgBEn64Yz01JdGzN6lqhDRXWFMTwwO8=; b=KQhN5ByOOsCnVtx4V53jtPoYEpM2izenKBsi8wX+v5vTknijPFXXUecdZLvd9AHK6S cLOOjEMNlcJgqKeUoafSn5DaElJ3uTGP1TxLS+C8g8wMUzEZaaf7z+ZborDx+TbhfPa2 94+69P1wEa7iW5KAJ9FhXDYZs87l0KZdvM41ssWlRCZfKdcpmuQKmTDsiJowb90XvM+A 0FtEs6tvOtlPrz0iPSJAhdkutMzd/VBF4phH43SWU6IdGVLrOoIINCyRe3ICBcCzVI1P hgt80GA5Nq25V/pVcSKw/qnIzcs3e0FZnwBqyIFUvxkBFnhQNb9CfKybkKipJwFFuvUO mC6A== 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=K60RWIrQms9lzgBEn64Yz01JdGzN6lqhDRXWFMTwwO8=; b=l245FDLAH1yvQaEy0+kijNYVzl9FhUFw5uWHGxTT+b1ql4VY/AukvIGAmFSMzDnb6K lHvjDbGJB9Tbp+PgNiyqF3Yezu11QpQYoLQoypT0QIaqGzP58E6CKIV5gz/lZk5vmOf0 NDoCSSyarEX+WXJADH81XVZ3JcdlJ0g2dH+hqNhI7+pSOGOGAdPmXoDWN1r/1Z+ZtVBM vSxnESliWvxaudxWQrTscjsmzB6FTY4jn3dSS47yOJyy260ua2o/7l77lZ1idh7Db4Ea 2F0HdvoFyf5sn78A7KPRnBHNQLgESu3UwId50XoOWwkaEOYsjALA4ZM0zNKVF8OL594s eaZQ== X-Gm-Message-State: AKGB3mL9Mtuqi3TX28WGmP8FfL6/rDR68uEROQfP3xqviQXgJP4XaQaQ qcaLGtHv107xWkwDmwl70bZ/9Kai7M0= X-Google-Smtp-Source: ACJfBouMS4CEufiY7WvVPIBuQdaRGuNCPftEUnTVh5KdiGe4rPWVw1VEHeAtOOgiFw9D/2iDGy3huw== X-Received: by 10.223.179.215 with SMTP id x23mr36337395wrd.198.1514628136201; Sat, 30 Dec 2017 02:02:16 -0800 (PST) Received: from localhost.localdomain ([89.202.204.147]) by smtp.gmail.com with ESMTPSA id n65sm66180723wrb.17.2017.12.30.02.02.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 Dec 2017 02:02:15 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sat, 30 Dec 2017 11:02:03 +0100 Message-Id: <1514628127-15938-4-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 3/7] 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..78f9a09 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 $(@D)/$(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))