From patchwork Wed Feb 6 13:23:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1037531 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="XCR0fJTq"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vj453Dthz9sMl for ; Thu, 7 Feb 2019 00:30:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AAD1985D6F; Wed, 6 Feb 2019 13:30:10 +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 nCkYeaNgXgRT; Wed, 6 Feb 2019 13:30:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 63E3C85E93; Wed, 6 Feb 2019 13:30:07 +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 E29651BF398 for ; Wed, 6 Feb 2019 13:30:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DFF81877F3 for ; Wed, 6 Feb 2019 13:30:06 +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 LG9rnfiui23Z for ; Wed, 6 Feb 2019 13:30:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5826887391 for ; Wed, 6 Feb 2019 13:30:05 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id d12so4838903edy.3 for ; Wed, 06 Feb 2019 05:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GctmheVyQTeBFwpFnKeNbx30ZfbDWAumH54W7xrwPUw=; b=XCR0fJTq8I508h4llW1sOs3WA0BSHOQCcBDSZbzrUKAkjpUCTP+Yim2GJ7LJP4ub3V TbiRHey/WzyWdyRxpvPQ24BIVEpvo7N8W420s3KMn61hnwP13pQqTwurBylQkABVrnkU hYpz8sROa2otE7n1ul6jmaX80XnE5jbc5gbbI= 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=GctmheVyQTeBFwpFnKeNbx30ZfbDWAumH54W7xrwPUw=; b=CcL/HRAjtM6RK/J9Ut1T/RWeLRsEABdjdHNe4f+chmICRADNM5z+TbYX3WxkHc14gy ySFyCJNNpmn2OM5EMBROiSaRmAuaKgqGxZmfMezgye/SfulOOnad2n+ZC0NJKjpk2Vha vZrEUtl7dFr/W6lOBME1gGvP1pg9xU22j4XelcP9dT+bK2p+FRizWuAovyeXtDFHOrG2 IMerzEJByJv5n/A4I0wwQwyxdg/4Ad1GzKNsi5aBpE+CKlNUEr0LZJXDGwm78FeWB6Dz uotCyL3wXBn2C9jm4Mb2GuowICTdsX2J6WXcj6BhKdOItTGi7+FpJ3Z7+1QfCrTSvImm Kfrg== X-Gm-Message-State: AHQUAuZi4N292VRfLb6rjVEWA5p2sL/qmpuaW7WkW8zlHwaVDHuEoJtl 73QkaAtbqEnfMwBeUU0Y07vXJJTgLrKMbQ== X-Google-Smtp-Source: AHgI3IZX/Rdml4F5doPbj95qW3X0Ci1JD6KUWMKxwlqgh2TnuPAQJfgUJAXuaM04b9dKPRCnts6dxw== X-Received: by 2002:a50:b32f:: with SMTP id q44mr8290586edd.70.1549459449541; Wed, 06 Feb 2019 05:24:09 -0800 (PST) Received: from angelo-ThinkPad-T470p.t-mobile.de ([88.128.80.15]) by smtp.gmail.com with ESMTPSA id p7sm3626174ejb.15.2019.02.06.05.24.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Feb 2019 05:24:08 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 6 Feb 2019 14:23:57 +0100 Message-Id: <1549459439-2260-2-git-send-email-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549459439-2260-1-git-send-email-angelo@amarulasolutions.com> References: <1549459439-2260-1-git-send-email-angelo@amarulasolutions.com> Subject: [Buildroot] [PATCH v3 1/3] package/go: refactor host/target dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 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" In order to better handling the host/target dependencies of packages, we need to add the new configuration option BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS. All golang target packages should depends on this options. Host packages needs to depend instead on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Signed-off-by: Angelo Compagnucci Tested-by: Adam Duskett --- docs/manual/adding-packages-golang.txt | 8 +++++--- package/docker-cli/Config.in | 8 ++++---- package/docker-containerd/Config.in | 8 ++++---- package/docker-engine/Config.in | 8 ++++---- package/docker-proxy/Config.in | 8 ++++---- package/flannel/Config.in | 8 ++++---- package/go/Config.in.host | 7 ++++--- package/mender/Config.in | 8 ++++---- package/runc/Config.in | 8 ++++---- 9 files changed, 37 insertions(+), 34 deletions(-) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index efcf696..1b46778 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -45,9 +45,11 @@ built. ==== +golang-package+ reference In their +Config.in+ file, packages using the +golang-package+ -infrastructure should depend on +BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS+ -and +BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS+ because Buildroot will -automatically add a dependency on +host-go+ to such packages. +infrastructure should depend on +BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS+ +because Buildroot will automatically add a dependency on +host-go+ +to such packages. +If you need CGO support in your package, you can add a dependency on ++BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+. The main macro of the Go package infrastructure is +golang-package+. It is similar to the +generic-package+ macro. Only diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in index 82c35c4..6f187c9 100644 --- a/package/docker-cli/Config.in +++ b/package/docker-cli/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CLI bool "docker-cli" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Docker is a platform to build, ship, @@ -20,6 +20,6 @@ config BR2_PACKAGE_DOCKER_CLI_STATIC endif comment "docker-cli needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in index 851345f..5c0897d 100644 --- a/package/docker-containerd/Config.in +++ b/package/docker-containerd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD bool "docker-containerd" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_RUNC # runtime dependency @@ -28,7 +28,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS endif comment "docker-containerd needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 2a0c130..6780769 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_ENGINE bool "docker-engine" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency @@ -50,7 +50,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif comment "docker-engine needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in index 596e18a..7e40536 100644 --- a/package/docker-proxy/Config.in +++ b/package/docker-proxy/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Libnetwork is a Container Network Model that provides a @@ -14,6 +14,6 @@ config BR2_PACKAGE_DOCKER_PROXY https://github.com/docker/libnetwork comment "docker-proxy needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/flannel/Config.in b/package/flannel/Config.in index 134111b..3263610 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -1,12 +1,12 @@ comment "flannel needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_FLANNEL bool "flannel" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Flannel is a virtual network that gives a subnet to each diff --git a/package/go/Config.in.host b/package/go/Config.in.host index f619ca0..893a448 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -1,4 +1,5 @@ -config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS +# Target go packages should depend on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 @@ -10,10 +11,10 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 -config BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # Go doesn't support CGO linking on MIPS64x platforms # See: https://github.com/karalabe/xgo/issues/46 depends on !BR2_mips64 && !BR2_mips64el diff --git a/package/mender/Config.in b/package/mender/Config.in index aeb0b26..5ab2304 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MENDER bool "mender" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UBOOT_TOOLS # runtime select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime @@ -14,6 +14,6 @@ config BR2_PACKAGE_MENDER https://github.com/mendersoftware/mender comment "mender needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/runc/Config.in b/package/runc/Config.in index fd5dee7..9e06d2b 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RUNC bool "runc" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help runC is a CLI tool for spawning and running containers @@ -10,6 +10,6 @@ config BR2_PACKAGE_RUNC https://github.com/opencontainers/runc comment "runc needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS